Mercurial > kallithea

changeset 4137:6c485794f10e rhodecode-2.2.5-gpl

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Translation updates from RhodeCode v2.2.5 Includes a new German translation. These are licensed under GPLv3, for various reasons, including since they include textual copies of strings from the GPLv3'd Python and HTML files.
author Bradley M. Kuhn <bkuhn@sfconservancy.org>
date Wed, 02 Jul 2014 19:03:20 -0400
parents c558221cf702
children 31e119cb02ef
files .tx/config rhodecode/i18n/de/LC_MESSAGES/rhodecode.mo rhodecode/i18n/de/LC_MESSAGES/rhodecode.po rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po rhodecode/i18n/rhodecode.pot rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po
diffstat 11 files changed, 35021 insertions(+), 21078 deletions(-) [+]
line wrap: on
line diff
--- a/.tx/config	Wed Jul 02 19:03:19 2014 -0400
+++ b/.tx/config	Wed Jul 02 19:03:20 2014 -0400
@@ -12,4 +12,5 @@
 trans.pt_BR = rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po
 trans.zh_CN = rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po
 trans.zh_TW = rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po
+trans.de    = rhodecode/i18n/de/LC_MESSAGES/rhodecode.po
 type = PO
Binary file rhodecode/i18n/de/LC_MESSAGES/rhodecode.mo has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po	Wed Jul 02 19:03:20 2014 -0400
@@ -0,0 +1,5704 @@
+# Translations template for RhodeCode.
+# Copyright (C) 2014 RhodeCode GmbH
+# This file is distributed under the same license as the RhodeCode project.
+# Translators:
+# stephanj <info@stephan-jauernick.de>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: RhodeCode\n"
+"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
+"POT-Creation-Date: 2014-02-13 15:30+0100\n"
+"PO-Revision-Date: 2014-02-13 14:34+0000\n"
+"Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/RhodeCode/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: rhodecode/controllers/changelog.py:88 rhodecode/controllers/compare.py:88
+#: rhodecode/controllers/pullrequests.py:263
+msgid "There are no changesets yet"
+msgstr ""
+
+#: rhodecode/controllers/changelog.py:184
+msgid "All Branches"
+msgstr "Alle Branches"
+
+#: rhodecode/controllers/changelog.py:187
+msgid "(closed)"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:85
+msgid "Show white space"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:92 rhodecode/controllers/changeset.py:99
+msgid "Ignore white space"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:165
+#, python-format
+msgid "increase diff context to %(num)s lines"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:207 rhodecode/controllers/files.py:96
+#: rhodecode/controllers/files.py:119
+msgid "Such revision does not exist for this repository"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:353
+#: rhodecode/controllers/pullrequests.py:480
+#, python-format
+msgid "Status change -> %s"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:384
+msgid ""
+"Changing status on a changeset associated with a closed pull request is not "
+"allowed"
+msgstr ""
+
+#: rhodecode/controllers/compare.py:192 rhodecode/templates/base/root.html:67
+msgid "Select changeset"
+msgstr ""
+
+#: rhodecode/controllers/error.py:70
+msgid "Home page"
+msgstr "Startseite"
+
+#: rhodecode/controllers/error.py:99
+msgid ""
+"The request could not be understood by the server due to malformed syntax."
+msgstr "Die Anfrage konnte vom Server nicht ausgewertet werden weil sie einen Ungültigen Syntax nutzt"
+
+#: rhodecode/controllers/error.py:102
+msgid "Unauthorized access to resource"
+msgstr "Unauthorisierter Zugang zur Ressource"
+
+#: rhodecode/controllers/error.py:104
+msgid "You don't have permission to view this page"
+msgstr "Du hast keine Rechte um diese Seite zu betrachten"
+
+#: rhodecode/controllers/error.py:106
+msgid "The resource could not be found"
+msgstr "Die Ressource konnte nicht gefunden werden"
+
+#: rhodecode/controllers/error.py:108
+msgid ""
+"The server encountered an unexpected condition which prevented it from "
+"fulfilling the request."
+msgstr "Aufgrund einer Unerwarteten Gegebenheit konnte der Server diese Anfrage nicht vollenden"
+
+#: rhodecode/controllers/feed.py:53
+#, python-format
+msgid "Changes on %s repository"
+msgstr "Änderungen im %s Repository"
+
+#: rhodecode/controllers/feed.py:54
+#, python-format
+msgid "%s %s feed"
+msgstr "%s %s Feed"
+
+#: rhodecode/controllers/feed.py:87
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
+msgid "Changeset was too big and was cut off..."
+msgstr ""
+
+#: rhodecode/controllers/feed.py:91
+#, python-format
+msgid "%s committed on %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:90
+msgid "Click here to add new file"
+msgstr ""
+
+#: rhodecode/controllers/files.py:91
+#, python-format
+msgid "There are no files yet. %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:299 rhodecode/controllers/files.py:359
+#: rhodecode/controllers/files.py:426
+#, python-format
+msgid "This repository is has been locked by %s on %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:311
+msgid "You can only delete files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:322
+#, python-format
+msgid "Deleted file %s via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:344
+#, python-format
+msgid "Successfully deleted file %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:348 rhodecode/controllers/files.py:414
+#: rhodecode/controllers/files.py:496
+msgid "Error occurred during commit"
+msgstr "Während des Commitens trat ein Fehler auf"
+
+#: rhodecode/controllers/files.py:371
+msgid "You can only edit files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:385
+#, python-format
+msgid "Edited file %s via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:401
+msgid "No changes"
+msgstr "Keine Änderungen"
+
+#: rhodecode/controllers/files.py:410 rhodecode/controllers/files.py:485
+#, python-format
+msgid "Successfully committed to %s"
+msgstr "Der Commit zu %s war erfolgreich"
+
+#: rhodecode/controllers/files.py:438
+msgid "Added file via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:459
+msgid "No content"
+msgstr "Kein Inhalt"
+
+#: rhodecode/controllers/files.py:463
+msgid "No filename"
+msgstr "Kein Dateiname"
+
+#: rhodecode/controllers/files.py:488
+msgid "Location must be relative path and must not contain .. in path"
+msgstr ""
+
+#: rhodecode/controllers/files.py:522
+msgid "Downloads disabled"
+msgstr ""
+
+#: rhodecode/controllers/files.py:533
+#, python-format
+msgid "Unknown revision %s"
+msgstr "Unbekannte Revision %s"
+
+#: rhodecode/controllers/files.py:535
+msgid "Empty repository"
+msgstr "Leeres Repository"
+
+#: rhodecode/controllers/files.py:537
+msgid "Unknown archive type"
+msgstr "Unbekannter Archiv Typ"
+
+#: rhodecode/controllers/files.py:773
+#: rhodecode/templates/changeset/changeset_range.html:12
+#: rhodecode/templates/email_templates/pull_request.html:12
+#: rhodecode/templates/pullrequests/pullrequest.html:123
+msgid "Changesets"
+msgstr "Änderungssätze"
+
+#: rhodecode/controllers/files.py:774
+#: rhodecode/controllers/pullrequests.py:158
+#: rhodecode/controllers/summary.py:74 rhodecode/model/scm.py:816
+#: rhodecode/templates/switch_to_list.html:3
+#: rhodecode/templates/branches/branches.html:13
+msgid "Branches"
+msgstr "Entwicklungszweige"
+
+#: rhodecode/controllers/files.py:775
+#: rhodecode/controllers/pullrequests.py:159
+#: rhodecode/controllers/summary.py:75 rhodecode/model/scm.py:827
+#: rhodecode/templates/switch_to_list.html:25
+#: rhodecode/templates/tags/tags.html:13
+msgid "Tags"
+msgstr "Tags"
+
+#: rhodecode/controllers/forks.py:189
+#, python-format
+msgid "An error occurred during repository forking %s"
+msgstr "Währen des Forken des Repositorys trat ein Fehler auf: %s"
+
+#: rhodecode/controllers/home.py:81
+msgid "Groups"
+msgstr ""
+
+#: rhodecode/controllers/home.py:86
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:106
+#: rhodecode/templates/admin/repos/repo_add.html:15
+#: rhodecode/templates/admin/repos/repo_add.html:19
+#: rhodecode/templates/admin/users/user_edit_advanced.html:6
+#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:87
+#: rhodecode/templates/base/base.html:136
+#: rhodecode/templates/base/base.html:389
+#: rhodecode/templates/base/base.html:560
+msgid "Repositories"
+msgstr "Repositories"
+
+#: rhodecode/controllers/home.py:127 rhodecode/templates/files/files.html:33
+#: rhodecode/templates/files/files_add.html:37
+#: rhodecode/templates/files/files_delete.html:37
+#: rhodecode/templates/files/files_edit.html:37
+msgid "Branch"
+msgstr ""
+
+#: rhodecode/controllers/home.py:133
+msgid "Tag"
+msgstr ""
+
+#: rhodecode/controllers/home.py:139
+msgid "Bookmark"
+msgstr ""
+
+#: rhodecode/controllers/journal.py:112 rhodecode/controllers/journal.py:155
+msgid "public journal"
+msgstr "Öffentliches Logbuch"
+
+#: rhodecode/controllers/journal.py:116 rhodecode/controllers/journal.py:159
+#: rhodecode/templates/journal/journal.html:15
+msgid "journal"
+msgstr "Logbuch"
+
+#: rhodecode/controllers/login.py:185 rhodecode/controllers/login.py:230
+msgid "bad captcha"
+msgstr ""
+
+#: rhodecode/controllers/login.py:191
+msgid "You have successfully registered into RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/login.py:235
+msgid "Your password reset link was sent"
+msgstr "Ihr Passwort Zurücksetzen link wurde versendet"
+
+#: rhodecode/controllers/login.py:255
+msgid ""
+"Your password reset was successful, new password has been sent to your email"
+msgstr "Das Zurücksetzen des Passworted war erfolgreich, ein neues Passwort wurde an ihre EMail Addresse gesendet"
+
+#: rhodecode/controllers/pullrequests.py:138
+#: rhodecode/templates/changeset/changeset.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:15
+msgid "Changeset"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:155
+msgid "Special"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:156
+msgid "Peer branches"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:157 rhodecode/model/scm.py:822
+#: rhodecode/templates/switch_to_list.html:38
+#: rhodecode/templates/bookmarks/bookmarks.html:13
+msgid "Bookmarks"
+msgstr "Lesezeichen"
+
+#: rhodecode/controllers/pullrequests.py:328
+msgid "Pull request requires a title with min. 3 chars"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:330
+#, python-format
+msgid "Error creating pull request: %s"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:352
+msgid "Successfully opened new pull request"
+msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet"
+
+#: rhodecode/controllers/pullrequests.py:355
+msgid "Error occurred during sending pull request"
+msgstr "Währen des abschicken des Pullrequests trat ein Fehler auf"
+
+#: rhodecode/controllers/pullrequests.py:395
+msgid "Successfully deleted pull request"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:483
+msgid "Closing with"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:520
+msgid ""
+"Closing pull request on other statuses than rejected or approved forbidden"
+msgstr ""
+
+#: rhodecode/controllers/search.py:133
+msgid "Invalid search query. Try quoting it."
+msgstr "Ungültige Suchanfrage. Versuchen sie es in Anführungzeichen zu setzen."
+
+#: rhodecode/controllers/search.py:138
+msgid "There is no index to search in. Please run whoosh indexer"
+msgstr "Es gibt keinen durchsuchbaren Index. Bitte den Whoosh Indizierer ausführen"
+
+#: rhodecode/controllers/search.py:142
+msgid "An error occurred during this search operation"
+msgstr "Während dieser Such Operation trat ein Fehler auf"
+
+#: rhodecode/controllers/summary.py:201
+msgid "No data loaded yet"
+msgstr "Es wurden bisher keine Daten geladen"
+
+#: rhodecode/controllers/summary.py:204
+#: rhodecode/templates/summary/summary.html:105
+msgid "Statistics are disabled for this repository"
+msgstr "Statistiken sind deaktiviert für dieses Repository"
+
+#: rhodecode/controllers/admin/auth_settings.py:125
+msgid "Auth settings updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/auth_settings.py:136
+msgid "error occurred during update of auth settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/defaults.py:95
+msgid "Default settings updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/defaults.py:109
+msgid "Error occurred during update of defaults"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:58
+#: rhodecode/controllers/admin/my_account.py:255
+#: rhodecode/controllers/admin/users.py:287
+msgid "forever"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:59
+#: rhodecode/controllers/admin/my_account.py:256
+#: rhodecode/controllers/admin/users.py:288
+msgid "5 minutes"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:60
+#: rhodecode/controllers/admin/my_account.py:257
+#: rhodecode/controllers/admin/users.py:289
+msgid "1 hour"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:61
+#: rhodecode/controllers/admin/my_account.py:258
+#: rhodecode/controllers/admin/users.py:290
+msgid "1 day"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/my_account.py:259
+#: rhodecode/controllers/admin/users.py:291
+msgid "1 month"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:66
+#: rhodecode/controllers/admin/my_account.py:261
+#: rhodecode/controllers/admin/users.py:293
+msgid "Lifetime"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:145
+msgid "Error occurred during gist creation"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:183
+#, python-format
+msgid "Deleted gist %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:232
+msgid "unmodified"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:261
+msgid "Successfully updated gist content"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:266
+msgid "Successfully updated gist data"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:269
+#, python-format
+msgid "Error occurred during update of gist %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:68
+msgid "You can't edit this user since it's crucial for entire application"
+msgstr "Sie können diesen User nicht editieren da er für die ganze Applikation von entscheidender bedeutung ist."
+
+#: rhodecode/controllers/admin/my_account.py:125
+msgid "Your account was updated successfully"
+msgstr "Ihr Account wurde erfolgreich aktualisiert"
+
+#: rhodecode/controllers/admin/my_account.py:139
+#: rhodecode/controllers/admin/users.py:205
+#, python-format
+msgid "Error occurred during update of user %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:159
+msgid "Successfully updated password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:169
+msgid "Error occurred during update of user password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:211
+#: rhodecode/controllers/admin/users.py:430
+#, python-format
+msgid "Added email %s to user"
+msgstr "Die EMail Addresse %s wurde zum Benutzer hinzugefügt"
+
+#: rhodecode/controllers/admin/my_account.py:217
+#: rhodecode/controllers/admin/users.py:436
+msgid "An error occurred during email saving"
+msgstr "Währen der Speicherung der EMail Addresse trat ein Fehler auf"
+
+#: rhodecode/controllers/admin/my_account.py:226
+#: rhodecode/controllers/admin/users.py:447
+msgid "Removed email from user"
+msgstr "Die EMail Addresse wurde vom Benutzer entfernt"
+
+#: rhodecode/controllers/admin/my_account.py:272
+#: rhodecode/controllers/admin/users.py:313
+msgid "Api key successfully created"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:284
+#: rhodecode/controllers/admin/users.py:329
+msgid "Api key successfully reset"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:288
+#: rhodecode/controllers/admin/users.py:333
+msgid "Api key successfully deleted"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:60
+#: rhodecode/controllers/admin/permissions.py:64
+#: rhodecode/controllers/admin/permissions.py:68
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:104
+msgid "None"
+msgstr "Keine"
+
+#: rhodecode/controllers/admin/permissions.py:61
+#: rhodecode/controllers/admin/permissions.py:65
+#: rhodecode/controllers/admin/permissions.py:69
+msgid "Read"
+msgstr "Lesen"
+
+#: rhodecode/controllers/admin/permissions.py:62
+#: rhodecode/controllers/admin/permissions.py:66
+#: rhodecode/controllers/admin/permissions.py:70
+msgid "Write"
+msgstr "Schreiben"
+
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
+#: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/templates/admin/auth/auth_settings.html:12
+#: rhodecode/templates/admin/defaults/defaults.html:12
+#: rhodecode/templates/admin/permissions/permissions.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:17
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/settings/settings.html:12
+#: rhodecode/templates/admin/user_groups/user_group_add.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+#: rhodecode/templates/admin/users/user_add.html:11
+#: rhodecode/templates/admin/users/user_edit.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:114
+#: rhodecode/templates/admin/users/users.html:13
+#: rhodecode/templates/admin/users/users.html:58
+#: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:340
+#: rhodecode/templates/base/base.html:346
+#: rhodecode/templates/base/base.html:347
+msgid "Admin"
+msgstr "Admin"
+
+#: rhodecode/controllers/admin/permissions.py:74
+#: rhodecode/controllers/admin/permissions.py:85
+#: rhodecode/controllers/admin/permissions.py:90
+#: rhodecode/controllers/admin/permissions.py:93
+#: rhodecode/controllers/admin/permissions.py:96
+#: rhodecode/controllers/admin/permissions.py:99
+msgid "Disabled"
+msgstr "Deaktiviert"
+
+#: rhodecode/controllers/admin/permissions.py:76
+msgid "Allowed with manual account activation"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:78
+msgid "Allowed with automatic account activation"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:81
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1485
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1542
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1564
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1603
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1655
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1682 rhodecode/model/db.py:1692
+msgid "Manual activation of external account"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:82
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1486
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1565
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1604
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1656
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1683 rhodecode/model/db.py:1693
+msgid "Automatic activation of external account"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:86
+#: rhodecode/controllers/admin/permissions.py:89
+#: rhodecode/controllers/admin/permissions.py:94
+#: rhodecode/controllers/admin/permissions.py:97
+#: rhodecode/controllers/admin/permissions.py:100
+msgid "Enabled"
+msgstr "Aktiviert"
+
+#: rhodecode/controllers/admin/permissions.py:123
+msgid "Global permissions updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:137
+msgid "Error occurred during update of permissions"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:184
+#, python-format
+msgid "Created repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:196
+#, python-format
+msgid "Error occurred during creation of repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:254
+#, python-format
+msgid "Updated repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:269
+#, python-format
+msgid "Error occurred during update of repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:287
+#, python-format
+msgid "This group contains %s repositores and cannot be deleted"
+msgstr "Die Gruppe enthält %s Repositorys und kann nicht gelöscht werden"
+
+#: rhodecode/controllers/admin/repo_groups.py:294
+#, python-format
+msgid "This group contains %s subgroups and cannot be deleted"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:300
+#, python-format
+msgid "Removed repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:305
+#, python-format
+msgid "Error occurred during deletion of repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:417
+#: rhodecode/controllers/admin/repo_groups.py:452
+#: rhodecode/controllers/admin/user_groups.py:335
+msgid "Cannot revoke permission for yourself as admin"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:432
+msgid "Repository Group permissions updated"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:469
+#: rhodecode/controllers/admin/repos.py:424
+#: rhodecode/controllers/admin/user_groups.py:347
+msgid "An error occurred during revoking of permission"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:160
+#, python-format
+msgid "Error creating repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:235
+#, python-format
+msgid "Created repository %s from %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:244
+#, python-format
+msgid "Forked repository %s as %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:247
+#, python-format
+msgid "Created repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:287
+#, python-format
+msgid "Repository %s updated successfully"
+msgstr "Repository %s wurde erfolgreich aktualisiert"
+
+#: rhodecode/controllers/admin/repos.py:305
+#, python-format
+msgid "Error occurred during update of repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:332
+#, python-format
+msgid "Detached %s forks"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:335
+#, python-format
+msgid "Deleted %s forks"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:340
+#, python-format
+msgid "Deleted repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:343
+#, python-format
+msgid "Cannot delete %s it still contains attached forks"
+msgstr "%s konnte nicht gelöscht werden da es immernoch Forks enthält"
+
+#: rhodecode/controllers/admin/repos.py:348
+#, python-format
+msgid "An error occurred during deletion of %s"
+msgstr "Beim Löschen von %s trat ein Fehler auf"
+
+#: rhodecode/controllers/admin/repos.py:400
+msgid "Repository permissions updated"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:456
+msgid "An error occurred during creation of field"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:470
+msgid "An error occurred during removal of field"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:486
+msgid "-- Not a fork --"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:520
+msgid "Updated repository visibility in public journal"
+msgstr "Sichtbarkeit des Repositorys im Öffentlichen Logbuch aktualisiert"
+
+#: rhodecode/controllers/admin/repos.py:524
+msgid "An error occurred during setting this repository in public journal"
+msgstr "Es trat ein Fehler während der Aktualisierung der Sicherbarkeit dieses Repositorys im Öffentlichen Logbuch auf"
+
+#: rhodecode/controllers/admin/repos.py:529 rhodecode/model/validators.py:359
+msgid "Token mismatch"
+msgstr "Schlüssel  stimmt nicht überein"
+
+#: rhodecode/controllers/admin/repos.py:544
+msgid "Nothing"
+msgstr "Nichts"
+
+#: rhodecode/controllers/admin/repos.py:546
+#, python-format
+msgid "Marked repo %s as fork of %s"
+msgstr "Markiere Repository %s als Abzweig von Repository %s"
+
+#: rhodecode/controllers/admin/repos.py:553
+msgid "An error occurred during this operation"
+msgstr "Während dieser operation trat ein Fehler auf"
+
+#: rhodecode/controllers/admin/repos.py:569
+msgid "Locked repository"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:572
+msgid "Unlocked repository"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:575
+#: rhodecode/controllers/admin/repos.py:602
+msgid "An error occurred during unlocking"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:593
+msgid "Unlocked"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:596
+msgid "Locked"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:598
+#, python-format
+msgid "Repository has been %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:616
+msgid "Cache invalidation successful"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:620
+msgid "An error occurred during cache invalidation"
+msgstr "Währen der Cache Invalidierung trat ein Fehler auf"
+
+#: rhodecode/controllers/admin/repos.py:635
+msgid "Pulled from remote location"
+msgstr "Von entferntem Ort übertragen"
+
+#: rhodecode/controllers/admin/repos.py:638
+msgid "An error occurred during pull from remote location"
+msgstr "Es trat ein Fehler auf während das Repository von einem Entfernten Speicherort übertragen wurde"
+
+#: rhodecode/controllers/admin/repos.py:671
+msgid "An error occurred during deletion of repository stats"
+msgstr "Während des löschens der Repository Statistiken trat ein Fehler auf"
+
+#: rhodecode/controllers/admin/settings.py:171
+msgid "Updated VCS settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:175
+msgid ""
+"Unable to activate hgsubversion support. The \"hgsubversion\" library is "
+"missing"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:181
+#: rhodecode/controllers/admin/settings.py:273
+msgid "Error occurred during updating application settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:214
+#, python-format
+msgid "Repositories successfully rescanned added: %s ; removed: %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:269
+msgid "Updated application settings"
+msgstr "Aktualisiere Applikations Einstellungen"
+
+#: rhodecode/controllers/admin/settings.py:326
+msgid "Updated visualisation settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:331
+msgid "Error occurred during updating visualisation settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:357
+msgid "Please enter email address"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:369
+msgid "Send email task created"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:399
+msgid "Added new hook"
+msgstr "Neuer Hook hinzugefügt"
+
+#: rhodecode/controllers/admin/settings.py:413
+msgid "Updated hooks"
+msgstr "Die Hooks wurden aktutalisiert"
+
+#: rhodecode/controllers/admin/settings.py:417
+msgid "Error occurred during hook creation"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:443
+msgid "Whoosh reindex task scheduled"
+msgstr "Whoosh Reindizierungs Aufgabe wurde zur Ausführung geplant"
+
+#: rhodecode/controllers/admin/settings.py:535
+msgid "Updated license information"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:540
+msgid "Error occurred during updating license info"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:563
+#, python-format
+msgid ""
+"Your license will expire on %s, please contact support to extend your "
+"license."
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:566
+#, python-format
+msgid ""
+"Your license has expired on %s, please contact support to extend your "
+"license."
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:571
+msgid ""
+"Unexpected error while reading license key. Please make sure your license "
+"token and key are correct"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:148
+#, python-format
+msgid "Created user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:159
+#, python-format
+msgid "Error occurred during creation of user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:197
+#, python-format
+msgid "Updated user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:219
+#, python-format
+msgid "Error occurred during update of user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:237
+msgid "Successfully deleted user group"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:242
+msgid "An error occurred during deletion of user group"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:309
+msgid "Target group cannot be the same"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:315
+msgid "User Group permissions updated"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:435
+#: rhodecode/controllers/admin/users.py:395
+msgid "Updated permissions"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:439
+#: rhodecode/controllers/admin/users.py:399
+msgid "An error occurred during permissions saving"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:133
+#, python-format
+msgid "Created user %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:147
+#, python-format
+msgid "Error occurred during creation of user %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:186
+msgid "User updated successfully"
+msgstr "Der Benutzer wurde erfolgreich aktualisiert"
+
+#: rhodecode/controllers/admin/users.py:221
+msgid "Successfully deleted user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:226
+msgid "An error occurred during deletion of user"
+msgstr "Während der Löschen des Benutzers trat ein Fehler auf"
+
+#: rhodecode/controllers/admin/users.py:240
+#: rhodecode/controllers/admin/users.py:258
+#: rhodecode/controllers/admin/users.py:281
+#: rhodecode/controllers/admin/users.py:306
+#: rhodecode/controllers/admin/users.py:319
+#: rhodecode/controllers/admin/users.py:343
+#: rhodecode/controllers/admin/users.py:406
+#: rhodecode/controllers/admin/users.py:453
+msgid "You can't edit this user"
+msgstr "Sie können diesen Benutzer nicht editieren"
+
+#: rhodecode/controllers/admin/users.py:481
+#, python-format
+msgid "Added ip %s to user whitelist"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:487
+msgid "An error occurred during ip saving"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:501
+msgid "Removed ip address from user whitelist"
+msgstr ""
+
+#: rhodecode/lib/auth.py:746
+#, python-format
+msgid "IP %s not allowed"
+msgstr ""
+
+#: rhodecode/lib/auth.py:807
+msgid "You need to be a registered user to perform this action"
+msgstr "Sie müssen ein Registrierter Nutzer sein um diese Aktion durchzuführen"
+
+#: rhodecode/lib/auth.py:844
+msgid "You need to be a signed in to view this page"
+msgstr "Sie müssen sich anmelden um diese Seite aufzurufen"
+
+#: rhodecode/lib/diffs.py:64
+msgid "Binary file"
+msgstr ""
+
+#: rhodecode/lib/diffs.py:80
+msgid ""
+"Changeset was too big and was cut off, use diff menu to display this diff"
+msgstr "Der Änderungssatz war zu groß und wurde abgeschnitten, benutzen sie das Diff Menü um die Unterschiede anzuzeigen"
+
+#: rhodecode/lib/diffs.py:90
+msgid "No changes detected"
+msgstr "Keine Änderungen erkannt"
+
+#: rhodecode/lib/helpers.py:598
+#, python-format
+msgid "Deleted branch: %s"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:601
+#, python-format
+msgid "Created tag: %s"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:614
+msgid "Changeset not found"
+msgstr "Änderungssatz nicht gefunden"
+
+#: rhodecode/lib/helpers.py:664
+#, python-format
+msgid "Show all combined changesets %s->%s"
+msgstr "Zeige alle Kombinierten Änderungensätze %s->%s"
+
+#: rhodecode/lib/helpers.py:670
+msgid "compare view"
+msgstr "vergleichsansicht"
+
+#: rhodecode/lib/helpers.py:690
+msgid "and"
+msgstr "und"
+
+#: rhodecode/lib/helpers.py:691
+#, python-format
+msgid "%s more"
+msgstr "%s mehr"
+
+#: rhodecode/lib/helpers.py:692
+#: rhodecode/templates/changelog/changelog.html:58
+msgid "revisions"
+msgstr "revisionen"
+
+#: rhodecode/lib/helpers.py:716
+#, python-format
+msgid "fork name %s"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:733
+#: rhodecode/templates/pullrequests/pullrequest_show.html:11
+#, python-format
+msgid "Pull request #%s"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:743
+msgid "[deleted] repository"
+msgstr "[gelöscht] Repository"
+
+#: rhodecode/lib/helpers.py:745 rhodecode/lib/helpers.py:757
+msgid "[created] repository"
+msgstr "[erstellt] Repository"
+
+#: rhodecode/lib/helpers.py:747
+msgid "[created] repository as fork"
+msgstr "[erstellt] Repository als Fork"
+
+#: rhodecode/lib/helpers.py:749 rhodecode/lib/helpers.py:759
+msgid "[forked] repository"
+msgstr "[forked] Repository"
+
+#: rhodecode/lib/helpers.py:751 rhodecode/lib/helpers.py:761
+msgid "[updated] repository"
+msgstr "[aktualisiert] Repository"
+
+#: rhodecode/lib/helpers.py:753
+msgid "[downloaded] archive from repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:755
+msgid "[delete] repository"
+msgstr "[gelöscht] Repository"
+
+#: rhodecode/lib/helpers.py:763
+msgid "[created] user"
+msgstr "[erstellt] Benutzer"
+
+#: rhodecode/lib/helpers.py:765
+msgid "[updated] user"
+msgstr "[akutalisiert] Benutzer"
+
+#: rhodecode/lib/helpers.py:767
+msgid "[created] user group"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:769
+msgid "[updated] user group"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:771
+msgid "[commented] on revision in repository"
+msgstr "[kommentiert]  revision in Repository"
+
+#: rhodecode/lib/helpers.py:773
+msgid "[commented] on pull request for"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:775
+msgid "[closed] pull request for"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:777
+msgid "[pushed] into"
+msgstr "[übermittelt] in"
+
+#: rhodecode/lib/helpers.py:779
+msgid "[committed via RhodeCode] into repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:781
+msgid "[pulled from remote] into repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:783
+msgid "[pulled] from"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:785
+msgid "[started following] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:787
+msgid "[stopped following] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1102
+#, python-format
+msgid " and %s more"
+msgstr "und %s weitere"
+
+#: rhodecode/lib/helpers.py:1106
+msgid "No Files"
+msgstr "Keine Dateien"
+
+#: rhodecode/lib/helpers.py:1172
+msgid "new file"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1175
+msgid "mod"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1178
+msgid "del"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1181
+msgid "rename"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1186
+msgid "chmod"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1418
+#, 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 "Das %s Repository ist nicht in der Datenbank vorhanden, eventuell wurde es im Dateisystem erstellt oder umbenannt. Bitte starten sie die Applikation erneut um die Repositories neu zu Indizieren"
+
+#: rhodecode/lib/utils2.py:413
+#, python-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] "%d Jahr"
+msgstr[1] "%d Jahre"
+
+#: rhodecode/lib/utils2.py:414
+#, python-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d Monat"
+msgstr[1] "%d Monate"
+
+#: rhodecode/lib/utils2.py:415
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d Tag"
+msgstr[1] "%d Tage"
+
+#: rhodecode/lib/utils2.py:416
+#, python-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d Stunde"
+msgstr[1] "%d Stunden"
+
+#: rhodecode/lib/utils2.py:417
+#, python-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d Minute"
+msgstr[1] "%d Minuten"
+
+#: rhodecode/lib/utils2.py:418
+#, python-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d Sekunde"
+msgstr[1] "%d Sekunden"
+
+#: rhodecode/lib/utils2.py:434
+#, python-format
+msgid "in %s"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:436
+#, python-format
+msgid "%s ago"
+msgstr "vor %s"
+
+#: rhodecode/lib/utils2.py:438
+#, python-format
+msgid "in %s and %s"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:441
+#, python-format
+msgid "%s and %s ago"
+msgstr "%s und %s her"
+
+#: rhodecode/lib/utils2.py:444
+msgid "just now"
+msgstr "jetzt gerade"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1454
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1511
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1572
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1622
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1649 rhodecode/model/db.py:1659
+msgid "Repository no access"
+msgstr "Kein Zugriff auf Repository"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1455
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1573
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1623
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1650 rhodecode/model/db.py:1660
+msgid "Repository read access"
+msgstr "Lesender Zugriff auf Repository"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1456
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1574
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1651 rhodecode/model/db.py:1661
+msgid "Repository write access"
+msgstr "Schreibdender Zugriff auf Repository"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1167
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1457
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1515
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1575
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1652 rhodecode/model/db.py:1662
+msgid "Repository admin access"
+msgstr "Administrativer Zugang zum Repository"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308
+msgid "Repositories Group no access"
+msgstr "Repository Gruppe hat Keinen Zugriff"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309
+msgid "Repositories Group read access"
+msgstr "Repository Gruppe hat lesenden Zugriff"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310
+msgid "Repositories Group write access"
+msgstr "Repository Gruppe hat schreibenden Zugriff"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1172
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311
+msgid "Repositories Group admin access"
+msgstr "Repository Gruppe hat Administrativen Zugriff"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1452
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1509
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1510
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1570
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1620
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1647 rhodecode/model/db.py:1657
+msgid "RhodeCode Administrator"
+msgstr "RhodeCode Administrator"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1475
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1532
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1554
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1593
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1670 rhodecode/model/db.py:1680
+msgid "Repository creation disabled"
+msgstr "Repository erstelllung deaktiviert"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1476
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1555
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1594
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1671 rhodecode/model/db.py:1681
+msgid "Repository creation enabled"
+msgstr "Repository erstellung aktiviert"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1478
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1557
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1596
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1648
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1675 rhodecode/model/db.py:1685
+msgid "Repository forking disabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1479
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1537
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1558
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1597
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1649
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1676 rhodecode/model/db.py:1686
+msgid "Repository forking enabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1403
+msgid "Register disabled"
+msgstr "Registrierung deaktiviert"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1180
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1404
+msgid "Register new user with RhodeCode with manual activation"
+msgstr "Registrierung neuer Benutzer in RhodeCode mit manueller Aktivierung"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1183
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1407
+msgid "Register new user with RhodeCode with auto activation"
+msgstr "Registrierung neuer Benutzer in RhodeCode mit Automatischer Aktivierung"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1651
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1980
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2040
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2062
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2101
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2154
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2200 rhodecode/model/db.py:2210
+msgid "Not Reviewed"
+msgstr "Nicht Begutachtet"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1652
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1981
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2063
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2102
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2155
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2201 rhodecode/model/db.py:2211
+msgid "Approved"
+msgstr "Akzeptiert"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1653
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1982
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2064
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2103
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2156
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2202 rhodecode/model/db.py:2212
+msgid "Rejected"
+msgstr "Abgelehnt"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1654
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1983
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2044
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2065
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2104
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2157
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2203 rhodecode/model/db.py:2213
+msgid "Under Review"
+msgstr "In Begutachtung"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1300
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1357
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1358
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1379
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1471
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1498 rhodecode/model/db.py:1508
+msgid "top level"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1459
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1516
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1577
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1654 rhodecode/model/db.py:1664
+msgid "Repository group no access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1460
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1578
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1628
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1655 rhodecode/model/db.py:1665
+msgid "Repository group read access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1461
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1579
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1629
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1656 rhodecode/model/db.py:1666
+msgid "Repository group write access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1462
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1520
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1580
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1630
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1657 rhodecode/model/db.py:1667
+msgid "Repository group admin access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1464
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1521
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1582
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1632
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1659 rhodecode/model/db.py:1669
+msgid "User group no access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1465
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1583
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1633
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1660 rhodecode/model/db.py:1670
+msgid "User group read access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1466
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1545
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1584
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1634
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1661 rhodecode/model/db.py:1671
+msgid "User group write access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1467
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1525
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1546
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1585
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1635
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1662 rhodecode/model/db.py:1672
+msgid "User group admin access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1469
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1526
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1548
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1587
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1637
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1664 rhodecode/model/db.py:1674
+msgid "Repository Group creation disabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1470
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1528
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1549
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1588
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1638
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1665 rhodecode/model/db.py:1675
+msgid "Repository Group creation enabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1472
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1529
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1551
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1590
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1640
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1667 rhodecode/model/db.py:1677
+msgid "User Group creation disabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1473
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1552
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1591
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1641
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1668 rhodecode/model/db.py:1678
+msgid "User Group creation enabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1481
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1560
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1599
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1651
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1678 rhodecode/model/db.py:1688
+msgid "Registration disabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1482
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1561
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1600
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1652
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1679 rhodecode/model/db.py:1689
+msgid "User Registration with manual account activation"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1483
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1562
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1601
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1653
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1680 rhodecode/model/db.py:1690
+msgid "User Registration with automatic account activation"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1672 rhodecode/model/db.py:1682
+msgid ""
+"Repository creation enabled with write permission to a repository group"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1673 rhodecode/model/db.py:1683
+msgid ""
+"Repository creation disabled with write permission to a repository group"
+msgstr ""
+
+#: rhodecode/model/comment.py:75
+#, python-format
+msgid "on line %s"
+msgstr "in Zeile %s"
+
+#: rhodecode/model/comment.py:220
+msgid "[Mention]"
+msgstr "[Mention]"
+
+#: rhodecode/model/forms.py:57
+msgid "Please enter a login"
+msgstr "Bitte einen Benutzernamen eingeben"
+
+#: rhodecode/model/forms.py:58
+#, python-format
+msgid "Enter a value %(min)i characters long or more"
+msgstr "Bitte einen Wert mit mindestens %(min)i Zeichen eingeben"
+
+#: rhodecode/model/forms.py:66
+msgid "Please enter a password"
+msgstr "Bitte ein Passwort eingeben"
+
+#: rhodecode/model/forms.py:67
+#, python-format
+msgid "Enter %(min)i characters or more"
+msgstr "Bitte mindestens %(min)i Zeichen eingeben"
+
+#: rhodecode/model/forms.py:156
+msgid "Name must not contain only digits"
+msgstr ""
+
+#: rhodecode/model/notification.py:229
+#, python-format
+msgid "%(user)s commented on changeset at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:230
+#, python-format
+msgid "%(user)s sent message at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:231
+#, python-format
+msgid "%(user)s mentioned you at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:232
+#, python-format
+msgid "%(user)s registered in RhodeCode at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:233
+#, python-format
+msgid "%(user)s opened new pull request at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:234
+#, python-format
+msgid "%(user)s commented on pull request at %(when)s"
+msgstr ""
+
+#: rhodecode/model/pull_request.py:105
+#, python-format
+msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
+msgstr ""
+
+#: rhodecode/model/scm.py:808
+msgid "latest tip"
+msgstr ""
+
+#: rhodecode/model/user.py:196
+msgid "New user registration"
+msgstr ""
+
+#: rhodecode/model/user.py:220 rhodecode/model/user.py:245
+msgid "You can't Edit this user since it's crucial for entire application"
+msgstr "Sie können diesen User nicht editieren da er für die ganze Applikation von entscheidender bedeutung ist."
+
+#: rhodecode/model/user.py:268
+msgid "You can't remove this user since it's crucial for entire application"
+msgstr "Sie können diesen User nicht löschen da er für die ganze Applikation von entscheidender bedeutung ist."
+
+#: rhodecode/model/user.py:274
+#, python-format
+msgid ""
+"user \"%s\" still owns %s repositories and cannot be removed. Switch owners "
+"or remove those repositories. %s"
+msgstr ""
+
+#: rhodecode/model/user.py:302
+msgid "Password reset link"
+msgstr ""
+
+#: rhodecode/model/user.py:331
+msgid "Your new password"
+msgstr ""
+
+#: rhodecode/model/user.py:332
+#, python-format
+msgid "Your new RhodeCode password:%s"
+msgstr ""
+
+#: rhodecode/model/validators.py:82 rhodecode/model/validators.py:83
+msgid "Value cannot be an empty list"
+msgstr ""
+
+#: rhodecode/model/validators.py:120
+#, python-format
+msgid "Username \"%(username)s\" already exists"
+msgstr "Benutezrname \"%(username)s\" existiert bereits"
+
+#: rhodecode/model/validators.py:122
+#, python-format
+msgid "Username \"%(username)s\" is forbidden"
+msgstr "Benutzername \"%(username)s\" ist verboten"
+
+#: rhodecode/model/validators.py:124
+msgid ""
+"Username may only contain alphanumeric characters underscores, periods or "
+"dashes and must begin with alphanumeric character or underscore"
+msgstr ""
+
+#: rhodecode/model/validators.py:151
+msgid "The input is not valid"
+msgstr ""
+
+#: rhodecode/model/validators.py:158
+#, python-format
+msgid "Username %(username)s is not valid"
+msgstr "Benutzername \"%(username)s\" ist ungültig"
+
+#: rhodecode/model/validators.py:177
+msgid "Invalid user group name"
+msgstr ""
+
+#: rhodecode/model/validators.py:178
+#, python-format
+msgid "User group \"%(usergroup)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:180
+msgid ""
+"user group name may only contain alphanumeric characters underscores, "
+"periods or dashes and must begin with alphanumeric character"
+msgstr ""
+
+#: rhodecode/model/validators.py:218
+msgid "Cannot assign this group as parent"
+msgstr "Kann diese Gruppe nicht als vorgesetzt setzen"
+
+#: rhodecode/model/validators.py:219
+#, python-format
+msgid "Group \"%(group_name)s\" already exists"
+msgstr "Gruppe \"%(group_name)s\" existiert bereits"
+
+#: rhodecode/model/validators.py:221
+#, python-format
+msgid "Repository with name \"%(group_name)s\" already exists"
+msgstr "Es gibt bereits ein Repository mit \"%(group_name)s\""
+
+#: rhodecode/model/validators.py:279
+msgid "Invalid characters (non-ascii) in password"
+msgstr "Üngültige(nicht ASCII) Zeichen im Passwort"
+
+#: rhodecode/model/validators.py:294
+msgid "Invalid old password"
+msgstr ""
+
+#: rhodecode/model/validators.py:310
+msgid "Passwords do not match"
+msgstr "Die Passwörter stimmen nicht überein"
+
+#: rhodecode/model/validators.py:327
+msgid "invalid password"
+msgstr "Ungültiges Passwort"
+
+#: rhodecode/model/validators.py:328
+msgid "invalid user name"
+msgstr "Ungültiger Benutzername"
+
+#: rhodecode/model/validators.py:329
+msgid "Your account is disabled"
+msgstr "Ihr Account wurde Deaktiviert"
+
+#: rhodecode/model/validators.py:373
+#, python-format
+msgid "Repository name %(repo)s is disallowed"
+msgstr "Repository  Name \"%(repo)s\" ist verboten"
+
+#: rhodecode/model/validators.py:375
+#, python-format
+msgid "Repository named %(repo)s already exists"
+msgstr "Es gibt bereits ein Repository mit \"%(repo)s\""
+
+#: rhodecode/model/validators.py:376
+#, python-format
+msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
+msgstr "Es gibt bereits ein Repository mit \"%(repo)s\" in der Gruppe \"%(group)s\""
+
+#: rhodecode/model/validators.py:378
+#, python-format
+msgid "Repository group with name \"%(repo)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:493
+msgid "invalid clone url"
+msgstr "ungültige Clone Adresse"
+
+#: rhodecode/model/validators.py:494
+msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
+msgstr ""
+
+#: rhodecode/model/validators.py:519
+msgid "Fork have to be the same type as parent"
+msgstr "Forke um den selben typ wie der Vorgesetze zu haben"
+
+#: rhodecode/model/validators.py:534
+msgid "You don't have permissions to create repository in this group"
+msgstr ""
+
+#: rhodecode/model/validators.py:536
+msgid "no permission to create repository in root location"
+msgstr ""
+
+#: rhodecode/model/validators.py:585
+msgid "You don't have permissions to create a group in this location"
+msgstr ""
+
+#: rhodecode/model/validators.py:626
+msgid "This username or user group name is not valid"
+msgstr ""
+
+#: rhodecode/model/validators.py:719
+msgid "This is not a valid path"
+msgstr "Dies ist ein Ungültiger Pfad"
+
+#: rhodecode/model/validators.py:734
+msgid "This e-mail address is already taken"
+msgstr "Diese EMail Addresse ist schon in Benutzung"
+
+#: rhodecode/model/validators.py:754
+#, python-format
+msgid "e-mail \"%(email)s\" does not exist."
+msgstr "EMail Addresse \"%(email)s\" existiert nicht."
+
+#: rhodecode/model/validators.py:791
+msgid ""
+"The LDAP Login attribute of the CN must be specified - this is the name of "
+"the attribute that is equivalent to \"username\""
+msgstr "Das LDAP Login Attribut des CN muss angeben werden - Es ist der Name des Attributes welches das Equivalent zum \"Benutzername\" ist"
+
+#: rhodecode/model/validators.py:804
+#, python-format
+msgid "Revisions %(revs)s are already part of pull request or have set status"
+msgstr ""
+
+#: rhodecode/model/validators.py:836
+msgid "Please enter a valid IPv4 or IpV6 address"
+msgstr ""
+
+#: rhodecode/model/validators.py:837
+#, python-format
+msgid ""
+"The network size (bits) must be within the range of 0-32 (not %(bits)r)"
+msgstr ""
+
+#: rhodecode/model/validators.py:870
+msgid "Key name can only consist of letters, underscore, dash or numbers"
+msgstr ""
+
+#: rhodecode/model/validators.py:884
+msgid "Filename cannot be inside a directory"
+msgstr ""
+
+#: rhodecode/model/validators.py:900
+#, python-format
+msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
+msgstr ""
+
+#: rhodecode/templates/index.html:5
+msgid "Dashboard"
+msgstr "Übersichtsseite"
+
+#: rhodecode/templates/index_base.html:6
+#: rhodecode/templates/admin/my_account/my_account_repos.html:3
+#: rhodecode/templates/admin/my_account/my_account_watched.html:3
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:12
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:12
+#: rhodecode/templates/admin/users/users.html:12
+#: rhodecode/templates/bookmarks/bookmarks.html:12
+#: rhodecode/templates/branches/branches.html:12
+#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:50
+#: rhodecode/templates/tags/tags.html:12
+msgid "quick filter..."
+msgstr "Schnellfilter..."
+
+#: rhodecode/templates/index_base.html:6
+#: rhodecode/templates/admin/repos/repos.html:12
+msgid "repositories"
+msgstr "Repositories"
+
+#: rhodecode/templates/index_base.html:20
+#: rhodecode/templates/index_base.html:25
+#: rhodecode/templates/admin/repos/repo_add.html:22
+#: rhodecode/templates/admin/repos/repos.html:25
+msgid "Add Repository"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:22
+#: rhodecode/templates/index_base.html:27
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:16
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:29
+msgid "Add Repository Group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:32
+msgid "You have admin right to this group, and can edit it"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:32
+msgid "Edit Repository Group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:45
+msgid "Group Name"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:46
+#: rhodecode/templates/index_base.html:128
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:64
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:45
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:17
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:32
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:72
+#: rhodecode/templates/admin/repos/repos.html:51
+#: rhodecode/templates/admin/user_groups/user_group_add.html:43
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:51
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:64
+#: rhodecode/templates/email_templates/changeset_comment.html:16
+#: rhodecode/templates/email_templates/pull_request.html:9
+#: rhodecode/templates/forks/fork.html:41
+#: rhodecode/templates/pullrequests/pullrequest.html:40
+#: rhodecode/templates/pullrequests/pullrequest_show.html:86
+#: rhodecode/templates/summary/summary.html:88
+msgid "Description"
+msgstr "Beschreibung"
+
+#: rhodecode/templates/index_base.html:126
+#: rhodecode/templates/admin/my_account/my_account_repos.html:46
+#: rhodecode/templates/admin/my_account/my_account_watched.html:46
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:50
+#: rhodecode/templates/admin/repos/repo_add_base.html:9
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:7
+#: rhodecode/templates/admin/repos/repos.html:50
+#: rhodecode/templates/admin/user_groups/user_groups.html:50
+#: rhodecode/templates/base/perms_summary.html:53
+#: rhodecode/templates/bookmarks/bookmarks.html:51
+#: rhodecode/templates/bookmarks/bookmarks_data.html:7
+#: rhodecode/templates/branches/branches.html:50
+#: rhodecode/templates/branches/branches_data.html:7
+#: rhodecode/templates/files/files_browser.html:41
+#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/journal/journal.html:288
+#: rhodecode/templates/tags/tags.html:51
+#: rhodecode/templates/tags/tags_data.html:7
+msgid "Name"
+msgstr "Name"
+
+#: rhodecode/templates/index_base.html:129
+msgid "Last Change"
+msgstr "Letzte Änderung"
+
+#: rhodecode/templates/index_base.html:131
+#: rhodecode/templates/admin/my_account/my_account_repos.html:48
+#: rhodecode/templates/admin/my_account/my_account_watched.html:48
+#: rhodecode/templates/admin/repos/repos.html:52
+#: rhodecode/templates/journal/journal.html:199
+#: rhodecode/templates/journal/journal.html:290
+msgid "Tip"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:133
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:10
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:53
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:60
+#: rhodecode/templates/admin/repos/repos.html:53
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:8
+#: rhodecode/templates/admin/user_groups/user_groups.html:54
+#: rhodecode/templates/summary/summary.html:141
+msgid "Owner"
+msgstr "Besitzer"
+
+#: rhodecode/templates/index_base.html:141
+#: rhodecode/templates/admin/my_account/my_account_repos.html:57
+#: rhodecode/templates/admin/my_account/my_account_watched.html:57
+#: rhodecode/templates/base/root.html:69
+#: rhodecode/templates/bookmarks/bookmarks.html:81
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:208
+#: rhodecode/templates/journal/journal.html:299
+#: rhodecode/templates/tags/tags.html:81
+msgid "Click to sort ascending"
+msgstr "Klicken um Aufsteigend zu Sortieren"
+
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/admin/my_account/my_account_repos.html:58
+#: rhodecode/templates/admin/my_account/my_account_watched.html:58
+#: rhodecode/templates/base/root.html:70
+#: rhodecode/templates/bookmarks/bookmarks.html:82
+#: rhodecode/templates/branches/branches.html:81
+#: rhodecode/templates/journal/journal.html:209
+#: rhodecode/templates/journal/journal.html:300
+#: rhodecode/templates/tags/tags.html:82
+msgid "Click to sort descending"
+msgstr "Klicken um Absteigend zu Sortieren"
+
+#: rhodecode/templates/index_base.html:143
+msgid "No repositories found."
+msgstr ""
+
+#: rhodecode/templates/index_base.html:144
+#: rhodecode/templates/admin/my_account/my_account_repos.html:60
+#: rhodecode/templates/admin/my_account/my_account_watched.html:60
+#: rhodecode/templates/base/root.html:72
+#: rhodecode/templates/bookmarks/bookmarks.html:84
+#: rhodecode/templates/branches/branches.html:83
+#: rhodecode/templates/journal/journal.html:211
+#: rhodecode/templates/journal/journal.html:302
+#: rhodecode/templates/tags/tags.html:84
+msgid "Data error."
+msgstr "Datenfehler."
+
+#: rhodecode/templates/index_base.html:145
+#: rhodecode/templates/admin/my_account/my_account_repos.html:61
+#: rhodecode/templates/admin/my_account/my_account_watched.html:61
+#: rhodecode/templates/base/base.html:148
+#: rhodecode/templates/base/root.html:73
+#: rhodecode/templates/bookmarks/bookmarks.html:85
+#: rhodecode/templates/branches/branches.html:84
+#: rhodecode/templates/journal/journal.html:212
+#: rhodecode/templates/journal/journal.html:303
+#: rhodecode/templates/tags/tags.html:85
+msgid "Loading..."
+msgstr "Lade..."
+
+#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:32
+#: rhodecode/templates/base/base.html:267
+msgid "Log In"
+msgstr ""
+
+#: rhodecode/templates/login.html:30
+#, python-format
+msgid "Log In to %s"
+msgstr ""
+
+#: rhodecode/templates/login.html:43 rhodecode/templates/register.html:40
+#: rhodecode/templates/admin/admin_log.html:5
+#: rhodecode/templates/admin/my_account/my_account_profile.html:30
+#: rhodecode/templates/admin/users/user_add.html:35
+#: rhodecode/templates/admin/users/user_edit_profile.html:33
+#: rhodecode/templates/admin/users/users.html:53
+#: rhodecode/templates/base/base.html:243
+msgid "Username"
+msgstr "Benutzername"
+
+#: rhodecode/templates/login.html:52 rhodecode/templates/register.html:49
+#: rhodecode/templates/admin/my_account/my_account.html:39
+#: rhodecode/templates/admin/users/user_add.html:44
+#: rhodecode/templates/base/base.html:252
+msgid "Password"
+msgstr "Passwort"
+
+#: rhodecode/templates/login.html:62
+msgid "Remember me"
+msgstr "Login Speichern"
+
+#: rhodecode/templates/login.html:66
+msgid "Sign In"
+msgstr "Einloggen"
+
+#: rhodecode/templates/login.html:72
+msgid "Forgot your password ?"
+msgstr "Passowrt Vergessen?"
+
+#: rhodecode/templates/login.html:75 rhodecode/templates/base/base.html:263
+msgid "Don't have an account ?"
+msgstr "Kein Account?"
+
+#: rhodecode/templates/password_reset.html:5
+msgid "Password Reset"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:29
+#, python-format
+msgid "Reset your Password to %s"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:31
+msgid "Reset your Password"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:42
+msgid "Email Address"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:52
+#: rhodecode/templates/register.html:95
+msgid "Captcha"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:63
+msgid "Send password reset email"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:64
+msgid "Password reset link will be send to matching email address"
+msgstr "Der Passwort Reset LInk wird an die passende EMail Addresse gesendet"
+
+#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:30
+#: rhodecode/templates/register.html:106
+msgid "Sign Up"
+msgstr "Registrieren"
+
+#: rhodecode/templates/register.html:28
+#, python-format
+msgid "Sign Up to %s"
+msgstr ""
+
+#: rhodecode/templates/register.html:58
+msgid "Re-enter password"
+msgstr "Passwort erneut eingeben"
+
+#: rhodecode/templates/register.html:67
+#: rhodecode/templates/admin/my_account/my_account_profile.html:41
+#: rhodecode/templates/admin/users/user_add.html:62
+#: rhodecode/templates/admin/users/user_edit_profile.html:87
+msgid "First Name"
+msgstr "Vorname"
+
+#: rhodecode/templates/register.html:76
+#: rhodecode/templates/admin/my_account/my_account_profile.html:50
+#: rhodecode/templates/admin/users/user_add.html:71
+#: rhodecode/templates/admin/users/user_edit_profile.html:96
+msgid "Last Name"
+msgstr "Nachname"
+
+#: rhodecode/templates/register.html:85
+#: rhodecode/templates/admin/my_account/my_account_profile.html:59
+#: rhodecode/templates/admin/settings/settings.html:44
+#: rhodecode/templates/admin/users/user_add.html:80
+#: rhodecode/templates/admin/users/user_edit_profile.html:42
+msgid "Email"
+msgstr "EMail"
+
+#: rhodecode/templates/register.html:108
+msgid "Your account will be activated right after registration"
+msgstr "Ihr Account muss direkt nach der Registrierung aktiviert werden"
+
+#: rhodecode/templates/register.html:110
+msgid "Your account must wait for activation by administrator"
+msgstr "Ihr Account muss durch einen Administrator aktiviert werden"
+
+#: rhodecode/templates/switch_to_list.html:10
+#: rhodecode/templates/branches/branches_data.html:67
+msgid "There are no branches yet"
+msgstr "Es gibt bisher keine Branches"
+
+#: rhodecode/templates/switch_to_list.html:16
+msgid "Closed Branches"
+msgstr ""
+
+#: rhodecode/templates/switch_to_list.html:32
+#: rhodecode/templates/tags/tags_data.html:44
+msgid "There are no tags yet"
+msgstr "Es gibt bisher keine Tags"
+
+#: rhodecode/templates/switch_to_list.html:45
+#: rhodecode/templates/bookmarks/bookmarks_data.html:43
+msgid "There are no bookmarks yet"
+msgstr "Es gibt bisher keine Lesezeichen"
+
+#: rhodecode/templates/admin/admin.html:5
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/base/base.html:69
+msgid "Admin journal"
+msgstr "Admin Logbuch"
+
+#: rhodecode/templates/admin/admin.html:13
+msgid "journal filter..."
+msgstr "Logbuch filter..."
+
+#: rhodecode/templates/admin/admin.html:15
+#: rhodecode/templates/journal/journal.html:14
+msgid "filter"
+msgstr ""
+
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/journal/journal.html:15
+#, python-format
+msgid "%s entry"
+msgid_plural "%s entries"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/admin/admin_log.html:6
+#: rhodecode/templates/admin/my_account/my_account_repos.html:50
+#: rhodecode/templates/admin/my_account/my_account_watched.html:50
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:54
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:8
+#: rhodecode/templates/admin/repos/repos.html:55
+#: rhodecode/templates/admin/user_groups/user_groups.html:55
+#: rhodecode/templates/admin/users/users.html:60
+#: rhodecode/templates/journal/journal.html:201
+#: rhodecode/templates/journal/journal.html:292
+msgid "Action"
+msgstr "Aktion"
+
+#: rhodecode/templates/admin/admin_log.html:7
+#: rhodecode/templates/admin/permissions/permissions_globals.html:18
+msgid "Repository"
+msgstr "Repository"
+
+#: rhodecode/templates/admin/admin_log.html:8
+#: rhodecode/templates/bookmarks/bookmarks.html:53
+#: rhodecode/templates/bookmarks/bookmarks_data.html:9
+#: rhodecode/templates/branches/branches.html:52
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/tags/tags.html:53
+#: rhodecode/templates/tags/tags_data.html:9
+msgid "Date"
+msgstr "Datum"
+
+#: rhodecode/templates/admin/admin_log.html:9
+msgid "From IP"
+msgstr "Von IP"
+
+#: rhodecode/templates/admin/admin_log.html:63
+msgid "No actions yet"
+msgstr "Es sind bisher keine Aktionen passiert"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:5
+msgid "Authentication Settings"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:14
+#: rhodecode/templates/base/base.html:75
+msgid "Authentication"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:31
+msgid "Authentication Plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:34
+msgid "Enabled Plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:36
+msgid ""
+"Comma separated list of plugins. Order of plugins is also order in which "
+"RhodeCode will try to authenticate user"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:37
+msgid "Available built-in plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:65
+msgid "enabled"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:66
+msgid "disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:51
+#: rhodecode/templates/admin/defaults/defaults.html:87
+#: rhodecode/templates/admin/my_account/my_account_password.html:33
+#: rhodecode/templates/admin/my_account/my_account_profile.html:68
+#: rhodecode/templates/admin/permissions/permissions_globals.html:108
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:72
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:114
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:101
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:134
+#: rhodecode/templates/admin/settings/settings_hooks.html:53
+#: rhodecode/templates/admin/user_groups/user_group_add.html:60
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:104
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:67
+#: rhodecode/templates/admin/users/user_add.html:99
+#: rhodecode/templates/admin/users/user_edit_profile.html:122
+#: rhodecode/templates/base/default_perms_box.html:64
+msgid "Save"
+msgstr "Speichern"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:57
+msgid "Plugin"
+msgstr ""
+
+#: rhodecode/templates/admin/defaults/defaults.html:5
+#: rhodecode/templates/admin/defaults/defaults.html:28
+msgid "Repositories defaults"
+msgstr ""
+
+#: rhodecode/templates/admin/defaults/defaults.html:14
+#: rhodecode/templates/base/base.html:76
+msgid "Defaults"
+msgstr ""
+
+#: rhodecode/templates/admin/defaults/defaults.html:38
+#: rhodecode/templates/admin/repos/repo_add_base.html:59
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:7
+msgid "Type"
+msgstr "Typ"
+
+#: rhodecode/templates/admin/defaults/defaults.html:47
+#: rhodecode/templates/admin/repos/repo_add_base.html:77
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:82
+#: rhodecode/templates/data_table/_dt_elements.html:70
+msgid "Private repository"
+msgstr "Privates Repository"
+
+#: rhodecode/templates/admin/defaults/defaults.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:81
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:86
+#: rhodecode/templates/forks/fork.html:75
+msgid ""
+"Private repositories are only visible to people explicitly added as "
+"collaborators."
+msgstr ""
+
+#: rhodecode/templates/admin/defaults/defaults.html:58
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:91
+msgid "Enable statistics"
+msgstr "Aktiviere Statistiken"
+
+#: rhodecode/templates/admin/defaults/defaults.html:62
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:95
+msgid "Enable statistics window on summary page."
+msgstr ""
+
+#: rhodecode/templates/admin/defaults/defaults.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:100
+msgid "Enable downloads"
+msgstr "Aktiviere Downloads"
+
+#: rhodecode/templates/admin/defaults/defaults.html:72
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:104
+msgid "Enable download menu on summary page."
+msgstr ""
+
+#: rhodecode/templates/admin/defaults/defaults.html:78
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:34
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:109
+msgid "Enable locking"
+msgstr ""
+
+#: rhodecode/templates/admin/defaults/defaults.html:82
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:113
+msgid "Enable lock-by-pulling on repository."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:5
+#: rhodecode/templates/admin/gists/edit.html:22
+msgid "Edit Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:40
+#, python-format
+msgid ""
+"Gist was update since you started editing. Copy your changes and click "
+"%(here)s to reload new version."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:59
+#: rhodecode/templates/admin/gists/new.html:43
+msgid "Gist description ..."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:61
+#: rhodecode/templates/admin/gists/new.html:45
+msgid "Gist lifetime"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/edit.html:67
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/index.html:62
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/gists/show.html:52
+msgid "Expires"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+msgid "never"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:80
+#: rhodecode/templates/admin/gists/new.html:52
+#: rhodecode/templates/files/files_add.html:59
+#: rhodecode/templates/files/files_edit.html:64
+msgid "plain"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:147
+msgid "Update Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:148
+#: rhodecode/templates/changeset/changeset_file_comment.html:89
+msgid "Cancel"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:6
+#: rhodecode/templates/admin/gists/index.html:19
+#, python-format
+msgid "Private Gists for user %s"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:8
+#: rhodecode/templates/admin/gists/index.html:21
+#, python-format
+msgid "Public Gists for user %s"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:10
+#: rhodecode/templates/admin/gists/index.html:23
+msgid "Public Gists"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:40
+#: rhodecode/templates/admin/gists/show.html:28
+msgid "Create New Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:57
+#: rhodecode/templates/data_table/_dt_elements.html:143
+msgid "Created"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:77
+msgid "There are no gists yet"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:5
+#: rhodecode/templates/admin/gists/new.html:22
+msgid "New Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:51
+msgid "name this file..."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:60
+msgid "Create Private Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:61
+msgid "Create Public Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:62
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:70
+#: rhodecode/templates/admin/my_account/my_account_emails.html:46
+#: rhodecode/templates/admin/my_account/my_account_password.html:34
+#: rhodecode/templates/admin/my_account/my_account_profile.html:69
+#: rhodecode/templates/admin/permissions/permissions_globals.html:109
+#: rhodecode/templates/admin/permissions/permissions_ips.html:41
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:115
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:43
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:59
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:102
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:135
+#: rhodecode/templates/admin/settings/settings_global.html:56
+#: rhodecode/templates/admin/settings/settings_license.html:43
+#: rhodecode/templates/admin/settings/settings_vcs.html:81
+#: rhodecode/templates/admin/settings/settings_visual.html:116
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:105
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:70
+#: rhodecode/templates/admin/users/user_edit_emails.html:46
+#: rhodecode/templates/admin/users/user_edit_ips.html:50
+#: rhodecode/templates/admin/users/user_edit_profile.html:123
+#: rhodecode/templates/base/default_perms_box.html:65
+#: rhodecode/templates/files/files_add.html:70
+#: rhodecode/templates/files/files_delete.html:58
+#: rhodecode/templates/files/files_edit.html:73
+#: rhodecode/templates/pullrequests/pullrequest.html:83
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+#: rhodecode/templates/admin/gists/show.html:5
+#: rhodecode/templates/admin/gists/show.html:12
+msgid "Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:4
+#: rhodecode/templates/email_templates/pull_request.html:4
+#: rhodecode/templates/email_templates/pull_request_comment.html:4
+msgid "URL"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:40
+msgid "Public Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:42
+msgid "Private Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:59
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:80
+#: rhodecode/templates/changeset/changeset_file_comment.html:48
+#: rhodecode/templates/files/files_source.html:39
+#: rhodecode/templates/files/files_source.html:42
+#: rhodecode/templates/files/files_source.html:45
+msgid "Delete"
+msgstr "Löschen"
+
+#: rhodecode/templates/admin/gists/show.html:59
+msgid "Confirm to delete this Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:66
+#: rhodecode/templates/changeset/changeset_file_comment.html:81
+#: rhodecode/templates/changeset/changeset_file_comment.html:190
+#: rhodecode/templates/data_table/_dt_elements.html:167
+#: rhodecode/templates/data_table/_dt_elements.html:183
+#: rhodecode/templates/files/files_source.html:41
+#: rhodecode/templates/files/files_source.html:44
+msgid "Edit"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:68
+#: rhodecode/templates/files/files_edit.html:54
+#: rhodecode/templates/files/files_source.html:34
+msgid "Show as Raw"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:76
+msgid "created"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:89
+#: rhodecode/templates/files/files_source.html:71
+msgid "Show as raw"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:5
+#: rhodecode/templates/base/base.html:282
+msgid "My account"
+msgstr "Mein Account"
+
+#: rhodecode/templates/admin/my_account/my_account.html:12
+msgid "My Account"
+msgstr "Mein Account"
+
+#: rhodecode/templates/admin/my_account/my_account.html:38
+#: rhodecode/templates/admin/users/user_edit.html:42
+msgid "Profile"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:40
+#: rhodecode/templates/admin/users/user_edit.html:43
+msgid "API keys"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:41
+msgid "My Emails"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:42
+msgid "My Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:43
+#: rhodecode/templates/journal/journal.html:54
+msgid "Watched"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:44
+msgid "Pull requests"
+msgstr "Pull Request"
+
+#: rhodecode/templates/admin/my_account/my_account.html:45
+msgid "My permissions"
+msgstr "Meine Rechte"
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:6
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:6
+msgid "Built-in"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:32
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:32
+msgid "expires"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:14
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:14
+#, python-format
+msgid "Confirm to reset this api key: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:15
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:15
+msgid "reset"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:30
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:30
+msgid "expired"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:40
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:40
+#, python-format
+msgid "Confirm to remove this api key: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:42
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:42
+msgid "remove"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:49
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:49
+msgid "No additional api keys specified"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:61
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:61
+msgid "New api key"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:69
+#: rhodecode/templates/admin/my_account/my_account_emails.html:45
+#: rhodecode/templates/admin/permissions/permissions_ips.html:40
+#: rhodecode/templates/admin/repos/repo_add_base.html:85
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:58
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:69
+#: rhodecode/templates/admin/users/user_edit_emails.html:45
+#: rhodecode/templates/admin/users/user_edit_ips.html:49
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:7
+#: rhodecode/templates/admin/users/user_edit_emails.html:7
+msgid "Primary"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:19
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:24
+#: rhodecode/templates/admin/permissions/permissions_ips.html:14
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:18
+#: rhodecode/templates/admin/settings/settings_hooks.html:36
+#: rhodecode/templates/admin/users/user_edit_emails.html:19
+#: rhodecode/templates/admin/users/user_edit_ips.html:22
+#: rhodecode/templates/data_table/_dt_elements.html:131
+#: rhodecode/templates/data_table/_dt_elements.html:159
+#: rhodecode/templates/data_table/_dt_elements.html:175
+#: rhodecode/templates/data_table/_dt_elements.html:191
+msgid "delete"
+msgstr "löschen"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:20
+#: rhodecode/templates/admin/users/user_edit_emails.html:20
+#, python-format
+msgid "Confirm to delete this email: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:26
+#: rhodecode/templates/admin/users/user_edit_emails.html:26
+msgid "No additional emails specified"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:38
+#: rhodecode/templates/admin/users/user_edit_emails.html:38
+msgid "New email address"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:1
+msgid "Change your account password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:7
+msgid "Current password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:16
+#: rhodecode/templates/admin/users/user_edit_profile.html:69
+msgid "New password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:25
+msgid "Confirm new password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:9
+msgid "Change your avatar at"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:10
+#: rhodecode/templates/admin/users/user_edit_profile.html:9
+msgid "Using"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:11
+msgid "Avatars are disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:13
+msgid "Missing email, please update your user email address."
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:14
+#: rhodecode/templates/admin/users/user_edit_profile.html:15
+msgid "current IP"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:26
+msgid ""
+"Your user is in an external Source of Record; some details cannot be managed"
+" here"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:2
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:4
+msgid "Show closed pull requests"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:6
+msgid "Opened by me"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:15
+#, python-format
+msgid "Pull request #%s opened on %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:17
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:47
+#: rhodecode/templates/pullrequests/pullrequest_data.html:11
+#: rhodecode/templates/pullrequests/pullrequest_show.html:30
+#: rhodecode/templates/pullrequests/pullrequest_show.html:45
+msgid "Closed"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:25
+msgid "Confirm to delete this pull request"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:32
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:53
+msgid "Nothing here yet"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:36
+msgid "I participate in"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:44
+#: rhodecode/templates/pullrequests/pullrequest_data.html:8
+#, python-format
+msgid "Pull request #%s opened by %s on %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:1
+msgid "Repositories you are owner of"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:59
+#: rhodecode/templates/admin/my_account/my_account_watched.html:59
+#: rhodecode/templates/base/root.html:71
+#: rhodecode/templates/bookmarks/bookmarks.html:83
+#: rhodecode/templates/branches/branches.html:82
+#: rhodecode/templates/journal/journal.html:210
+#: rhodecode/templates/journal/journal.html:301
+#: rhodecode/templates/tags/tags.html:83
+msgid "No records found."
+msgstr "Keine Datensätze gefunden."
+
+#: rhodecode/templates/admin/my_account/my_account_watched.html:1
+msgid "Repositories you are watching"
+msgstr ""
+
+#: rhodecode/templates/admin/notifications/notifications.html:5
+#: rhodecode/templates/admin/notifications/notifications.html:12
+msgid "My Notifications"
+msgstr "Meine Benachrichtigungen"
+
+#: rhodecode/templates/admin/notifications/notifications.html:32
+msgid "All"
+msgstr "Alle"
+
+#: rhodecode/templates/admin/notifications/notifications.html:33
+msgid "Comments"
+msgstr "Kommentare"
+
+#: rhodecode/templates/admin/notifications/notifications.html:34
+#: rhodecode/templates/base/base.html:193
+msgid "Pull Requests"
+msgstr ""
+
+#: rhodecode/templates/admin/notifications/notifications.html:38
+msgid "Mark all read"
+msgstr "Markiere alle als gelesen"
+
+#: rhodecode/templates/admin/notifications/notifications_data.html:40
+msgid "No notifications here yet"
+msgstr "Bisher gibt es keine Benachrichtigungen"
+
+#: rhodecode/templates/admin/notifications/show_notification.html:5
+#: rhodecode/templates/admin/notifications/show_notification.html:14
+msgid "Show notification"
+msgstr "Zeige Benachrichtigung"
+
+#: rhodecode/templates/admin/notifications/show_notification.html:12
+#: rhodecode/templates/base/base.html:281
+msgid "Notifications"
+msgstr "Benachrichtigungen"
+
+#: rhodecode/templates/admin/permissions/permissions.html:5
+msgid "Permissions administration"
+msgstr "Rechte Administration"
+
+#: rhodecode/templates/admin/permissions/permissions.html:14
+#: rhodecode/templates/admin/permissions/permissions.html:37
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:55
+#: rhodecode/templates/admin/repos/repo_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:45
+#: rhodecode/templates/base/base.html:74
+msgid "Permissions"
+msgstr "Rechte"
+
+#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/settings/settings.html:42
+msgid "Global"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:42
+msgid "IP whitelist"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:43
+msgid "Overview"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:7
+msgid "Anonymous access"
+msgstr "Anonymer Zugang"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:13
+#, python-format
+msgid ""
+"Allow access to RhodeCode without need to log in. Anonymous users use %s "
+"user permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:26
+msgid ""
+"All default permissions on each repository will be reset to chosen "
+"permission, note that all custom default permission on repositories will be "
+"lost"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:27
+#: rhodecode/templates/admin/permissions/permissions_globals.html:40
+#: rhodecode/templates/admin/permissions/permissions_globals.html:54
+msgid "Overwrite existing settings"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:32
+#: rhodecode/templates/admin/repos/repo_add_base.html:41
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:42
+#: rhodecode/templates/data_table/_dt_elements.html:204
+#: rhodecode/templates/forks/fork.html:51
+msgid "Repository group"
+msgstr "Repository Gruppe"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:39
+msgid ""
+"All default permissions on each repository group will be reset to chosen "
+"permission, note that all custom default permission on repository groups "
+"will be lost"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:46
+#: rhodecode/templates/data_table/_dt_elements.html:211
+msgid "User group"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:53
+msgid ""
+"All default permissions on each user group will be reset to chosen "
+"permission, note that all custom default permission on repository groups "
+"will be lost"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:60
+msgid "Repository creation"
+msgstr "Repository erstellung"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:68
+msgid "Repository creation with group write access"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:72
+msgid ""
+"Write permission to repository groups allows creating repositories inside "
+"that group"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:77
+msgid "User group creation"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:85
+msgid "Repository forking"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:93
+msgid "Registration"
+msgstr "Registrierung"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:101
+msgid "External auth account activation"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_ips.html:1
+msgid "Default ip whitelist for all users"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_ips.html:15
+#: rhodecode/templates/admin/users/user_edit_ips.html:23
+#, python-format
+msgid "Confirm to delete this ip: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_ips.html:21
+#: rhodecode/templates/admin/users/user_edit_ips.html:30
+msgid "All IP addresses are allowed"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_ips.html:32
+#: rhodecode/templates/admin/users/user_edit_ips.html:42
+msgid "New ip address"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_perms.html:1
+msgid "Default user permissions overview"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:5
+msgid "Add repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:14
+#: rhodecode/templates/base/base.html:71 rhodecode/templates/base/base.html:90
+msgid "Repository groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:36
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:8
+#: rhodecode/templates/admin/user_groups/user_group_add.html:35
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:7
+msgid "Group name"
+msgstr "Gruppen name"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:54
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:26
+msgid "Group parent"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:63
+#: rhodecode/templates/admin/repos/repo_add_base.html:50
+msgid "Copy parent group permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:67
+#: rhodecode/templates/admin/repos/repo_add_base.html:54
+msgid "Copy permission set from parent repository group."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:5
+#, python-format
+msgid "%s Repository group settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:105
+msgid "Repository Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:24
+msgid "Add Child Group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:53
+#: rhodecode/templates/admin/repos/repo_edit.html:15
+#: rhodecode/templates/admin/repos/repo_edit.html:43
+#: rhodecode/templates/admin/settings/settings.html:14
+#: rhodecode/templates/admin/settings/settings.html:36
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:42
+#: rhodecode/templates/base/base.html:77
+#: rhodecode/templates/base/base.html:159
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:54
+#: rhodecode/templates/admin/repos/repo_edit.html:49
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:43
+#: rhodecode/templates/admin/users/user_edit.html:44
+msgid "Advanced"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:1
+#, python-format
+msgid "Repository Group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:6
+msgid "Top level repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:7
+msgid "Total repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:8
+msgid "Children groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_advanced.html:8
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+msgid "Created on"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:192
+#, python-format
+msgid "Confirm to delete this group: %s with %s repository"
+msgid_plural "Confirm to delete this group: %s with %s repositories"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:25
+msgid "Delete this repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:7
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:8
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:7
+#: rhodecode/templates/base/perms_summary.html:14
+msgid "none"
+msgstr "keine"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:8
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:8
+#: rhodecode/templates/base/perms_summary.html:15
+msgid "read"
+msgstr "lesen"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:9
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:10
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:9
+#: rhodecode/templates/base/perms_summary.html:16
+msgid "write"
+msgstr "schreiben"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:10
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:10
+#: rhodecode/templates/base/perms_summary.html:17
+msgid "admin"
+msgstr "admin"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:11
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:12
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:11
+msgid "user/user group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:28
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:45
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:24
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:37
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:28
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:45
+msgid "default"
+msgstr "standart"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:34
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:71
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:43
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:68
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:34
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:71
+msgid "revoke"
+msgstr "entziehen"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:47
+msgid "delegated admin"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:97
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:94
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:97
+msgid "Add new"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:103
+msgid "apply to children"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:107
+msgid "Both"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:108
+msgid ""
+"Set or revoke permission to all children of that group, including non-"
+"private repositories and other groups if selected."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:38
+msgid ""
+"Enable lock-by-pulling on group. This option will be applied to all other "
+"groups and repositories inside"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:4
+#, python-format
+msgid "%s Repository group dashboard"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:12
+msgid "Home"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:16
+msgid "with"
+msgstr "mit"
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:5
+msgid "Repository groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+msgid "repository groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:52
+msgid "Number of toplevel repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add.html:5
+msgid "Add repository"
+msgstr "Neues Repository"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:14
+msgid "Import existing repository ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:23
+#: rhodecode/templates/summary/summary.html:32
+msgid "Clone from"
+msgstr "Clone von"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:27
+msgid "Optional http[s] url from which repository should be cloned."
+msgstr "Optionale http[s] URL von diesem das Repository geclont werden soll."
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:36
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:76
+#: rhodecode/templates/forks/fork.html:45
+msgid ""
+"Keep it short and to the point. Use a README file for longer descriptions."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:45
+#: rhodecode/templates/forks/fork.html:55
+msgid "Optionaly select a group to put this repository into."
+msgstr "Wähle optional eine Gruppe in welcher das Repository platziert werden soll."
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:63
+msgid "Type of repository to create."
+msgstr "Repository Typ der erstellt werden soll."
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:51
+#: rhodecode/templates/forks/fork.html:61
+msgid "Landing revision"
+msgstr "Start Revision"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:72
+msgid ""
+"Default revision for files page, downloads, full text search index and "
+"readme generation"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:9
+#, python-format
+msgid "%s Creating repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:16
+msgid "Creating repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:30
+#, python-format
+msgid ""
+"Repository \"%(repo_name)s\" is beeing created, you will be redirected when "
+"this process is finished.repo_name"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:42
+msgid ""
+"We're sorry but error occured during this operation. Please check your "
+"RhodeCode server logs, or contact administrator."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:8
+#, python-format
+msgid "%s repository settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:52
+msgid "Extra fields"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:55
+msgid "Caches"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:58
+msgid "Remote"
+msgstr "Entfernt"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:61
+#: rhodecode/templates/summary/statistics.html:11
+#: rhodecode/templates/summary/summary.html:178
+#: rhodecode/templates/summary/summary.html:179
+msgid "Statistics"
+msgstr "Statistiken"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:1
+#: rhodecode/templates/summary/summary.html:25
+msgid "Fork of"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:6
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:5
+msgid "Set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:10
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:9
+msgid "Manually set this repository as a fork of another from the list"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:24
+msgid "Public journal visibility"
+msgstr "Sichtbarkeit des Öffentlichen Logbuches"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:32
+msgid "Remove from public journal"
+msgstr "Entferne aus dem Öffentlichen Logbuch"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:37
+msgid "Add to public journal"
+msgstr "Zum Öffentlichen Logbuch hinzufügen"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:43
+msgid ""
+"All actions made on this repository will be accessible to everyone in public"
+" journal"
+msgstr "Alle Aktionen die in diesem Repository durchgeführt wurden sind für jeden Zugänglich im Öffentlichen Logbuch"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:49
+msgid "Change locking"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:56
+msgid "Confirm to unlock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:58
+msgid "Unlock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:64
+msgid "Confirm to lock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:66
+msgid "Lock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:68
+msgid "Repository is not locked"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:73
+msgid ""
+"Force locking on repository. Works only when anonymous access is disabled. "
+"Trigering a pull locks repository by user who pulled, only the same user can"
+" unlock by doing a push"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:83
+#: rhodecode/templates/data_table/_dt_elements.html:132
+#, python-format
+msgid "Confirm to delete this repository: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:85
+msgid "Delete this repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:88
+#, python-format
+msgid "this repository has %s fork"
+msgid_plural "this repository has %s forks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:89
+msgid "Detach forks"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:90
+msgid "Delete forks"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:94
+msgid ""
+"This repository will be renamed in a special way in order to be unaccesible "
+"for RhodeCode and VCS systems. If you need to fully delete it from file "
+"system please do it manually"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Confirm to invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:7
+msgid ""
+"Manually invalidate cache for this repository. On first access repository "
+"will be cached again"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:12
+msgid "List of cached values"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:15
+msgid "Prefix"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:16
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:6
+msgid "Key"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:17
+#: rhodecode/templates/admin/user_groups/user_group_add.html:52
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:24
+#: rhodecode/templates/admin/user_groups/user_groups.html:53
+#: rhodecode/templates/admin/users/user_add.html:91
+#: rhodecode/templates/admin/users/user_edit_profile.html:105
+#: rhodecode/templates/admin/users/users.html:57
+msgid "Active"
+msgstr "Aktiv"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:5
+msgid "Label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:19
+#, python-format
+msgid "Confirm to delete this field: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:33
+msgid "New field key"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:41
+msgid "New field label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:44
+msgid "Enter short label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:50
+msgid "New field description"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:53
+msgid "Enter description of a field"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:66
+msgid "Extra fields are disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:21
+msgid "private repository"
+msgstr "privates Repository"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:3
+msgid "Remote url"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+msgid "Pull changes from remote location"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+msgid "Confirm to pull changes from remote side"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:14
+msgid "This repository does not have any remote url set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "Non-changeable id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "what is that ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:13
+msgid "URL by id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:14
+msgid ""
+"In case this repository is renamed or moved into another group the repository url changes.\n"
+"                               Using above url guarantees that this repository will allways be accessible under such url.\n"
+"                               Usefull for CI systems, or any other cases that you need to hardcode the url into 3rd party service."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:21
+msgid "Clone uri"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:27
+#: rhodecode/templates/base/perms_summary.html:43
+#: rhodecode/templates/base/perms_summary.html:79
+#: rhodecode/templates/base/perms_summary.html:81
+#: rhodecode/templates/data_table/_dt_elements.html:124
+#: rhodecode/templates/data_table/_dt_elements.html:125
+#: rhodecode/templates/data_table/_dt_elements.html:152
+#: rhodecode/templates/data_table/_dt_elements.html:153
+#: rhodecode/templates/data_table/_dt_elements.html:169
+#: rhodecode/templates/data_table/_dt_elements.html:185
+msgid "edit"
+msgstr "bearbeiten"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:30
+msgid "new value"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:37
+msgid "http[s] url used for doing remote pulls."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:46
+msgid "Optional select a group to put this repository into."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:55
+#: rhodecode/templates/forks/fork.html:65
+msgid "Default revision for files page, downloads, whoosh and readme"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:65
+msgid "Change owner of this repository."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:6
+msgid "Processed commits"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:7
+msgid "Processed progress"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Reset statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Confirm to remove current statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repos.html:5
+msgid "Repositories administration"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repos.html:54
+msgid "State"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:5
+msgid "Settings administration"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:40
+msgid "VCS"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:41
+msgid "Remap and rescan"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:43
+msgid "Visual"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:45
+#: rhodecode/templates/admin/settings/settings_vcs.html:19
+msgid "Hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:46
+msgid "Full text search"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:47
+msgid "System Info"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:48
+msgid "License"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:4
+msgid "Email prefix"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:5
+msgid "RhodeCode email from"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:6
+msgid "Error email from"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:7
+msgid "Error email recipients"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:9
+msgid "SMTP server"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:10
+msgid "SMTP username"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:11
+msgid "SMTP password"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:12
+msgid "SMTP port"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:14
+msgid "SMTP use TLS"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:15
+msgid "SMTP use SSL"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:16
+msgid "SMTP auth"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:31
+msgid "Send test email to"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:39
+msgid "Send"
+msgstr "Senden"
+
+#: rhodecode/templates/admin/settings/settings_global.html:8
+msgid "Site branding"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:12
+msgid "Set a custom title for your RhodeCode Service."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:18
+msgid "HTTP authentication realm"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:27
+msgid "Google Analytics code"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:36
+msgid "ReCaptcha public key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:40
+msgid "Public key for reCaptcha system."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:46
+msgid "ReCaptcha private key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:50
+msgid ""
+"Private key for reCaptcha system. Setting this value will enable captcha on "
+"registration"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:55
+#: rhodecode/templates/admin/settings/settings_license.html:42
+#: rhodecode/templates/admin/settings/settings_vcs.html:80
+#: rhodecode/templates/admin/settings/settings_visual.html:115
+msgid "Save settings"
+msgstr "Einstellungen speichern"
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:1
+msgid "Built in Mercurial hooks - read only"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:15
+msgid ""
+"Hooks can be used to trigger actions on certain events such as push / pull. "
+"They can trigger Python functions or external applications."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:19
+msgid "Custom hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:69
+msgid "Failed to remove hook"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:2
+msgid "Currently you're using a free license, which is limited to 20 users."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:9
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "RhodeCode version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "License token"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "No license token"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:13
+msgid "License issued to"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:14
+msgid "License issued on"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "License users limit"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "unlimited"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:16
+msgid "License expires on"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:33
+msgid "License key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:37
+msgid "Paste your RhodeCode license key into that textarea."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:52
+msgid ""
+"Please enter following lines (if yet not present) into [app:main] section of"
+" your .ini file. The token below is autogenerated."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:6
+msgid "Rescan option"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:11
+msgid "Destroy old data"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:13
+msgid ""
+"In case a repository was deleted from filesystem and it still exists in the "
+"database check this option to scan obsolete data in database and remove it."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:17
+msgid "Invalidate cache for all repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:19
+msgid ""
+"Each cache data for repositories will be cleaned with this option selected. "
+"Use this to reload data and clear cache keys."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:23
+msgid "Install GIT hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:25
+msgid ""
+"Verify if RhodeCodes GIT hooks are installed for each repository. Current "
+"hooks will be updated to latest version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:32
+msgid "Rescan Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:7
+msgid "Index build option"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:12
+msgid "Build from scratch"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:15
+msgid ""
+"This option completely reindex all the files within RhodeCode for proper "
+"fulltext search capabilities."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:21
+msgid "Reindex"
+msgstr "Erneut Indizieren"
+
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "check for updates"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:5
+msgid "Python version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:6
+msgid "Platform"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:7
+msgid "GIT version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:8
+msgid "GIT path"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Upgrade info endpoint"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Note: please make sure this server can access this url"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:14
+msgid "Checking for updates..."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:22
+msgid "Python packages"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:6
+msgid "Web"
+msgstr "Web"
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:11
+msgid "Require SSL for vcs operations"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:13
+msgid ""
+"Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
+"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:24
+msgid "Show repository size after push"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:28
+msgid "Log user push commands"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:32
+msgid "Log user pull commands"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:36
+msgid "Update repository after push (hg update)"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:42
+msgid "Mercurial Extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:47
+msgid "Enable largefiles extension"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:51
+msgid "Enable hgsubversion extension"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:53
+msgid ""
+"Requires hgsubversion library to be installed. Allows cloning remote SVN "
+"repositories and migrates them to Mercurial type."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:64
+msgid "Repositories location"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:69
+msgid ""
+"Click to unlock. You must restart RhodeCode in order to make this setting "
+"take effect."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:72
+msgid ""
+"Filesystem location where repositories should be stored. After changing this"
+" value a restart and rescan of the repository folder are required."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:8
+msgid "General"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:13
+msgid "Use repository extra fields"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:15
+msgid "Allows storing additional customized fields per repository."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:18
+msgid "Show RhodeCode version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:20
+msgid "Shows or hides a version number of RhodeCode displayed in the footer."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:24
+msgid "Use Gravatars in RhodeCode"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:30
+msgid ""
+"Gravatar url allows you to use other avatar server application.\n"
+"                                                        Following variables of the URL will be replaced accordingly.\n"
+"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {email}     user email,\n"
+"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
+"                                                        {size}      size of the image that is expected from the server application,\n"
+"                                                        {netloc}    network location/server host of running RhodeCode server"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:42
+msgid ""
+"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
+"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {user}   current user username,\n"
+"                                                        {netloc} network location/server host of running RhodeCode server,\n"
+"                                                        {repo}   full repository name,\n"
+"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:54
+msgid "Dashboard items"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:58
+msgid ""
+"Number of items displayed in the main page dashboard before pagination is "
+"shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:64
+msgid "Admin pages items"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:68
+msgid ""
+"Number of items displayed in the admin pages grids before pagination is "
+"shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:74
+msgid "Icons"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:79
+msgid "Show public repo icon on repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:83
+msgid "Show private repo icon on repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:85
+msgid "Show public/private icons next to repositories names."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:91
+msgid "Meta-Tagging"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:96
+msgid "Stylify recognised meta tags:"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:110
+msgid ""
+"Parses meta tags from repository description field and turns them into "
+"colored tags."
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:5
+msgid "Add user group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:13
+#: rhodecode/templates/base/base.html:73 rhodecode/templates/base/base.html:93
+msgid "User groups"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:28
+msgid "Add User Group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:19
+msgid "Short, optional description for this user group."
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:5
+#, python-format
+msgid "%s user group settings"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:14
+msgid "User Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:44
+#: rhodecode/templates/admin/users/user_edit.html:45
+msgid "Default permissions"
+msgstr "Standart Rechte"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:6
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:32
+#: rhodecode/templates/admin/user_groups/user_groups.html:52
+msgid "Members"
+msgstr "Mitglieder"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:1
+#, python-format
+msgid "User Group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:19
+#: rhodecode/templates/data_table/_dt_elements.html:176
+#, python-format
+msgid "Confirm to delete this user group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:21
+msgid "Delete this user group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_members.html:15
+msgid "No members yet"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:40
+msgid "Chosen group members"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:43
+msgid "Remove all elements"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:53
+msgid "Available members"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:56
+msgid "Add all elements"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:5
+msgid "User groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+msgid "user groups"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_add.html:5
+msgid "Add user"
+msgstr "Benutzer hinzufügen"
+
+#: rhodecode/templates/admin/users/user_add.html:13
+#: rhodecode/templates/admin/users/user_edit.html:14
+#: rhodecode/templates/base/base.html:72
+msgid "Users"
+msgstr "Benutzer"
+
+#: rhodecode/templates/admin/users/user_add.html:15
+#: rhodecode/templates/admin/users/users.html:27
+msgid "Add User"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_add.html:53
+msgid "Password confirmation"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:5
+#, python-format
+msgid "%s user settings"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:46
+msgid "Emails"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:47
+msgid "Ip whitelist"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:1
+#, python-format
+msgid "User: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_profile.html:51
+msgid "Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:9
+msgid "Last Login"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:10
+msgid "Member of User groups"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:160
+#, python-format
+msgid "Confirm to delete this user: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:23
+msgid "Delete this user"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_ips.html:8
+#, python-format
+msgid "Inherited from %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:8
+msgid "Change avatar at"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:12
+msgid "Missing email, please update this user email address."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:27
+#, python-format
+msgid ""
+"This user is in an external Source of Record (%s); some details cannot be "
+"managed here."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:60
+msgid "Name in Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:78
+msgid "New password confirmation"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:5
+msgid "Users administration"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:13
+msgid "users"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:54
+msgid "Firstname"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:55
+msgid "Lastname"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:56
+msgid "Last login"
+msgstr ""
+
+#: rhodecode/templates/admin/users/users.html:59
+msgid "Auth type"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:37
+#, python-format
+msgid "Server instance: %s"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:46
+msgid "Support"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:131
+msgid "Create fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:142
+#: rhodecode/templates/data_table/_dt_elements.html:11
+#: rhodecode/templates/data_table/_dt_elements.html:15
+#: rhodecode/templates/summary/summary.html:11
+msgid "Summary"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:143
+#: rhodecode/templates/changelog/changelog.html:17
+#: rhodecode/templates/data_table/_dt_elements.html:19
+#: rhodecode/templates/data_table/_dt_elements.html:23
+msgid "Changelog"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:144
+#: rhodecode/templates/data_table/_dt_elements.html:27
+#: rhodecode/templates/data_table/_dt_elements.html:31
+#: rhodecode/templates/files/files.html:15
+msgid "Files"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:146
+msgid "Switch To"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:155
+msgid "Options"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:163
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:165
+#: rhodecode/templates/bookmarks/bookmarks.html:58
+#: rhodecode/templates/bookmarks/bookmarks_data.html:13
+#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/branches/branches_data.html:13
+#: rhodecode/templates/tags/tags.html:58
+#: rhodecode/templates/tags/tags_data.html:13
+msgid "Compare"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:167
+#: rhodecode/templates/base/base.html:334
+#: rhodecode/templates/search/search.html:17
+#: rhodecode/templates/search/search.html:57
+msgid "Search"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:171
+msgid "Unlock"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:173
+msgid "Lock"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:181
+msgid "Follow"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:182
+msgid "Unfollow"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:185
+#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/data_table/_dt_elements.html:39
+#: rhodecode/templates/forks/fork.html:12
+msgid "Fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:187
+msgid "Create Pull Request"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:193
+#, python-format
+msgid "Show Pull Requests for %s"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:230
+msgid "Not logged in"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:237
+msgid "Login to your account"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:260
+msgid "Forgot password ?"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:283
+msgid "Log Out"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:308
+msgid "Show recent activity"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:309
+#: rhodecode/templates/journal/journal.html:4
+msgid "Journal"
+msgstr "Logbuch"
+
+#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:315
+msgid "Public journal"
+msgstr "Öffentliches Logbuch"
+
+#: rhodecode/templates/base/base.html:320
+msgid "Show public gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:321
+msgid "Gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:324
+msgid "Create new gist"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:325
+msgid "All public gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:327
+msgid "My public gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:328
+msgid "My private gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:333
+msgid "Search in repositories"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:394
+msgid "No matches found"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:522
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:531
+msgid "Site-wide shortcuts"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:14
+msgid "Inherit from defaults"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:19
+#, python-format
+msgid ""
+"Select to inherit permissions from %s permissions settings, and default IP "
+"address whitelist."
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:28
+msgid "Create repositories"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:33
+msgid "Select this option to allow repository creation for this user"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:40
+msgid "Create user groups"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:45
+msgid "Select this option to allow user group creation for this user"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:52
+msgid "Fork repositories"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:57
+msgid "Select this option to allow repository forking for this user"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:13
+msgid "show"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:22
+msgid "No permissions defined yet"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:30
+#: rhodecode/templates/base/perms_summary.html:54
+msgid "Permission"
+msgstr "Rechte"
+
+#: rhodecode/templates/base/perms_summary.html:32
+#: rhodecode/templates/base/perms_summary.html:56
+msgid "Edit Permission"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:90
+msgid "No permission defined"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:47
+msgid "Add another comment"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:48
+#: rhodecode/templates/data_table/_dt_elements.html:216
+msgid "Stop following this repository"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:49
+msgid "Start following this repository"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:50
+msgid "Group"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:51
+msgid "members"
+msgstr "mitglieder"
+
+#: rhodecode/templates/base/root.html:52
+#: rhodecode/templates/pullrequests/pullrequest.html:202
+msgid "Loading ..."
+msgstr ""
+
+#: rhodecode/templates/base/root.html:53
+msgid "loading ..."
+msgstr ""
+
+#: rhodecode/templates/base/root.html:54
+msgid "Search truncated"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:55
+msgid "No matching files"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:56
+#: rhodecode/templates/changelog/changelog.html:51
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
+msgid "Open new pull request"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:57
+msgid "Open new pull request for selected changesets"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:58
+msgid "Show selected changesets __S -> __E"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:59
+msgid "Show selected changeset __S"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:60
+msgid "Selection link"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:61
+#: rhodecode/templates/changeset/diff_block.html:8
+msgid "Collapse diff"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:62
+msgid "Expand diff"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:63
+msgid "Failed to revoke permission"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:64
+msgid "confirm to revoke permission for {0}: {1} ?"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:68
+msgid "specify changeset"
+msgstr ""
+
+#: rhodecode/templates/bookmarks/bookmarks.html:5
+#, python-format
+msgid "%s Bookmarks"
+msgstr ""
+
+#: rhodecode/templates/bookmarks/bookmarks.html:29
+msgid "Compare Bookmarks"
+msgstr ""
+
+#: rhodecode/templates/bookmarks/bookmarks.html:55
+#: rhodecode/templates/bookmarks/bookmarks_data.html:10
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:10
+#: rhodecode/templates/changelog/changelog_summary_data.html:8
+#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/tags/tags_data.html:10
+msgid "Author"
+msgstr ""
+
+#: rhodecode/templates/bookmarks/bookmarks.html:56
+#: rhodecode/templates/bookmarks/bookmarks_data.html:12
+#: rhodecode/templates/branches/branches.html:55
+#: rhodecode/templates/branches/branches_data.html:12
+#: rhodecode/templates/changelog/changelog_summary_data.html:5
+#: rhodecode/templates/tags/tags.html:56
+#: rhodecode/templates/tags/tags_data.html:12
+msgid "Revision"
+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/changelog/changelog.html:6
+#, python-format
+msgid "%s Changelog"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:21
+#, python-format
+msgid "showing %d out of %d revision"
+msgid_plural "showing %d out of %d revisions"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/changelog/changelog.html:43
+msgid "Clear selection"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:47
+#: rhodecode/templates/forks/forks_data.html:19
+#, python-format
+msgid "Compare fork with %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:49
+#, python-format
+msgid "Compare fork with Parent(%s)"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:56
+msgid "Show"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:82
+#: rhodecode/templates/changelog/changelog_summary_data.html:19
+#, python-format
+msgid ""
+"Changeset status: %s\n"
+"Click to open associated pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:86
+#: rhodecode/templates/compare/compare_cs.html:18
+#, python-format
+msgid "Changeset status: %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:105
+#: rhodecode/templates/compare/compare_cs.html:36
+msgid "Expand commit message"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:114
+msgid "Changeset has comments"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:124
+#: rhodecode/templates/changelog/changelog_summary_data.html:50
+#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset_range.html:93
+#, python-format
+msgid "Bookmark %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:130
+#: rhodecode/templates/changelog/changelog_summary_data.html:56
+#: rhodecode/templates/changeset/changeset.html:100
+#: rhodecode/templates/changeset/changeset_range.html:99
+#, python-format
+msgid "Tag %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:135
+#: rhodecode/templates/changelog/changelog_summary_data.html:61
+#: rhodecode/templates/changeset/changeset.html:105
+#: rhodecode/templates/changeset/changeset_range.html:103
+#, python-format
+msgid "Branch %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:299
+msgid "There are no changes yet"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_details.html:4
+#: rhodecode/templates/changeset/changeset.html:76
+msgid "Removed"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_details.html:5
+#: rhodecode/templates/changeset/changeset.html:77
+msgid "Changed"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_details.html:6
+#: rhodecode/templates/changeset/changeset.html:78
+msgid "Added"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_details.html:8
+#: rhodecode/templates/changelog/changelog_details.html:9
+#: rhodecode/templates/changelog/changelog_details.html:10
+#: rhodecode/templates/changeset/changeset.html:80
+#: rhodecode/templates/changeset/changeset.html:81
+#: rhodecode/templates/changeset/changeset.html:82
+#, python-format
+msgid "Affected %s files"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:6
+#: rhodecode/templates/files/files_add.html:65
+#: rhodecode/templates/files/files_delete.html:53
+msgid "Commit message"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:7
+msgid "Age"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:9
+msgid "Refs"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:86
+msgid "Add or upload files directly via RhodeCode"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:89
+#: rhodecode/templates/files/files_ypjax.html:9
+msgid "Add New File"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:95
+msgid "Push new repo"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:103
+msgid "Existing repository?"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:6
+#, python-format
+msgid "%s Changeset"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:37
+msgid "parent rev."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:43
+msgid "child rev."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:51
+#: rhodecode/templates/changeset/changeset_file_comment.html:41
+#: rhodecode/templates/changeset/changeset_range.html:51
+msgid "Changeset status"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:55
+#: rhodecode/templates/changeset/diff_block.html:27
+#: rhodecode/templates/files/diff_2way.html:52
+msgid "Raw diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:58
+msgid "Patch diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:61
+#: rhodecode/templates/changeset/diff_block.html:30
+#: rhodecode/templates/files/diff_2way.html:55
+msgid "Download diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:111
+#, python-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:111
+#, python-format
+msgid "(%d inline)"
+msgid_plural "(%d inline)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/changeset/changeset.html:88
+#: rhodecode/templates/changeset/changeset_range.html:89
+msgid "merge"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:124
+#: rhodecode/templates/compare/compare_diff.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:160
+#, python-format
+msgid "%s file changed"
+msgid_plural "%s files changed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/changeset/changeset.html:126
+#: rhodecode/templates/compare/compare_diff.html:59
+#: rhodecode/templates/pullrequests/pullrequest_show.html:162
+#, python-format
+msgid "%s file changed with %s insertions and %s deletions"
+msgid_plural "%s files changed with %s insertions and %s deletions"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
+msgid "Showing a huge diff might take some time and resources"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
+msgid "Show full diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:214
+#: rhodecode/templates/changeset/changeset.html:251
+msgid "no revisions"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:23
+#, python-format
+msgid "Vote on pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:25
+#, python-format
+msgid "Comment on pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:30
+msgid "Status change on changeset"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:32
+msgid "Comment on changeset"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:63
+msgid "Submitting..."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:66
+msgid "Commenting on line {1}."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:153
+#, python-format
+msgid "Comments parsed using %s syntax with %s support."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:69
+#: rhodecode/templates/changeset/changeset_file_comment.html:155
+msgid ""
+"Use @username inside this text to send notification to this RhodeCode user"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:73
+#: rhodecode/templates/changeset/changeset_file_comment.html:166
+msgid "Preview"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:80
+#: rhodecode/templates/changeset/changeset_file_comment.html:189
+msgid "Comment preview"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:196
+#: rhodecode/templates/email_templates/changeset_comment.html:11
+#: rhodecode/templates/email_templates/pull_request_comment.html:16
+msgid "Comment"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:96
+msgid "You need to be logged in to comment."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:96
+msgid "Login now"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:100
+msgid "Hide"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:159
+msgid "Vote for pull request status"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:161
+msgid "Change changeset status"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:179
+msgid "Close (when approved or rejected)"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_range.html:5
+#, python-format
+msgid "%s Changesets"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_range.html:59
+msgid "Files affected"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:21
+#: rhodecode/templates/files/diff_2way.html:46
+msgid "Show full diff for this file"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:24
+#: rhodecode/templates/changeset/diff_block.html:68
+#: rhodecode/templates/files/diff_2way.html:49
+msgid "Show full side-by-side diff for this file"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:38
+msgid "Show inline comments"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:62
+msgid "Show file at latest version in this repo"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:64
+msgid "Show file at initial version in this repo"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_cs.html:4
+msgid "No changesets"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_cs.html:8
+msgid "Ancestor"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:6
+#: rhodecode/templates/compare/compare_diff.html:8
+#, python-format
+msgid "%s Compare"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:16
+msgid "Compare revisions"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:36
+msgid "Swap"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:38
+msgid "Compare Revisions"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:45
+msgid "Compare revisions, branches, bookmarks or tags."
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:50
+#: rhodecode/templates/pullrequests/pullrequest_show.html:153
+#, python-format
+msgid "Showing %s commit"
+msgid_plural "Showing %s commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/compare/compare_diff.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:168
+msgid "No files"
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:63
+msgid "Mercurial repository"
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:65
+msgid "Git repository"
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:72
+msgid "Public repository"
+msgstr "Öffenentliches Repository"
+
+#: rhodecode/templates/data_table/_dt_elements.html:82
+msgid "Repository creating in progress..."
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:96
+msgid "No changesets yet"
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:105
+#, python-format
+msgid "Subscribe to %s rss feed"
+msgstr "Abonniere den %s RSS Feed"
+
+#: rhodecode/templates/data_table/_dt_elements.html:111
+#: rhodecode/templates/data_table/_dt_elements.html:113
+#, python-format
+msgid "Subscribe to %s atom feed"
+msgstr "Abonniere den %s ATOM Feed"
+
+#: rhodecode/templates/data_table/_dt_elements.html:141
+msgid "Creating"
+msgstr ""
+
+#: rhodecode/templates/email_templates/changeset_comment.html:6
+#, python-format
+msgid "%s commented on a %s changeset."
+msgstr ""
+
+#: rhodecode/templates/email_templates/changeset_comment.html:9
+msgid "The changeset status was changed to"
+msgstr ""
+
+#: rhodecode/templates/email_templates/main.html:8
+msgid "This is a notification from RhodeCode."
+msgstr ""
+
+#: rhodecode/templates/email_templates/password_reset.html:4
+#, python-format
+msgid "Hello %s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/password_reset.html:5
+msgid "We received a request to create a new password for your account."
+msgstr ""
+
+#: rhodecode/templates/email_templates/password_reset.html:6
+msgid "You can generate it by clicking following URL"
+msgstr ""
+
+#: rhodecode/templates/email_templates/password_reset.html:10
+msgid "Please ignore this email if you did not request a new password ."
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request.html:6
+#, python-format
+msgid ""
+"%s opened a pull request for repository %s and wants you to review changes."
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request.html:8
+#: rhodecode/templates/pullrequests/pullrequest.html:31
+#: rhodecode/templates/pullrequests/pullrequest_data.html:14
+#: rhodecode/templates/pullrequests/pullrequest_show.html:28
+msgid "Title"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.html:6
+#, python-format
+msgid "%s commented on pull request \"%s\""
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.html:10
+msgid "Pull request was closed with status"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.html:12
+msgid "Pull request changed status"
+msgstr ""
+
+#: rhodecode/templates/email_templates/registration.html:6
+msgid "View this user here"
+msgstr ""
+
+#: rhodecode/templates/errors/error_document.html:47
+#, python-format
+msgid "You will be redirected to %s in %s seconds"
+msgstr ""
+
+#: rhodecode/templates/files/diff_2way.html:15
+#, python-format
+msgid "%s File side-by-side diff"
+msgstr ""
+
+#: rhodecode/templates/files/diff_2way.html:22
+#: rhodecode/templates/files/file_diff.html:11
+msgid "File diff"
+msgstr ""
+
+#: rhodecode/templates/files/diff_2way.html:58
+msgid "ignore white space"
+msgstr ""
+
+#: rhodecode/templates/files/diff_2way.html:59
+msgid "turn on edit mode"
+msgstr ""
+
+#: rhodecode/templates/files/file_diff.html:4
+#, python-format
+msgid "%s File Diff"
+msgstr ""
+
+#: rhodecode/templates/files/files.html:4
+#: rhodecode/templates/files/files.html:84
+#, python-format
+msgid "%s Files"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:4
+#, python-format
+msgid "%s Files Add"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:25
+msgid "Add new file"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:45
+#: rhodecode/templates/files/files_edit.html:43
+#: rhodecode/templates/files/files_ypjax.html:3
+msgid "Location"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:47
+msgid "Enter filename..."
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:49
+#: rhodecode/templates/files/files_add.html:53
+msgid "or"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:49
+msgid "Upload File"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:53
+msgid "Create New File"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:58
+msgid "New file mode"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:69
+#: rhodecode/templates/files/files_delete.html:57
+#: rhodecode/templates/files/files_edit.html:72
+msgid "Commit changes"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:13
+msgid "revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:14
+msgid "Previous revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:16
+msgid "Next revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:22
+msgid "Follow current branch"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:25
+msgid "Search File List"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:29
+msgid "Loading file list..."
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:42
+msgid "Size"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:43
+msgid "Mimetype"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:44
+msgid "Last Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:45
+msgid "Last modified"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:46
+msgid "Last committer"
+msgstr ""
+
+#: rhodecode/templates/files/files_delete.html:4
+#, python-format
+msgid "%s Files Delete"
+msgstr ""
+
+#: rhodecode/templates/files/files_delete.html:25
+#: rhodecode/templates/files/files_delete.html:45
+msgid "Delete file"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:4
+#, python-format
+msgid "%s File Edit"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:25
+msgid "Edit file"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:53
+#: rhodecode/templates/files/files_source.html:32
+msgid "Show Annotation"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:55
+#: rhodecode/templates/files/files_source.html:35
+msgid "Download as Raw"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:58
+msgid "Source"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:63
+msgid "Editing file"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:68
+msgid "Commit Message"
+msgstr ""
+
+#: rhodecode/templates/files/files_history_box.html:2
+#, python-format
+msgid "%s author"
+msgid_plural "%s authors"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/files/files_source.html:7
+msgid "Diff to Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:8
+msgid "Show at Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:10
+msgid "Show Full History"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:11
+msgid "Show Authors"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:30
+msgid "Show Source"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:38
+#, python-format
+msgid "Edit on Branch:%s"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:41
+msgid "Editing binary files not allowed"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:44
+msgid "Editing files allowed only when on branch head revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:45
+msgid "Deleting files allowed only when on branch head revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:61
+#, python-format
+msgid "Binary file (%s)"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:71
+msgid "File is too big to display"
+msgstr ""
+
+#: rhodecode/templates/files/files_ypjax.html:5
+msgid "annotation"
+msgstr ""
+
+#: rhodecode/templates/files/files_ypjax.html:23
+msgid "Go Back"
+msgstr ""
+
+#: rhodecode/templates/files/files_ypjax.html:24
+msgid "No files at given path"
+msgstr ""
+
+#: rhodecode/templates/followers/followers.html:5
+#, python-format
+msgid "%s Followers"
+msgstr ""
+
+#: rhodecode/templates/followers/followers.html:12
+#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/templates/summary/summary.html:150
+msgid "Followers"
+msgstr ""
+
+#: rhodecode/templates/followers/followers_data.html:12
+msgid "Started following -"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:5
+#, python-format
+msgid "Fork repository %s"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:30
+msgid "Fork name"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:71
+msgid "Private"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:80
+msgid "Copy permissions"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:84
+msgid "Copy permissions from forked repository"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:90
+msgid "Update after clone"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:94
+msgid "Checkout source after making a clone"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:99
+msgid "Fork this Repository"
+msgstr ""
+
+#: rhodecode/templates/forks/forks.html:5
+#, python-format
+msgid "%s Forks"
+msgstr ""
+
+#: rhodecode/templates/forks/forks.html:12
+#: rhodecode/templates/summary/summary.html:155
+#: rhodecode/templates/summary/summary.html:156
+msgid "Forks"
+msgstr ""
+
+#: rhodecode/templates/forks/forks_data.html:17
+msgid "Forked"
+msgstr ""
+
+#: rhodecode/templates/forks/forks_data.html:42
+msgid "There are no forks yet"
+msgstr ""
+
+#: rhodecode/templates/journal/journal.html:24
+msgid "ATOM journal feed"
+msgstr "ATOM Logbuch Feed"
+
+#: rhodecode/templates/journal/journal.html:25
+msgid "RSS journal feed"
+msgstr "RSS Logbuch Feed"
+
+#: rhodecode/templates/journal/journal.html:57
+msgid "My repos"
+msgstr ""
+
+#: rhodecode/templates/journal/journal_data.html:55
+msgid "No entries yet"
+msgstr ""
+
+#: rhodecode/templates/journal/public_journal.html:4
+#: rhodecode/templates/journal/public_journal.html:24
+msgid "Public Journal"
+msgstr "Öffentliches Logbuch"
+
+#: rhodecode/templates/journal/public_journal.html:16
+msgid "ATOM public journal feed"
+msgstr "ATOM Feed für das Öffentliche Logbuch"
+
+#: rhodecode/templates/journal/public_journal.html:17
+msgid "RSS public journal feed"
+msgstr "RSS Feed für das Öffentliche Logbuch"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:4
+#: rhodecode/templates/pullrequests/pullrequest.html:8
+msgid "New pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:44
+msgid "Write a short description on this pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:50
+msgid "Changeset flow"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:68
+msgid "Origin repository"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:82
+msgid "Send Pull Request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:91
+#: rhodecode/templates/pullrequests/pullrequest_show.html:104
+msgid "Pull request reviewers"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:100
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
+msgid "owner"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:114
+msgid "Add reviewer to this pull request."
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:128
+msgid "Detailed compare view"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:149
+msgid "Destination repository"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:4
+#, python-format
+msgid "%s Pull Request #%s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:36
+msgid "Review status"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:43
+msgid "Pull request status calculated from votes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:56
+msgid "Still not reviewed by"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:60
+#, python-format
+msgid "%d reviewer"
+msgid_plural "%d reviewers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:62
+msgid "Pull request was reviewed by all reviewers"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:77
+#: rhodecode/templates/pullrequests/pullrequest_show.html:79
+msgid "Pull changes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
+msgid "reviewer"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:133
+msgid "Add or remove reviewer to this pull request."
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:137
+msgid "Save Changes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
+msgid "Compare view"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
+#, python-format
+msgid "%s Pull Requests"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
+#, python-format
+msgid "Pull requests from %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:14
+#, python-format
+msgid "Pull requests to %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:38
+#, python-format
+msgid "Show pull requests to %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:40
+#, python-format
+msgid "Show pull requests from %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:50
+msgid "Hide closed pull requests"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:52
+msgid "Show closed pull requests too"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:6
+#, python-format
+msgid "%s Search"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:8
+#: rhodecode/templates/search/search.html:19
+msgid "Search in all repositories"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:53
+msgid "Search term"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:65
+msgid "Search in"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:68
+msgid "File contents"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:69
+msgid "Commit messages"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:70
+msgid "File names"
+msgstr ""
+
+#: rhodecode/templates/search/search_commit.html:35
+#: rhodecode/templates/search/search_content.html:21
+#: rhodecode/templates/search/search_path.html:15
+msgid "Permission denied"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:4
+#, python-format
+msgid "%s Statistics"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:19
+#: rhodecode/templates/summary/summary.html:42
+#, python-format
+msgid "%s ATOM feed"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:20
+#: rhodecode/templates/summary/summary.html:43
+#, python-format
+msgid "%s RSS feed"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:39
+#: rhodecode/templates/summary/summary.html:107
+#: rhodecode/templates/summary/summary.html:123
+msgid "Enable"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:42
+msgid "Stats gathered: "
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:91
+#: rhodecode/templates/summary/summary.html:354
+msgid "files"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:115
+#: rhodecode/templates/summary/summary.html:378
+msgid "Show more"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:392
+msgid "commits"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:393
+msgid "files added"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:394
+msgid "files changed"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:395
+msgid "files removed"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:397
+msgid "commit"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:398
+msgid "file added"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:399
+msgid "file changed"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:400
+msgid "file removed"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:4
+#, python-format
+msgid "%s Summary"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:16
+#, python-format
+msgid "Repository locked by %s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:18
+msgid "Repository unlocked"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:76
+msgid "Clone url"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:81
+msgid "Show by Name"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:82
+msgid "Show by ID"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:99
+msgid "Trending files"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:115
+msgid "Download"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:119
+msgid "There are no downloads yet"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:121
+msgid "Downloads are disabled for this repository"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:127
+msgid "Download as zip"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:132
+msgid "Check this to download archive with subrepos"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:132
+msgid "with subrepos"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:163
+msgid "Repository Size"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:170
+#: rhodecode/templates/summary/summary.html:172
+msgid "Feed"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:193
+msgid "Latest changes"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:195
+msgid "Quick start"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:209
+#, python-format
+msgid "Readme file from revision %s:%s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:299
+#, python-format
+msgid "Download %s as %s"
+msgstr ""
+
+#: rhodecode/templates/tags/tags.html:5
+#, python-format
+msgid "%s Tags"
+msgstr ""
+
+#: rhodecode/templates/tags/tags.html:29
+msgid "Compare tags"
+msgstr ""
--- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po	Wed Jul 02 19:03:19 2014 -0400
+++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po	Wed Jul 02 19:03:20 2014 -0400
@@ -1,14 +1,14 @@
 # Translations template for RhodeCode.
-# Copyright (C) 2013 Marcin Kuzminski RhodeCode
+# Copyright (C) 2014 RhodeCode GmbH
 # This file is distributed under the same license as the RhodeCode project.
 # Translators:
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: RhodeCode\n"
-"Report-Msgid-Bugs-To: marcin@maq.io\n"
-"POT-Creation-Date: 2013-06-05 19:55+0200\n"
-"PO-Revision-Date: 2013-06-02 13:31+0000\n"
+"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
+"POT-Creation-Date: 2014-02-13 15:30+0100\n"
+"PO-Revision-Date: 2014-02-13 14:34+0000\n"
 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/RhodeCode/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,1297 +18,1644 @@
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: rhodecode/controllers/changelog.py:149
+#: rhodecode/controllers/changelog.py:88 rhodecode/controllers/compare.py:88
+#: rhodecode/controllers/pullrequests.py:263
+msgid "There are no changesets yet"
+msgstr "Il n’y a aucun changement pour le moment"
+
+#: rhodecode/controllers/changelog.py:184
 msgid "All Branches"
 msgstr "Toutes les branches"
 
-#: rhodecode/controllers/changeset.py:84
+#: rhodecode/controllers/changelog.py:187
+msgid "(closed)"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:85
 msgid "Show white space"
 msgstr "Afficher les espaces et tabulations"
 
-#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
+#: rhodecode/controllers/changeset.py:92 rhodecode/controllers/changeset.py:99
 msgid "Ignore white space"
 msgstr "Ignorer les espaces et tabulations"
 
-#: rhodecode/controllers/changeset.py:164
-#, python-format
-msgid "%s line context"
-msgstr "Afficher %s lignes de contexte"
-
-#: rhodecode/controllers/changeset.py:345
-#: rhodecode/controllers/pullrequests.py:478
+#: rhodecode/controllers/changeset.py:165
+#, python-format
+msgid "increase diff context to %(num)s lines"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:207 rhodecode/controllers/files.py:96
+#: rhodecode/controllers/files.py:119
+msgid "Such revision does not exist for this repository"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:353
+#: rhodecode/controllers/pullrequests.py:480
 #, python-format
 msgid "Status change -> %s"
 msgstr "Changement de statut -> %s"
 
-#: rhodecode/controllers/changeset.py:376
+#: rhodecode/controllers/changeset.py:384
 msgid ""
 "Changing status on a changeset associated with a closed pull request is not "
 "allowed"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:74
-#: rhodecode/controllers/pullrequests.py:256
-msgid "There are no changesets yet"
-msgstr "Il n’y a aucun changement pour le moment"
-
-#: rhodecode/controllers/error.py:69
+#: rhodecode/controllers/compare.py:192 rhodecode/templates/base/root.html:67
+msgid "Select changeset"
+msgstr ""
+
+#: rhodecode/controllers/error.py:70
 msgid "Home page"
 msgstr "Accueil"
 
-#: rhodecode/controllers/error.py:98
+#: rhodecode/controllers/error.py:99
 msgid ""
 "The request could not be understood by the server due to malformed syntax."
 msgstr "Le serveur n’a pas pu interpréter la requête à cause d’une erreur de syntaxe"
 
-#: rhodecode/controllers/error.py:101
+#: rhodecode/controllers/error.py:102
 msgid "Unauthorized access to resource"
 msgstr "Accès interdit à cet ressource"
 
-#: rhodecode/controllers/error.py:103
+#: rhodecode/controllers/error.py:104
 msgid "You don't have permission to view this page"
 msgstr "Vous n’avez pas la permission de voir cette page"
 
-#: rhodecode/controllers/error.py:105
+#: rhodecode/controllers/error.py:106
 msgid "The resource could not be found"
 msgstr "Ressource introuvable"
 
-#: rhodecode/controllers/error.py:107
+#: rhodecode/controllers/error.py:108
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr "La requête n’a pu être traitée en raison d’une erreur survenue sur le serveur."
 
-#: rhodecode/controllers/feed.py:52
+#: rhodecode/controllers/feed.py:53
 #, python-format
 msgid "Changes on %s repository"
 msgstr "Changements sur le dépôt %s"
 
-#: rhodecode/controllers/feed.py:53
+#: rhodecode/controllers/feed.py:54
 #, python-format
 msgid "%s %s feed"
 msgstr "Flux %s de %s"
 
-#: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/controllers/feed.py:87
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr "Cet ensemble de changements était trop important et a été découpé…"
 
-#: rhodecode/controllers/feed.py:90
+#: rhodecode/controllers/feed.py:91
 #, python-format
 msgid "%s committed on %s"
 msgstr "%s a commité, le %s"
 
-#: rhodecode/controllers/files.py:89
+#: rhodecode/controllers/files.py:90
 msgid "Click here to add new file"
 msgstr "Ajouter un nouveau fichier"
 
-#: rhodecode/controllers/files.py:90
-#, python-format
-msgid "There are no files yet %s"
-msgstr "Il n’y a pas encore de fichiers %s"
-
-#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339
+#: rhodecode/controllers/files.py:91
+#, python-format
+msgid "There are no files yet. %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:299 rhodecode/controllers/files.py:359
+#: rhodecode/controllers/files.py:426
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr "Ce dépôt a été verrouillé par %s sur %s."
 
-#: rhodecode/controllers/files.py:283
+#: rhodecode/controllers/files.py:311
+msgid "You can only delete files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:322
+#, python-format
+msgid "Deleted file %s via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:344
+#, python-format
+msgid "Successfully deleted file %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:348 rhodecode/controllers/files.py:414
+#: rhodecode/controllers/files.py:496
+msgid "Error occurred during commit"
+msgstr "Une erreur est survenue durant le commit"
+
+#: rhodecode/controllers/files.py:371
 msgid "You can only edit files with revision being a valid branch "
 msgstr ""
 
-#: rhodecode/controllers/files.py:297
+#: rhodecode/controllers/files.py:385
 #, python-format
 msgid "Edited file %s via RhodeCode"
 msgstr "%s édité via RhodeCode"
 
-#: rhodecode/controllers/files.py:313
+#: rhodecode/controllers/files.py:401
 msgid "No changes"
 msgstr "Aucun changement"
 
-#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394
+#: rhodecode/controllers/files.py:410 rhodecode/controllers/files.py:485
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Commit réalisé avec succès sur %s"
 
-#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405
-msgid "Error occurred during commit"
-msgstr "Une erreur est survenue durant le commit"
-
-#: rhodecode/controllers/files.py:351
+#: rhodecode/controllers/files.py:438
 msgid "Added file via RhodeCode"
 msgstr "%s ajouté par RhodeCode"
 
-#: rhodecode/controllers/files.py:368
+#: rhodecode/controllers/files.py:459
 msgid "No content"
 msgstr "Aucun contenu"
 
-#: rhodecode/controllers/files.py:372
+#: rhodecode/controllers/files.py:463
 msgid "No filename"
 msgstr "Aucun nom de fichier"
 
-#: rhodecode/controllers/files.py:397
+#: rhodecode/controllers/files.py:488
 msgid "Location must be relative path and must not contain .. in path"
 msgstr ""
 
-#: rhodecode/controllers/files.py:431
+#: rhodecode/controllers/files.py:522
 msgid "Downloads disabled"
 msgstr "Les téléchargements sont désactivés"
 
-#: rhodecode/controllers/files.py:442
+#: rhodecode/controllers/files.py:533
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Révision %s inconnue."
 
-#: rhodecode/controllers/files.py:444
+#: rhodecode/controllers/files.py:535
 msgid "Empty repository"
 msgstr "Dépôt vide."
 
-#: rhodecode/controllers/files.py:446
+#: rhodecode/controllers/files.py:537
 msgid "Unknown archive type"
 msgstr "Type d’archive inconnu"
 
-#: rhodecode/controllers/files.py:631
-#: rhodecode/templates/changeset/changeset_range.html:9
+#: rhodecode/controllers/files.py:773
+#: rhodecode/templates/changeset/changeset_range.html:12
 #: rhodecode/templates/email_templates/pull_request.html:12
-#: rhodecode/templates/pullrequests/pullrequest.html:124
+#: rhodecode/templates/pullrequests/pullrequest.html:123
 msgid "Changesets"
 msgstr "Changesets"
 
-#: rhodecode/controllers/files.py:632
-#: rhodecode/controllers/pullrequests.py:149
-#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682
+#: rhodecode/controllers/files.py:774
+#: rhodecode/controllers/pullrequests.py:158
+#: rhodecode/controllers/summary.py:74 rhodecode/model/scm.py:816
 #: rhodecode/templates/switch_to_list.html:3
-#: rhodecode/templates/branches/branches.html:10
+#: rhodecode/templates/branches/branches.html:13
 msgid "Branches"
 msgstr "Branches"
 
-#: rhodecode/controllers/files.py:633
-#: rhodecode/controllers/pullrequests.py:150
-#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693
-#: rhodecode/templates/switch_to_list.html:15
-#: rhodecode/templates/tags/tags.html:10
+#: rhodecode/controllers/files.py:775
+#: rhodecode/controllers/pullrequests.py:159
+#: rhodecode/controllers/summary.py:75 rhodecode/model/scm.py:827
+#: rhodecode/templates/switch_to_list.html:25
+#: rhodecode/templates/tags/tags.html:13
 msgid "Tags"
 msgstr "Tags"
 
-#: rhodecode/controllers/forks.py:176
-#, python-format
-msgid "Forked repository %s as %s"
-msgstr "dépôt %s forké en tant que %s"
-
-#: rhodecode/controllers/forks.py:190
+#: rhodecode/controllers/forks.py:189
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "Une erreur est survenue durant le fork du dépôt %s."
 
-#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153
+#: rhodecode/controllers/home.py:81
+msgid "Groups"
+msgstr ""
+
+#: rhodecode/controllers/home.py:86
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:106
+#: rhodecode/templates/admin/repos/repo_add.html:15
+#: rhodecode/templates/admin/repos/repo_add.html:19
+#: rhodecode/templates/admin/users/user_edit_advanced.html:6
+#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:87
+#: rhodecode/templates/base/base.html:136
+#: rhodecode/templates/base/base.html:389
+#: rhodecode/templates/base/base.html:560
+msgid "Repositories"
+msgstr "Dépôts"
+
+#: rhodecode/controllers/home.py:127 rhodecode/templates/files/files.html:33
+#: rhodecode/templates/files/files_add.html:37
+#: rhodecode/templates/files/files_delete.html:37
+#: rhodecode/templates/files/files_edit.html:37
+msgid "Branch"
+msgstr ""
+
+#: rhodecode/controllers/home.py:133
+msgid "Tag"
+msgstr ""
+
+#: rhodecode/controllers/home.py:139
+msgid "Bookmark"
+msgstr ""
+
+#: rhodecode/controllers/journal.py:112 rhodecode/controllers/journal.py:155
 msgid "public journal"
 msgstr "Journal public"
 
-#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157
-#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/controllers/journal.py:116 rhodecode/controllers/journal.py:159
+#: rhodecode/templates/journal/journal.html:15
 msgid "journal"
 msgstr "Journal"
 
-#: rhodecode/controllers/login.py:138
+#: rhodecode/controllers/login.py:185 rhodecode/controllers/login.py:230
+msgid "bad captcha"
+msgstr ""
+
+#: rhodecode/controllers/login.py:191
 msgid "You have successfully registered into RhodeCode"
 msgstr "Vous vous êtes inscrits avec succès à RhodeCode"
 
-#: rhodecode/controllers/login.py:159
+#: rhodecode/controllers/login.py:235
 msgid "Your password reset link was sent"
 msgstr "Un lien de rénitialisation de votre mot de passe vous a été envoyé."
 
-#: rhodecode/controllers/login.py:179
+#: rhodecode/controllers/login.py:255
 msgid ""
 "Your password reset was successful, new password has been sent to your email"
 msgstr "Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a été envoyé par e-mail."
 
-#: rhodecode/controllers/pullrequests.py:136
-#: rhodecode/templates/changeset/changeset.html:10
-#: rhodecode/templates/email_templates/changeset_comment.html:8
+#: rhodecode/controllers/pullrequests.py:138
+#: rhodecode/templates/changeset/changeset.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:15
 msgid "Changeset"
 msgstr "Changements"
 
-#: rhodecode/controllers/pullrequests.py:146
+#: rhodecode/controllers/pullrequests.py:155
 msgid "Special"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:147
+#: rhodecode/controllers/pullrequests.py:156
 msgid "Peer branches"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:148 rhodecode/model/scm.py:688
-#: rhodecode/templates/switch_to_list.html:28
-#: rhodecode/templates/bookmarks/bookmarks.html:10
+#: rhodecode/controllers/pullrequests.py:157 rhodecode/model/scm.py:822
+#: rhodecode/templates/switch_to_list.html:38
+#: rhodecode/templates/bookmarks/bookmarks.html:13
 msgid "Bookmarks"
 msgstr "Signets"
 
-#: rhodecode/controllers/pullrequests.py:321
+#: rhodecode/controllers/pullrequests.py:328
 msgid "Pull request requires a title with min. 3 chars"
 msgstr "Les requêtes de pull nécessitent un titre d’au moins 3 caractères."
 
-#: rhodecode/controllers/pullrequests.py:323
-msgid "Error creating pull request"
-msgstr "Une erreur est survenue lors de la création de la requête de pull."
-
-#: rhodecode/controllers/pullrequests.py:343
+#: rhodecode/controllers/pullrequests.py:330
+#, python-format
+msgid "Error creating pull request: %s"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:352
 msgid "Successfully opened new pull request"
 msgstr "La requête de pull a été ouverte avec succès."
 
-#: rhodecode/controllers/pullrequests.py:346
+#: rhodecode/controllers/pullrequests.py:355
 msgid "Error occurred during sending pull request"
 msgstr "Une erreur est survenue durant l’envoi de la requête de pull."
 
-#: rhodecode/controllers/pullrequests.py:385
+#: rhodecode/controllers/pullrequests.py:395
 msgid "Successfully deleted pull request"
 msgstr "La requête de pull a été supprimée avec succès."
 
-#: rhodecode/controllers/pullrequests.py:481
+#: rhodecode/controllers/pullrequests.py:483
 msgid "Closing with"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:518
+#: rhodecode/controllers/pullrequests.py:520
 msgid ""
 "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr ""
 
-#: rhodecode/controllers/search.py:132
+#: rhodecode/controllers/search.py:133
 msgid "Invalid search query. Try quoting it."
 msgstr "Requête invalide. Essayer de la mettre entre guillemets."
 
-#: rhodecode/controllers/search.py:137
+#: rhodecode/controllers/search.py:138
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr "L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de code Whoosh."
 
-#: rhodecode/controllers/search.py:141
+#: rhodecode/controllers/search.py:142
 msgid "An error occurred during this search operation"
 msgstr "Une erreur est survenue durant l’opération de recherche."
 
-#: rhodecode/controllers/summary.py:182
+#: rhodecode/controllers/summary.py:201
 msgid "No data loaded yet"
 msgstr "Aucune donnée actuellement disponible."
 
-#: rhodecode/controllers/summary.py:188
-#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/controllers/summary.py:204
+#: rhodecode/templates/summary/summary.html:105
 msgid "Statistics are disabled for this repository"
 msgstr "La mise à jour des statistiques est désactivée pour ce dépôt."
 
-#: rhodecode/controllers/admin/defaults.py:96
+#: rhodecode/controllers/admin/auth_settings.py:125
+msgid "Auth settings updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/auth_settings.py:136
+msgid "error occurred during update of auth settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/defaults.py:95
 msgid "Default settings updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/defaults.py:110
+#: rhodecode/controllers/admin/defaults.py:109
 msgid "Error occurred during update of defaults"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:56
+#: rhodecode/controllers/admin/gists.py:58
+#: rhodecode/controllers/admin/my_account.py:255
+#: rhodecode/controllers/admin/users.py:287
 msgid "forever"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:57
+#: rhodecode/controllers/admin/gists.py:59
+#: rhodecode/controllers/admin/my_account.py:256
+#: rhodecode/controllers/admin/users.py:288
 msgid "5 minutes"
 msgstr "5 minute"
 
-#: rhodecode/controllers/admin/gists.py:58
+#: rhodecode/controllers/admin/gists.py:60
+#: rhodecode/controllers/admin/my_account.py:257
+#: rhodecode/controllers/admin/users.py:289
 msgid "1 hour"
 msgstr "1 heure"
 
-#: rhodecode/controllers/admin/gists.py:59
+#: rhodecode/controllers/admin/gists.py:61
+#: rhodecode/controllers/admin/my_account.py:258
+#: rhodecode/controllers/admin/users.py:290
 msgid "1 day"
 msgstr "1 jour"
 
-#: rhodecode/controllers/admin/gists.py:60
-msgid "1 month"
-msgstr "1 mois"
-
 #: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/my_account.py:259
+#: rhodecode/controllers/admin/users.py:291
+msgid "1 month"
+msgstr "1 mois"
+
+#: rhodecode/controllers/admin/gists.py:66
+#: rhodecode/controllers/admin/my_account.py:261
+#: rhodecode/controllers/admin/users.py:293
 msgid "Lifetime"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:127
+#: rhodecode/controllers/admin/gists.py:145
 msgid "Error occurred during gist creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:165
+#: rhodecode/controllers/admin/gists.py:183
 #, python-format
 msgid "Deleted gist %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/ldap_settings.py:50
-msgid "BASE"
-msgstr "Base"
-
-#: rhodecode/controllers/admin/ldap_settings.py:51
-msgid "ONELEVEL"
-msgstr "Un niveau"
-
-#: rhodecode/controllers/admin/ldap_settings.py:52
-msgid "SUBTREE"
-msgstr "Sous-arbre"
-
-#: rhodecode/controllers/admin/ldap_settings.py:56
-msgid "NEVER"
-msgstr "NEVER"
-
-#: rhodecode/controllers/admin/ldap_settings.py:57
-msgid "ALLOW"
-msgstr "Autoriser"
-
-#: rhodecode/controllers/admin/ldap_settings.py:58
-msgid "TRY"
-msgstr "TRY"
-
-#: rhodecode/controllers/admin/ldap_settings.py:59
-msgid "DEMAND"
-msgstr "DEMAND"
-
-#: rhodecode/controllers/admin/ldap_settings.py:60
-msgid "HARD"
-msgstr "HARD"
-
-#: rhodecode/controllers/admin/ldap_settings.py:64
-msgid "No encryption"
-msgstr "Pas de chiffrement"
-
-#: rhodecode/controllers/admin/ldap_settings.py:65
-msgid "LDAPS connection"
-msgstr "Connection LDAPS"
-
-#: rhodecode/controllers/admin/ldap_settings.py:66
-msgid "START_TLS on LDAP connection"
-msgstr "START_TLS à la connexion"
-
-#: rhodecode/controllers/admin/ldap_settings.py:124
-msgid "LDAP settings updated successfully"
-msgstr "Mise à jour réussie des réglages LDAP"
-
-#: rhodecode/controllers/admin/ldap_settings.py:128
-msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
-msgstr "Impossible d’activer LDAP. La bibliothèque « python-ldap » est manquante."
-
-#: rhodecode/controllers/admin/ldap_settings.py:145
-msgid "Error occurred during update of ldap settings"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:58
-#: rhodecode/controllers/admin/permissions.py:62
-#: rhodecode/controllers/admin/permissions.py:66
-msgid "None"
-msgstr "Aucun"
-
-#: rhodecode/controllers/admin/permissions.py:59
-#: rhodecode/controllers/admin/permissions.py:63
-#: rhodecode/controllers/admin/permissions.py:67
-msgid "Read"
-msgstr "Lire"
+#: rhodecode/controllers/admin/gists.py:232
+msgid "unmodified"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:261
+msgid "Successfully updated gist content"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:266
+msgid "Successfully updated gist data"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:269
+#, python-format
+msgid "Error occurred during update of gist %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:68
+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/my_account.py:125
+msgid "Your account was updated successfully"
+msgstr "Votre compte a été mis à jour avec succès"
+
+#: rhodecode/controllers/admin/my_account.py:139
+#: rhodecode/controllers/admin/users.py:205
+#, python-format
+msgid "Error occurred during update of user %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:159
+msgid "Successfully updated password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:169
+msgid "Error occurred during update of user password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:211
+#: rhodecode/controllers/admin/users.py:430
+#, python-format
+msgid "Added email %s to user"
+msgstr "L’e-mail « %s » a été ajouté à l’utilisateur."
+
+#: rhodecode/controllers/admin/my_account.py:217
+#: rhodecode/controllers/admin/users.py:436
+msgid "An error occurred during email saving"
+msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail."
+
+#: rhodecode/controllers/admin/my_account.py:226
+#: rhodecode/controllers/admin/users.py:447
+msgid "Removed email from user"
+msgstr "L’e-mail a été enlevé de l’utilisateur."
+
+#: rhodecode/controllers/admin/my_account.py:272
+#: rhodecode/controllers/admin/users.py:313
+msgid "Api key successfully created"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:284
+#: rhodecode/controllers/admin/users.py:329
+msgid "Api key successfully reset"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:288
+#: rhodecode/controllers/admin/users.py:333
+msgid "Api key successfully deleted"
+msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:60
 #: rhodecode/controllers/admin/permissions.py:64
 #: rhodecode/controllers/admin/permissions.py:68
-msgid "Write"
-msgstr "Écrire"
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:104
+msgid "None"
+msgstr "Aucun"
 
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
 #: rhodecode/controllers/admin/permissions.py:69
-#: rhodecode/templates/admin/defaults/defaults.html:9
-#: rhodecode/templates/admin/ldap/ldap.html:9
-#: rhodecode/templates/admin/permissions/permissions.html:9
-#: rhodecode/templates/admin/repos/repo_add.html:10
-#: rhodecode/templates/admin/repos/repo_add.html:14
-#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:9
-#: rhodecode/templates/admin/users/user_add.html:8
-#: rhodecode/templates/admin/users/user_edit.html:9
-#: rhodecode/templates/admin/users/user_edit.html:133
-#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/admin/users_groups/users_group_add.html:8
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:9
-#: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:317
-#: rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:325
+msgid "Read"
+msgstr "Lire"
+
+#: rhodecode/controllers/admin/permissions.py:62
+#: rhodecode/controllers/admin/permissions.py:66
+#: rhodecode/controllers/admin/permissions.py:70
+msgid "Write"
+msgstr "Écrire"
+
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
+#: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/templates/admin/auth/auth_settings.html:12
+#: rhodecode/templates/admin/defaults/defaults.html:12
+#: rhodecode/templates/admin/permissions/permissions.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:17
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/settings/settings.html:12
+#: rhodecode/templates/admin/user_groups/user_group_add.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+#: rhodecode/templates/admin/users/user_add.html:11
+#: rhodecode/templates/admin/users/user_edit.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:114
+#: rhodecode/templates/admin/users/users.html:13
+#: rhodecode/templates/admin/users/users.html:58
+#: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:340
+#: rhodecode/templates/base/base.html:346
+#: rhodecode/templates/base/base.html:347
 msgid "Admin"
 msgstr "Administration"
 
-#: rhodecode/controllers/admin/permissions.py:72
-#: rhodecode/controllers/admin/permissions.py:83
-#: rhodecode/controllers/admin/permissions.py:86
-#: rhodecode/controllers/admin/permissions.py:89
-#: rhodecode/controllers/admin/permissions.py:92
+#: rhodecode/controllers/admin/permissions.py:74
+#: rhodecode/controllers/admin/permissions.py:85
+#: rhodecode/controllers/admin/permissions.py:90
+#: rhodecode/controllers/admin/permissions.py:93
+#: rhodecode/controllers/admin/permissions.py:96
+#: rhodecode/controllers/admin/permissions.py:99
 msgid "Disabled"
 msgstr "Interdite"
 
-#: rhodecode/controllers/admin/permissions.py:74
-msgid "Allowed with manual account activation"
-msgstr ""
-
 #: rhodecode/controllers/admin/permissions.py:76
+msgid "Allowed with manual account activation"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:78
 msgid "Allowed with automatic account activation"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:79
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444
+#: rhodecode/controllers/admin/permissions.py:81
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1485
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1542
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1564
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1603
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1655
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1682 rhodecode/model/db.py:1692
 msgid "Manual activation of external account"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:80
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445
+#: rhodecode/controllers/admin/permissions.py:82
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1486
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1565
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1604
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1656
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1683 rhodecode/model/db.py:1693
 msgid "Automatic activation of external account"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:84
-#: rhodecode/controllers/admin/permissions.py:87
-#: rhodecode/controllers/admin/permissions.py:90
-#: rhodecode/controllers/admin/permissions.py:93
+#: rhodecode/controllers/admin/permissions.py:86
+#: rhodecode/controllers/admin/permissions.py:89
+#: rhodecode/controllers/admin/permissions.py:94
+#: rhodecode/controllers/admin/permissions.py:97
+#: rhodecode/controllers/admin/permissions.py:100
 msgid "Enabled"
 msgstr "Autorisée"
 
-#: rhodecode/controllers/admin/permissions.py:138
-msgid "Default permissions updated successfully"
-msgstr "Permissions par défaut mises à jour avec succès"
-
-#: rhodecode/controllers/admin/permissions.py:152
+#: rhodecode/controllers/admin/permissions.py:123
+msgid "Global permissions updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:137
 msgid "Error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:128
-msgid "--REMOVE FORK--"
-msgstr "[Pas un fork]"
-
-#: rhodecode/controllers/admin/repos.py:168
-#, python-format
-msgid "Created repository %s from %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:174
-#, python-format
-msgid "Created repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:197
-#, python-format
-msgid "Error creating repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:270
-#, python-format
-msgid "Repository %s updated successfully"
-msgstr "Dépôt %s mis à jour avec succès."
-
-#: rhodecode/controllers/admin/repos.py:288
-#, python-format
-msgid "Error occurred during update of repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:315
-#, python-format
-msgid "Detached %s forks"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:318
-#, python-format
-msgid "Deleted %s forks"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:323
-#, python-format
-msgid "Deleted repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:326
-#, python-format
-msgid "Cannot delete %s it still contains attached forks"
-msgstr "Impossible de supprimer le dépôt %s : Des forks y sont attachés."
-
-#: rhodecode/controllers/admin/repos.py:331
-#, python-format
-msgid "An error occurred during deletion of %s"
-msgstr "Erreur pendant la suppression de %s"
-
-#: rhodecode/controllers/admin/repos.py:345
-msgid "Repository permissions updated"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:375
-#: rhodecode/controllers/admin/repos_groups.py:332
-#: rhodecode/controllers/admin/users_groups.py:312
-msgid "An error occurred during revoking of permission"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:392
-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:409
-msgid "An error occurred during cache invalidation"
-msgstr "Une erreur est survenue durant l’invalidation du cache."
-
-#: rhodecode/controllers/admin/repos.py:429
-#: rhodecode/controllers/admin/repos.py:456
-msgid "An error occurred during unlocking"
-msgstr "Une erreur est survenue durant le déverrouillage."
-
-#: rhodecode/controllers/admin/repos.py:447
-msgid "Unlocked"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:450
-msgid "Locked"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:452
-#, python-format
-msgid "Repository has been %s"
-msgstr "Le dépôt a été %s."
-
-#: rhodecode/controllers/admin/repos.py:476
-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:480
-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:485 rhodecode/model/validators.py:302
-msgid "Token mismatch"
-msgstr "Jeton d’authentification incorrect."
-
-#: rhodecode/controllers/admin/repos.py:498
-msgid "Pulled from remote location"
-msgstr "Les changements distants ont été récupérés."
-
-#: rhodecode/controllers/admin/repos.py:501
-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:517
-msgid "Nothing"
-msgstr "[Aucun dépôt]"
-
-#: rhodecode/controllers/admin/repos.py:519
-#, 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:523
-msgid "An error occurred during this operation"
-msgstr "Une erreur est survenue durant cette opération."
-
-#: rhodecode/controllers/admin/repos.py:562
-msgid "An error occurred during creation of field"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:576
-msgid "An error occurred during removal of field"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:147
+#: rhodecode/controllers/admin/repo_groups.py:184
 #, python-format
 msgid "Created repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:159
+#: rhodecode/controllers/admin/repo_groups.py:196
 #, python-format
 msgid "Error occurred during creation of repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:217
+#: rhodecode/controllers/admin/repo_groups.py:254
 #, python-format
 msgid "Updated repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:232
+#: rhodecode/controllers/admin/repo_groups.py:269
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:250
+#: rhodecode/controllers/admin/repo_groups.py:287
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr "Ce groupe contient %s dépôts et ne peut être supprimé."
 
-#: rhodecode/controllers/admin/repos_groups.py:257
+#: rhodecode/controllers/admin/repo_groups.py:294
 #, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:263
+#: rhodecode/controllers/admin/repo_groups.py:300
 #, python-format
 msgid "Removed repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:268
+#: rhodecode/controllers/admin/repo_groups.py:305
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:279
-#: rhodecode/controllers/admin/repos_groups.py:314
-#: rhodecode/controllers/admin/users_groups.py:300
+#: rhodecode/controllers/admin/repo_groups.py:417
+#: rhodecode/controllers/admin/repo_groups.py:452
+#: rhodecode/controllers/admin/user_groups.py:335
 msgid "Cannot revoke permission for yourself as admin"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:294
+#: rhodecode/controllers/admin/repo_groups.py:432
 msgid "Repository Group permissions updated"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:123
+#: rhodecode/controllers/admin/repo_groups.py:469
+#: rhodecode/controllers/admin/repos.py:424
+#: rhodecode/controllers/admin/user_groups.py:347
+msgid "An error occurred during revoking of permission"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:160
+#, python-format
+msgid "Error creating repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:235
+#, python-format
+msgid "Created repository %s from %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:244
+#, python-format
+msgid "Forked repository %s as %s"
+msgstr "dépôt %s forké en tant que %s"
+
+#: rhodecode/controllers/admin/repos.py:247
+#, python-format
+msgid "Created repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:287
+#, python-format
+msgid "Repository %s updated successfully"
+msgstr "Dépôt %s mis à jour avec succès."
+
+#: rhodecode/controllers/admin/repos.py:305
+#, python-format
+msgid "Error occurred during update of repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:332
+#, python-format
+msgid "Detached %s forks"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:335
+#, python-format
+msgid "Deleted %s forks"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:340
+#, python-format
+msgid "Deleted repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:343
+#, python-format
+msgid "Cannot delete %s it still contains attached forks"
+msgstr "Impossible de supprimer le dépôt %s : Des forks y sont attachés."
+
+#: rhodecode/controllers/admin/repos.py:348
+#, python-format
+msgid "An error occurred during deletion of %s"
+msgstr "Erreur pendant la suppression de %s"
+
+#: rhodecode/controllers/admin/repos.py:400
+msgid "Repository permissions updated"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:456
+msgid "An error occurred during creation of field"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:470
+msgid "An error occurred during removal of field"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:486
+msgid "-- Not a fork --"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:520
+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:524
+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:529 rhodecode/model/validators.py:359
+msgid "Token mismatch"
+msgstr "Jeton d’authentification incorrect."
+
+#: rhodecode/controllers/admin/repos.py:544
+msgid "Nothing"
+msgstr "[Aucun dépôt]"
+
+#: rhodecode/controllers/admin/repos.py:546
+#, 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:553
+msgid "An error occurred during this operation"
+msgstr "Une erreur est survenue durant cette opération."
+
+#: rhodecode/controllers/admin/repos.py:569
+msgid "Locked repository"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:572
+msgid "Unlocked repository"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:575
+#: rhodecode/controllers/admin/repos.py:602
+msgid "An error occurred during unlocking"
+msgstr "Une erreur est survenue durant le déverrouillage."
+
+#: rhodecode/controllers/admin/repos.py:593
+msgid "Unlocked"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:596
+msgid "Locked"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:598
+#, python-format
+msgid "Repository has been %s"
+msgstr "Le dépôt a été %s."
+
+#: rhodecode/controllers/admin/repos.py:616
+msgid "Cache invalidation successful"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:620
+msgid "An error occurred during cache invalidation"
+msgstr "Une erreur est survenue durant l’invalidation du cache."
+
+#: rhodecode/controllers/admin/repos.py:635
+msgid "Pulled from remote location"
+msgstr "Les changements distants ont été récupérés."
+
+#: rhodecode/controllers/admin/repos.py:638
+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:671
+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/settings.py:171
+msgid "Updated VCS settings"
+msgstr "Réglages des gestionnaires de versions mis à jour."
+
+#: rhodecode/controllers/admin/settings.py:175
+msgid ""
+"Unable to activate hgsubversion support. The \"hgsubversion\" library is "
+"missing"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:181
+#: rhodecode/controllers/admin/settings.py:273
+msgid "Error occurred during updating application settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:214
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:132
-msgid "Whoosh reindex task scheduled"
-msgstr "La tâche de réindexation Whoosh a été planifiée."
-
-#: rhodecode/controllers/admin/settings.py:163
+#: rhodecode/controllers/admin/settings.py:269
 msgid "Updated application settings"
 msgstr "Réglages mis à jour"
 
-#: rhodecode/controllers/admin/settings.py:167
-#: rhodecode/controllers/admin/settings.py:304
-msgid "Error occurred during updating application settings"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:219
+#: rhodecode/controllers/admin/settings.py:326
 msgid "Updated visualisation settings"
 msgstr "Réglages d’affichage mis à jour."
 
-#: rhodecode/controllers/admin/settings.py:224
+#: rhodecode/controllers/admin/settings.py:331
 msgid "Error occurred during updating visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:300
-msgid "Updated VCS settings"
-msgstr "Réglages des gestionnaires de versions mis à jour."
-
-#: rhodecode/controllers/admin/settings.py:314
+#: rhodecode/controllers/admin/settings.py:357
+msgid "Please enter email address"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:369
+msgid "Send email task created"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:399
 msgid "Added new hook"
 msgstr "Le nouveau hook a été ajouté."
 
-#: rhodecode/controllers/admin/settings.py:326
-msgid "Updated hooks"
-msgstr "Hooks mis à jour"
-
-#: rhodecode/controllers/admin/settings.py:330
-msgid "Error occurred during hook creation"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:349
-msgid "Email task created"
-msgstr "La tâche d’e-mail a été créée."
-
 #: rhodecode/controllers/admin/settings.py:413
-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:455
-msgid "Your account was updated successfully"
-msgstr "Votre compte a été mis à jour avec succès"
-
-#: rhodecode/controllers/admin/settings.py:470
-#: rhodecode/controllers/admin/users.py:198
-#, python-format
-msgid "Error occurred during update of user %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:130
+msgid "Updated hooks"
+msgstr "Hooks mis à jour"
+
+#: rhodecode/controllers/admin/settings.py:417
+msgid "Error occurred during hook creation"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:443
+msgid "Whoosh reindex task scheduled"
+msgstr "La tâche de réindexation Whoosh a été planifiée."
+
+#: rhodecode/controllers/admin/settings.py:535
+msgid "Updated license information"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:540
+msgid "Error occurred during updating license info"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:563
+#, python-format
+msgid ""
+"Your license will expire on %s, please contact support to extend your "
+"license."
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:566
+#, python-format
+msgid ""
+"Your license has expired on %s, please contact support to extend your "
+"license."
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:571
+msgid ""
+"Unexpected error while reading license key. Please make sure your license "
+"token and key are correct"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:148
+#, python-format
+msgid "Created user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:159
+#, python-format
+msgid "Error occurred during creation of user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:197
+#, python-format
+msgid "Updated user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:219
+#, python-format
+msgid "Error occurred during update of user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:237
+msgid "Successfully deleted user group"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:242
+msgid "An error occurred during deletion of user group"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:309
+msgid "Target group cannot be the same"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:315
+msgid "User Group permissions updated"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:435
+#: rhodecode/controllers/admin/users.py:395
+msgid "Updated permissions"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:439
+#: rhodecode/controllers/admin/users.py:399
+msgid "An error occurred during permissions saving"
+msgstr "Une erreur est survenue durant l’enregistrement des permissions."
+
+#: rhodecode/controllers/admin/users.py:133
 #, python-format
 msgid "Created user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:142
+#: rhodecode/controllers/admin/users.py:147
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:176
+#: rhodecode/controllers/admin/users.py:186
 msgid "User updated successfully"
 msgstr "L’utilisateur a été mis à jour avec succès."
 
-#: rhodecode/controllers/admin/users.py:214
+#: rhodecode/controllers/admin/users.py:221
 msgid "Successfully deleted user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:219
+#: rhodecode/controllers/admin/users.py:226
 msgid "An error occurred during deletion of user"
 msgstr "Une erreur est survenue durant la suppression de l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:234
+#: rhodecode/controllers/admin/users.py:240
+#: rhodecode/controllers/admin/users.py:258
+#: rhodecode/controllers/admin/users.py:281
+#: rhodecode/controllers/admin/users.py:306
+#: rhodecode/controllers/admin/users.py:319
+#: rhodecode/controllers/admin/users.py:343
+#: rhodecode/controllers/admin/users.py:406
+#: rhodecode/controllers/admin/users.py:453
 msgid "You can't edit this user"
 msgstr "Vous ne pouvez pas éditer cet utilisateur"
 
-#: rhodecode/controllers/admin/users.py:293
-#: rhodecode/controllers/admin/users_groups.py:372
-msgid "Updated permissions"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:297
-#: rhodecode/controllers/admin/users_groups.py:376
-msgid "An error occurred during permissions saving"
-msgstr "Une erreur est survenue durant l’enregistrement des permissions."
-
-#: rhodecode/controllers/admin/users.py:311
-#, python-format
-msgid "Added email %s to user"
-msgstr "L’e-mail « %s » a été ajouté à l’utilisateur."
-
-#: rhodecode/controllers/admin/users.py:317
-msgid "An error occurred during email saving"
-msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail."
-
-#: rhodecode/controllers/admin/users.py:327
-msgid "Removed email from user"
-msgstr "L’e-mail a été enlevé de l’utilisateur."
-
-#: rhodecode/controllers/admin/users.py:340
-#, python-format
-msgid "Added ip %s to user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:346
+#: rhodecode/controllers/admin/users.py:481
+#, python-format
+msgid "Added ip %s to user whitelist"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:487
 msgid "An error occurred during ip saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:358
-msgid "Removed ip from user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:162
-#, python-format
-msgid "Created user group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:173
-#, python-format
-msgid "Error occurred during creation of user group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:210
-#, python-format
-msgid "Updated user group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:232
-#, python-format
-msgid "Error occurred during update of user group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:250
-msgid "Successfully deleted user group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:255
-msgid "An error occurred during deletion of user group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:274
-msgid "Target group cannot be the same"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:280
-msgid "User Group permissions updated"
-msgstr ""
-
-#: rhodecode/lib/auth.py:544
+#: rhodecode/controllers/admin/users.py:501
+msgid "Removed ip address from user whitelist"
+msgstr ""
+
+#: rhodecode/lib/auth.py:746
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 
-#: rhodecode/lib/auth.py:593
+#: rhodecode/lib/auth.py:807
 msgid "You need to be a registered user to perform this action"
 msgstr "Vous devez être un utilisateur enregistré pour effectuer cette action."
 
-#: rhodecode/lib/auth.py:634
+#: rhodecode/lib/auth.py:844
 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:66
+#: rhodecode/lib/diffs.py:64
 msgid "Binary file"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:82
+#: rhodecode/lib/diffs.py:80
 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:92
+#: rhodecode/lib/diffs.py:90
 msgid "No changes detected"
 msgstr "Aucun changement détecté."
 
-#: rhodecode/lib/helpers.py:539
-msgid "True"
-msgstr "Vrai"
-
-#: rhodecode/lib/helpers.py:542
-msgid "False"
-msgstr "Faux"
-
-#: rhodecode/lib/helpers.py:580
+#: rhodecode/lib/helpers.py:598
 #, python-format
 msgid "Deleted branch: %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:583
+#: rhodecode/lib/helpers.py:601
 #, python-format
 msgid "Created tag: %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:596
+#: rhodecode/lib/helpers.py:614
 msgid "Changeset not found"
 msgstr "Ensemble de changements non trouvé"
 
-#: rhodecode/lib/helpers.py:646
+#: rhodecode/lib/helpers.py:664
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "Afficher les changements combinés %s->%s"
 
-#: rhodecode/lib/helpers.py:652
+#: rhodecode/lib/helpers.py:670
 msgid "compare view"
 msgstr "vue de comparaison"
 
-#: rhodecode/lib/helpers.py:672
+#: rhodecode/lib/helpers.py:690
 msgid "and"
 msgstr "et"
 
-#: rhodecode/lib/helpers.py:673
+#: rhodecode/lib/helpers.py:691
 #, python-format
 msgid "%s more"
 msgstr "%s de plus"
 
-#: rhodecode/lib/helpers.py:674
-#: rhodecode/templates/changelog/changelog.html:53
+#: rhodecode/lib/helpers.py:692
+#: rhodecode/templates/changelog/changelog.html:58
 msgid "revisions"
 msgstr "révisions"
 
-#: rhodecode/lib/helpers.py:698
+#: rhodecode/lib/helpers.py:716
 #, python-format
 msgid "fork name %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:715
-#: rhodecode/templates/pullrequests/pullrequest_show.html:8
+#: rhodecode/lib/helpers.py:733
+#: rhodecode/templates/pullrequests/pullrequest_show.html:11
 #, python-format
 msgid "Pull request #%s"
 msgstr "Requête de pull #%s"
 
-#: rhodecode/lib/helpers.py:725
+#: rhodecode/lib/helpers.py:743
 msgid "[deleted] repository"
 msgstr "[a supprimé] le dépôt"
 
-#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739
+#: rhodecode/lib/helpers.py:745 rhodecode/lib/helpers.py:757
 msgid "[created] repository"
 msgstr "[a créé] le dépôt"
 
-#: rhodecode/lib/helpers.py:729
+#: rhodecode/lib/helpers.py:747
 msgid "[created] repository as fork"
 msgstr "[a créé] le dépôt en tant que fork"
 
-#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741
+#: rhodecode/lib/helpers.py:749 rhodecode/lib/helpers.py:759
 msgid "[forked] repository"
 msgstr "[a forké] le dépôt"
 
-#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743
+#: rhodecode/lib/helpers.py:751 rhodecode/lib/helpers.py:761
 msgid "[updated] repository"
 msgstr "[a mis à jour] le dépôt"
 
-#: rhodecode/lib/helpers.py:735
+#: rhodecode/lib/helpers.py:753
 msgid "[downloaded] archive from repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:737
+#: rhodecode/lib/helpers.py:755
 msgid "[delete] repository"
 msgstr "[a supprimé] le dépôt"
 
-#: rhodecode/lib/helpers.py:745
+#: rhodecode/lib/helpers.py:763
 msgid "[created] user"
 msgstr "[a créé] l’utilisateur"
 
-#: rhodecode/lib/helpers.py:747
+#: rhodecode/lib/helpers.py:765
 msgid "[updated] user"
 msgstr "[a mis à jour] l’utilisateur"
 
-#: rhodecode/lib/helpers.py:749
+#: rhodecode/lib/helpers.py:767
 msgid "[created] user group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:751
+#: rhodecode/lib/helpers.py:769
 msgid "[updated] user group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:753
+#: rhodecode/lib/helpers.py:771
 msgid "[commented] on revision in repository"
 msgstr "[a commenté] une révision du dépôt"
 
-#: rhodecode/lib/helpers.py:755
+#: rhodecode/lib/helpers.py:773
 msgid "[commented] on pull request for"
 msgstr "[a commenté] la requête de pull pour"
 
-#: rhodecode/lib/helpers.py:757
+#: rhodecode/lib/helpers.py:775
 msgid "[closed] pull request for"
 msgstr "[a fermé] la requête de pull de"
 
-#: rhodecode/lib/helpers.py:759
+#: rhodecode/lib/helpers.py:777
 msgid "[pushed] into"
 msgstr "[a pushé] dans"
 
-#: rhodecode/lib/helpers.py:761
+#: rhodecode/lib/helpers.py:779
 msgid "[committed via RhodeCode] into repository"
 msgstr "[a commité via RhodeCode] dans le dépôt"
 
-#: rhodecode/lib/helpers.py:763
+#: rhodecode/lib/helpers.py:781
 msgid "[pulled from remote] into repository"
 msgstr "[a pullé depuis un site distant] dans le dépôt"
 
-#: rhodecode/lib/helpers.py:765
+#: rhodecode/lib/helpers.py:783
 msgid "[pulled] from"
 msgstr "[a pullé] depuis"
 
-#: rhodecode/lib/helpers.py:767
+#: rhodecode/lib/helpers.py:785
 msgid "[started following] repository"
 msgstr "[suit maintenant] le dépôt"
 
-#: rhodecode/lib/helpers.py:769
+#: rhodecode/lib/helpers.py:787
 msgid "[stopped following] repository"
 msgstr "[ne suit plus] le dépôt"
 
-#: rhodecode/lib/helpers.py:1088
+#: rhodecode/lib/helpers.py:1102
 #, python-format
 msgid " and %s more"
 msgstr "et %s de plus"
 
-#: rhodecode/lib/helpers.py:1092
+#: rhodecode/lib/helpers.py:1106
 msgid "No Files"
 msgstr "Aucun fichier"
 
-#: rhodecode/lib/helpers.py:1158
+#: rhodecode/lib/helpers.py:1172
 msgid "new file"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1161
+#: rhodecode/lib/helpers.py:1175
 msgid "mod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1164
+#: rhodecode/lib/helpers.py:1178
 msgid "del"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1167
+#: rhodecode/lib/helpers.py:1181
 msgid "rename"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1172
+#: rhodecode/lib/helpers.py:1186
 msgid "chmod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1404
+#: rhodecode/lib/helpers.py:1418
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from the"
 " filesystem please run the application again in order to rescan repositories"
 msgstr "Le dépôt %s n’est pas représenté dans la base de données. Il a probablement été créé ou renommé manuellement. Veuillez relancer l’application pour rescanner les dépôts."
 
-#: rhodecode/lib/unionrepo.py:193
-msgid "cannot create new union repository"
-msgstr ""
-
-#: rhodecode/lib/utils2.py:410
+#: rhodecode/lib/utils2.py:413
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d an"
 msgstr[1] "%d ans"
 
-#: rhodecode/lib/utils2.py:411
+#: rhodecode/lib/utils2.py:414
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mois"
 msgstr[1] "%d mois"
 
-#: rhodecode/lib/utils2.py:412
+#: rhodecode/lib/utils2.py:415
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: rhodecode/lib/utils2.py:413
+#: rhodecode/lib/utils2.py:416
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: rhodecode/lib/utils2.py:414
+#: rhodecode/lib/utils2.py:417
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: rhodecode/lib/utils2.py:415
+#: rhodecode/lib/utils2.py:418
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d secondes"
 
-#: rhodecode/lib/utils2.py:431
+#: rhodecode/lib/utils2.py:434
 #, python-format
 msgid "in %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:433
+#: rhodecode/lib/utils2.py:436
 #, python-format
 msgid "%s ago"
 msgstr "Il y a %s"
 
-#: rhodecode/lib/utils2.py:435
+#: rhodecode/lib/utils2.py:438
 #, python-format
 msgid "in %s and %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:438
+#: rhodecode/lib/utils2.py:441
 #, python-format
 msgid "%s and %s ago"
 msgstr "Il y a %s et %s"
 
-#: rhodecode/lib/utils2.py:441
+#: rhodecode/lib/utils2.py:444
 msgid "just now"
 msgstr "à l’instant"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1454
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1511
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1572
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1622
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1649 rhodecode/model/db.py:1659
 msgid "Repository no access"
 msgstr "Aucun accès au dépôt"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1455
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1573
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1623
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1650 rhodecode/model/db.py:1660
 msgid "Repository read access"
 msgstr "Accès en lecture au dépôt"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1456
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1574
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1651 rhodecode/model/db.py:1661
 msgid "Repository write access"
 msgstr "Accès en écriture au dépôt"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1167
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1457
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1515
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1575
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1652 rhodecode/model/db.py:1662
 msgid "Repository admin access"
 msgstr "Accès administrateur au dépôt"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308
 msgid "Repositories Group no access"
 msgstr "Aucun accès au groupe de dépôts"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309
 msgid "Repositories Group read access"
 msgstr "Accès en lecture au groupe de dépôts"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310
 msgid "Repositories Group write access"
 msgstr "Accès en écriture au groupe de dépôts"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311
 msgid "Repositories Group admin access"
 msgstr "Accès administrateur au groupe de dépôts"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1452
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1509
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1510
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1570
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1620
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1647 rhodecode/model/db.py:1657
 msgid "RhodeCode Administrator"
 msgstr "Administrateur RhodeCode"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1475
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1532
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1554
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1593
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1670 rhodecode/model/db.py:1680
 msgid "Repository creation disabled"
 msgstr "Création de dépôt désactivée"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1476
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1555
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1594
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1671 rhodecode/model/db.py:1681
 msgid "Repository creation enabled"
 msgstr "Création de dépôt activée"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1478
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1557
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1596
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1648
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1675 rhodecode/model/db.py:1685
 msgid "Repository forking disabled"
 msgstr "Fork de dépôt désactivé"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1479
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1537
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1558
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1597
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1649
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1676 rhodecode/model/db.py:1686
 msgid "Repository forking enabled"
 msgstr "Fork de dépôt activé"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1403
 msgid "Register disabled"
 msgstr "Enregistrement désactivé"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1180
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1404
 msgid "Register new user with RhodeCode with manual activation"
 msgstr "Enregistrer un nouvel utilisateur Rhodecode manuellement activé"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1183
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1407
 msgid "Register new user with RhodeCode with auto activation"
 msgstr "Enregistrer un nouvel utilisateur Rhodecode auto-activé"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1651
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1980
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2040
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2062
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2101
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2154
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2200 rhodecode/model/db.py:2210
 msgid "Not Reviewed"
 msgstr "Pas encore relue"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1652
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1981
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2063
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2102
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2155
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2201 rhodecode/model/db.py:2211
 msgid "Approved"
 msgstr "Approuvée "
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1653
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1982
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2064
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2103
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2156
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2202 rhodecode/model/db.py:2212
 msgid "Rejected"
 msgstr "Rejetée"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1654
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1983
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2044
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2065
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2104
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2157
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2203 rhodecode/model/db.py:2213
 msgid "Under Review"
 msgstr "En cours de relecture"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1300
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1357
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1358
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1379
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1471
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1498 rhodecode/model/db.py:1508
 msgid "top level"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1459
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1516
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1577
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1654 rhodecode/model/db.py:1664
 msgid "Repository group no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1460
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1578
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1628
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1655 rhodecode/model/db.py:1665
 msgid "Repository group read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1461
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1579
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1629
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1656 rhodecode/model/db.py:1666
 msgid "Repository group write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1462
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1520
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1580
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1630
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1657 rhodecode/model/db.py:1667
 msgid "Repository group admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1464
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1521
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1582
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1632
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1659 rhodecode/model/db.py:1669
 msgid "User group no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1465
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1583
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1633
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1660 rhodecode/model/db.py:1670
 msgid "User group read access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1466
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1545
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1584
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1634
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1661 rhodecode/model/db.py:1671
 msgid "User group write access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1467
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1525
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1546
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1585
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1635
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1662 rhodecode/model/db.py:1672
 msgid "User group admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1469
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1526
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1548
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1587
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1637
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1664 rhodecode/model/db.py:1674
 msgid "Repository Group creation disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1470
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1528
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1549
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1588
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1638
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1665 rhodecode/model/db.py:1675
 msgid "Repository Group creation enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1472
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1529
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1551
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1590
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1640
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1667 rhodecode/model/db.py:1677
 msgid "User Group creation disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1473
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1552
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1591
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1641
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1668 rhodecode/model/db.py:1678
 msgid "User Group creation enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1481
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1560
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1599
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1651
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1678 rhodecode/model/db.py:1688
 msgid "Registration disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1482
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1561
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1600
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1652
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1679 rhodecode/model/db.py:1689
 msgid "User Registration with manual account activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1483
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1562
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1601
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1653
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1680 rhodecode/model/db.py:1690
 msgid "User Registration with automatic account activation"
 msgstr ""
 
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1672 rhodecode/model/db.py:1682
+msgid ""
+"Repository creation enabled with write permission to a repository group"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1673 rhodecode/model/db.py:1683
+msgid ""
+"Repository creation disabled with write permission to a repository group"
+msgstr ""
+
 #: rhodecode/model/comment.py:75
 #, python-format
 msgid "on line %s"
@@ -1318,470 +1665,487 @@
 msgid "[Mention]"
 msgstr "[Mention]"
 
-#: rhodecode/model/forms.py:43
+#: rhodecode/model/forms.py:57
 msgid "Please enter a login"
 msgstr "Veuillez entrer un identifiant"
 
-#: rhodecode/model/forms.py:44
+#: rhodecode/model/forms.py:58
 #, 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
+#: rhodecode/model/forms.py:66
 msgid "Please enter a password"
 msgstr "Veuillez entrer un mot de passe"
 
-#: rhodecode/model/forms.py:53
+#: rhodecode/model/forms.py:67
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr "Entrez au moins %(min)i caractères"
 
-#: rhodecode/model/notification.py:228
-#, python-format
-msgid "%(user)s commented on changeset at %(when)s"
+#: rhodecode/model/forms.py:156
+msgid "Name must not contain only digits"
 msgstr ""
 
 #: rhodecode/model/notification.py:229
 #, python-format
-msgid "%(user)s sent message at %(when)s"
+msgid "%(user)s commented on changeset at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:230
 #, python-format
-msgid "%(user)s mentioned you at %(when)s"
+msgid "%(user)s sent message at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:231
 #, python-format
-msgid "%(user)s registered in RhodeCode at %(when)s"
+msgid "%(user)s mentioned you at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:232
 #, python-format
-msgid "%(user)s opened new pull request at %(when)s"
+msgid "%(user)s registered in RhodeCode at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:233
 #, python-format
+msgid "%(user)s opened new pull request at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:234
+#, python-format
 msgid "%(user)s commented on pull request at %(when)s"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:98
+#: rhodecode/model/pull_request.py:105
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr ""
 
-#: rhodecode/model/scm.py:674
+#: rhodecode/model/scm.py:808
 msgid "latest tip"
 msgstr "Dernier sommet"
 
-#: rhodecode/model/user.py:232
+#: rhodecode/model/user.py:196
 msgid "New user registration"
 msgstr ""
 
-#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
+#: rhodecode/model/user.py:220 rhodecode/model/user.py:245
 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:303
+#: rhodecode/model/user.py:268
 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:309
+#: rhodecode/model/user.py:274
 #, 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/user.py:334
+#: rhodecode/model/user.py:302
 msgid "Password reset link"
 msgstr ""
 
-#: rhodecode/model/user.py:366
+#: rhodecode/model/user.py:331
 msgid "Your new password"
 msgstr ""
 
-#: rhodecode/model/user.py:367
+#: rhodecode/model/user.py:332
 #, python-format
 msgid "Your new RhodeCode password:%s"
 msgstr ""
 
-#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39
+#: rhodecode/model/validators.py:82 rhodecode/model/validators.py:83
 msgid "Value cannot be an empty list"
 msgstr "Cette valeur ne peut être une liste vide."
 
-#: rhodecode/model/validators.py:85
+#: rhodecode/model/validators.py:120
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "Le nom d’utilisateur « %(username)s » existe déjà."
 
-#: rhodecode/model/validators.py:87
+#: rhodecode/model/validators.py:122
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr "Le nom d’utilisateur « %(username)s » n’est pas autorisé"
 
-#: rhodecode/model/validators.py:89
+#: rhodecode/model/validators.py:124
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or "
 "dashes and must begin with alphanumeric character or underscore"
 msgstr ""
 
-#: rhodecode/model/validators.py:117
+#: rhodecode/model/validators.py:151
+msgid "The input is not valid"
+msgstr ""
+
+#: rhodecode/model/validators.py:158
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide."
 
-#: rhodecode/model/validators.py:136
+#: rhodecode/model/validators.py:177
 msgid "Invalid user group name"
 msgstr ""
 
-#: rhodecode/model/validators.py:137
+#: rhodecode/model/validators.py:178
 #, python-format
 msgid "User group \"%(usergroup)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:139
+#: rhodecode/model/validators.py:180
 msgid ""
 "user group name may only contain alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr ""
 
-#: rhodecode/model/validators.py:177
+#: rhodecode/model/validators.py:218
 msgid "Cannot assign this group as parent"
 msgstr "Impossible d’assigner ce groupe en tant que parent."
 
-#: rhodecode/model/validators.py:178
+#: rhodecode/model/validators.py:219
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "Le groupe « %(group_name)s » existe déjà."
 
-#: rhodecode/model/validators.py:180
+#: rhodecode/model/validators.py:221
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "Un dépôt portant le nom « %(group_name)s » existe déjà."
 
-#: rhodecode/model/validators.py:238
+#: rhodecode/model/validators.py:279
 msgid "Invalid characters (non-ascii) in password"
 msgstr "Caractères incorrects (non-ASCII) dans le mot de passe."
 
-#: rhodecode/model/validators.py:253
+#: rhodecode/model/validators.py:294
+msgid "Invalid old password"
+msgstr ""
+
+#: rhodecode/model/validators.py:310
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas."
 
-#: rhodecode/model/validators.py:270
+#: rhodecode/model/validators.py:327
 msgid "invalid password"
 msgstr "mot de passe invalide"
 
-#: rhodecode/model/validators.py:271
+#: rhodecode/model/validators.py:328
 msgid "invalid user name"
 msgstr "nom d’utilisateur invalide"
 
-#: rhodecode/model/validators.py:272
+#: rhodecode/model/validators.py:329
 msgid "Your account is disabled"
 msgstr "Votre compte est désactivé"
 
-#: rhodecode/model/validators.py:316
+#: rhodecode/model/validators.py:373
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr "Le nom de dépôt « %(repo)s » n’est pas autorisé."
 
-#: rhodecode/model/validators.py:318
+#: rhodecode/model/validators.py:375
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "Un dépôt portant le nom « %(repo)s » existe déjà."
 
-#: rhodecode/model/validators.py:319
+#: rhodecode/model/validators.py:376
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "Le dépôt « %(repo)s » existe déjà dans le groupe « %(group)s »."
 
-#: rhodecode/model/validators.py:321
+#: rhodecode/model/validators.py:378
 #, python-format
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:438
+#: rhodecode/model/validators.py:493
 msgid "invalid clone url"
 msgstr "URL de clonage invalide."
 
-#: rhodecode/model/validators.py:439
+#: rhodecode/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr "URL à cloner invalide. Veuillez fournir une URL valide en http(s) ou svn+http(s)."
 
-#: rhodecode/model/validators.py:464
+#: rhodecode/model/validators.py:519
 msgid "Fork have to be the same type as parent"
 msgstr "Le fork doit être du même type que le parent."
 
-#: rhodecode/model/validators.py:479
+#: rhodecode/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr "Vous n’avez pas la permission de créer un dépôt dans ce groupe."
 
-#: rhodecode/model/validators.py:481
+#: rhodecode/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr ""
 
-#: rhodecode/model/validators.py:518
+#: rhodecode/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
 msgstr ""
 
-#: rhodecode/model/validators.py:559
+#: rhodecode/model/validators.py:626
 msgid "This username or user group name is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:652
+#: rhodecode/model/validators.py:719
 msgid "This is not a valid path"
 msgstr "Ceci n’est pas un chemin valide"
 
-#: rhodecode/model/validators.py:667
+#: rhodecode/model/validators.py:734
 msgid "This e-mail address is already taken"
 msgstr "Cette adresse e-mail est déjà enregistrée"
 
-#: rhodecode/model/validators.py:687
+#: rhodecode/model/validators.py:754
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "L’adresse e-mail « %(email)s » n’existe pas"
 
-#: rhodecode/model/validators.py:724
+#: rhodecode/model/validators.py:791
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name of "
 "the attribute that is equivalent to \"username\""
 msgstr "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom d’utilisateur."
 
-#: rhodecode/model/validators.py:737
+#: rhodecode/model/validators.py:804
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr "Les révisions %(revs)s font déjà partie de la requête de pull ou on des statuts définis."
 
-#: rhodecode/model/validators.py:769
+#: rhodecode/model/validators.py:836
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
-#: rhodecode/model/validators.py:770
+#: rhodecode/model/validators.py:837
 #, python-format
 msgid ""
 "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
 
-#: rhodecode/model/validators.py:803
+#: rhodecode/model/validators.py:870
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 
-#: rhodecode/model/validators.py:817
+#: rhodecode/model/validators.py:884
 msgid "Filename cannot be inside a directory"
 msgstr ""
 
+#: rhodecode/model/validators.py:900
+#, python-format
+msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
+msgstr ""
+
 #: rhodecode/templates/index.html:5
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
 #: rhodecode/templates/index_base.html:6
-#: rhodecode/templates/repo_switcher_list.html:4
-#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/users/user_edit_my_account.html:31
-#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/bookmarks/bookmarks.html:9
-#: rhodecode/templates/branches/branches.html:9
-#: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:46
-#: rhodecode/templates/journal/journal.html:47
-#: rhodecode/templates/tags/tags.html:9
+#: rhodecode/templates/admin/my_account/my_account_repos.html:3
+#: rhodecode/templates/admin/my_account/my_account_watched.html:3
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:12
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:12
+#: rhodecode/templates/admin/users/users.html:12
+#: rhodecode/templates/bookmarks/bookmarks.html:12
+#: rhodecode/templates/branches/branches.html:12
+#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:50
+#: rhodecode/templates/tags/tags.html:12
 msgid "quick filter..."
 msgstr "Filtre rapide…"
 
 #: rhodecode/templates/index_base.html:6
-#: rhodecode/templates/admin/repos/repos.html:9
+#: rhodecode/templates/admin/repos/repos.html:12
 msgid "repositories"
 msgstr "Dépôts"
 
-#: rhodecode/templates/index_base.html:13
-#: rhodecode/templates/index_base.html:18
-#: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repos.html:22
-msgid "Add repository"
-msgstr "Ajouter un dépôt"
-
-#: rhodecode/templates/index_base.html:15
 #: rhodecode/templates/index_base.html:20
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31
-msgid "Add group"
-msgstr ""
-
+#: rhodecode/templates/index_base.html:25
+#: rhodecode/templates/admin/repos/repo_add.html:22
+#: rhodecode/templates/admin/repos/repos.html:25
+msgid "Add Repository"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:22
 #: rhodecode/templates/index_base.html:27
-msgid "Edit group"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:27
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:16
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:29
+msgid "Add Repository Group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:32
 msgid "You have admin right to this group, and can edit it"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:40
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43
-#: rhodecode/templates/admin/users_groups/users_group_add.html:32
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:33
-#: rhodecode/templates/admin/users_groups/users_groups.html:37
-msgid "Group name"
-msgstr "Nom de groupe"
-
-#: rhodecode/templates/index_base.html:41
-#: rhodecode/templates/index_base.html:123
-#: rhodecode/templates/admin/repos/repo_add_base.html:56
-#: rhodecode/templates/admin/repos/repo_edit.html:68
-#: rhodecode/templates/admin/repos/repos.html:75
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44
-#: rhodecode/templates/email_templates/changeset_comment.html:9
+#: rhodecode/templates/index_base.html:32
+msgid "Edit Repository Group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:45
+msgid "Group Name"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:46
+#: rhodecode/templates/index_base.html:128
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:64
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:45
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:17
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:32
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:72
+#: rhodecode/templates/admin/repos/repos.html:51
+#: rhodecode/templates/admin/user_groups/user_group_add.html:43
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:51
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:64
+#: rhodecode/templates/email_templates/changeset_comment.html:16
 #: rhodecode/templates/email_templates/pull_request.html:9
-#: rhodecode/templates/forks/fork.html:56
-#: rhodecode/templates/pullrequests/pullrequest.html:43
-#: rhodecode/templates/pullrequests/pullrequest_show.html:81
-#: rhodecode/templates/summary/summary.html:106
+#: rhodecode/templates/forks/fork.html:41
+#: rhodecode/templates/pullrequests/pullrequest.html:40
+#: rhodecode/templates/pullrequests/pullrequest_show.html:86
+#: rhodecode/templates/summary/summary.html:88
 msgid "Description"
 msgstr "Description"
 
-#: rhodecode/templates/index_base.html:51
-#: rhodecode/templates/admin/permissions/permissions.html:55
-#: rhodecode/templates/admin/repos/repo_add_base.html:29
-#: rhodecode/templates/admin/repos/repo_edit.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57
-#: rhodecode/templates/forks/fork.html:47
-msgid "Repository group"
-msgstr "Groupe de dépôt"
-
-#: rhodecode/templates/index_base.html:121
+#: rhodecode/templates/index_base.html:126
+#: rhodecode/templates/admin/my_account/my_account_repos.html:46
+#: rhodecode/templates/admin/my_account/my_account_watched.html:46
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:50
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
-#: rhodecode/templates/admin/repos/repo_edit.html:32
-#: rhodecode/templates/admin/repos/repos.html:73
-#: rhodecode/templates/admin/users/user_edit_my_account.html:172
-#: rhodecode/templates/base/perms_summary.html:37
-#: rhodecode/templates/bookmarks/bookmarks.html:48
-#: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:47
-#: rhodecode/templates/branches/branches_data.html:6
-#: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:193
-#: rhodecode/templates/journal/journal.html:283
-#: rhodecode/templates/summary/summary.html:55
-#: rhodecode/templates/summary/summary.html:124
-#: rhodecode/templates/tags/tags.html:48
-#: rhodecode/templates/tags/tags_data.html:6
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:7
+#: rhodecode/templates/admin/repos/repos.html:50
+#: rhodecode/templates/admin/user_groups/user_groups.html:50
+#: rhodecode/templates/base/perms_summary.html:53
+#: rhodecode/templates/bookmarks/bookmarks.html:51
+#: rhodecode/templates/bookmarks/bookmarks_data.html:7
+#: rhodecode/templates/branches/branches.html:50
+#: rhodecode/templates/branches/branches_data.html:7
+#: rhodecode/templates/files/files_browser.html:41
+#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/journal/journal.html:288
+#: rhodecode/templates/tags/tags.html:51
+#: rhodecode/templates/tags/tags_data.html:7
 msgid "Name"
 msgstr "Nom"
 
-#: rhodecode/templates/index_base.html:124
+#: rhodecode/templates/index_base.html:129
 msgid "Last Change"
 msgstr "Dernière modification"
 
-#: rhodecode/templates/index_base.html:126
-#: rhodecode/templates/admin/repos/repos.html:76
-#: rhodecode/templates/admin/users/user_edit_my_account.html:174
-#: rhodecode/templates/journal/journal.html:195
-#: rhodecode/templates/journal/journal.html:285
+#: rhodecode/templates/index_base.html:131
+#: rhodecode/templates/admin/my_account/my_account_repos.html:48
+#: rhodecode/templates/admin/my_account/my_account_watched.html:48
+#: rhodecode/templates/admin/repos/repos.html:52
+#: rhodecode/templates/journal/journal.html:199
+#: rhodecode/templates/journal/journal.html:290
 msgid "Tip"
 msgstr "Sommet"
 
-#: rhodecode/templates/index_base.html:128
-#: rhodecode/templates/admin/repos/repo_edit.html:114
-#: rhodecode/templates/admin/repos/repos.html:78
+#: rhodecode/templates/index_base.html:133
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:10
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:53
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:60
+#: rhodecode/templates/admin/repos/repos.html:53
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:8
+#: rhodecode/templates/admin/user_groups/user_groups.html:54
+#: rhodecode/templates/summary/summary.html:141
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: rhodecode/templates/index_base.html:136
-#: rhodecode/templates/admin/repos/repos.html:86
-#: rhodecode/templates/admin/users/user_edit_my_account.html:183
-#: rhodecode/templates/admin/users/users.html:107
-#: rhodecode/templates/bookmarks/bookmarks.html:74
-#: rhodecode/templates/branches/branches.html:73
-#: rhodecode/templates/journal/journal.html:204
-#: rhodecode/templates/journal/journal.html:294
-#: rhodecode/templates/tags/tags.html:74
+#: rhodecode/templates/index_base.html:141
+#: rhodecode/templates/admin/my_account/my_account_repos.html:57
+#: rhodecode/templates/admin/my_account/my_account_watched.html:57
+#: rhodecode/templates/base/root.html:69
+#: rhodecode/templates/bookmarks/bookmarks.html:81
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:208
+#: rhodecode/templates/journal/journal.html:299
+#: rhodecode/templates/tags/tags.html:81
 msgid "Click to sort ascending"
 msgstr "Tri ascendant"
 
-#: rhodecode/templates/index_base.html:137
-#: rhodecode/templates/admin/repos/repos.html:87
-#: rhodecode/templates/admin/users/user_edit_my_account.html:184
-#: rhodecode/templates/admin/users/users.html:108
-#: rhodecode/templates/bookmarks/bookmarks.html:75
-#: rhodecode/templates/branches/branches.html:74
-#: rhodecode/templates/journal/journal.html:205
-#: rhodecode/templates/journal/journal.html:295
-#: rhodecode/templates/tags/tags.html:75
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/admin/my_account/my_account_repos.html:58
+#: rhodecode/templates/admin/my_account/my_account_watched.html:58
+#: rhodecode/templates/base/root.html:70
+#: rhodecode/templates/bookmarks/bookmarks.html:82
+#: rhodecode/templates/branches/branches.html:81
+#: rhodecode/templates/journal/journal.html:209
+#: rhodecode/templates/journal/journal.html:300
+#: rhodecode/templates/tags/tags.html:82
 msgid "Click to sort descending"
 msgstr "Tri descendant"
 
-#: rhodecode/templates/index_base.html:138
+#: rhodecode/templates/index_base.html:143
 msgid "No repositories found."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:139
-#: rhodecode/templates/admin/repos/repos.html:89
-#: rhodecode/templates/admin/users/user_edit_my_account.html:186
-#: rhodecode/templates/admin/users/users.html:110
-#: rhodecode/templates/bookmarks/bookmarks.html:77
-#: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:207
-#: rhodecode/templates/journal/journal.html:297
-#: rhodecode/templates/tags/tags.html:77
+#: rhodecode/templates/index_base.html:144
+#: rhodecode/templates/admin/my_account/my_account_repos.html:60
+#: rhodecode/templates/admin/my_account/my_account_watched.html:60
+#: rhodecode/templates/base/root.html:72
+#: rhodecode/templates/bookmarks/bookmarks.html:84
+#: rhodecode/templates/branches/branches.html:83
+#: rhodecode/templates/journal/journal.html:211
+#: rhodecode/templates/journal/journal.html:302
+#: rhodecode/templates/tags/tags.html:84
 msgid "Data error."
 msgstr "Erreur d’intégrité des données."
 
-#: rhodecode/templates/index_base.html:140
-#: rhodecode/templates/admin/repos/repos.html:90
-#: rhodecode/templates/admin/users/user_edit_my_account.html:58
-#: rhodecode/templates/admin/users/user_edit_my_account.html:187
-#: rhodecode/templates/admin/users/users.html:111
-#: rhodecode/templates/bookmarks/bookmarks.html:78
-#: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:208
-#: rhodecode/templates/journal/journal.html:298
-#: rhodecode/templates/tags/tags.html:78
+#: rhodecode/templates/index_base.html:145
+#: rhodecode/templates/admin/my_account/my_account_repos.html:61
+#: rhodecode/templates/admin/my_account/my_account_watched.html:61
+#: rhodecode/templates/base/base.html:148
+#: rhodecode/templates/base/root.html:73
+#: rhodecode/templates/bookmarks/bookmarks.html:85
+#: rhodecode/templates/branches/branches.html:84
+#: rhodecode/templates/journal/journal.html:212
+#: rhodecode/templates/journal/journal.html:303
+#: rhodecode/templates/tags/tags.html:85
 msgid "Loading..."
 msgstr "Chargement…"
 
-#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239
+#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:32
+#: rhodecode/templates/base/base.html:267
 msgid "Log In"
 msgstr "Connexion"
 
-#: rhodecode/templates/login.html:21
+#: rhodecode/templates/login.html:30
 #, python-format
 msgid "Log In to %s"
 msgstr ""
 
-#: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
+#: rhodecode/templates/login.html:43 rhodecode/templates/register.html:40
 #: rhodecode/templates/admin/admin_log.html:5
-#: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:57
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31
-#: rhodecode/templates/admin/users/users.html:77
-#: rhodecode/templates/base/base.html:215
-#: rhodecode/templates/summary/summary.html:123
+#: rhodecode/templates/admin/my_account/my_account_profile.html:30
+#: rhodecode/templates/admin/users/user_add.html:35
+#: rhodecode/templates/admin/users/user_edit_profile.html:33
+#: rhodecode/templates/admin/users/users.html:53
+#: rhodecode/templates/base/base.html:243
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
-#: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
-#: rhodecode/templates/admin/ldap/ldap.html:46
-#: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:224
+#: rhodecode/templates/login.html:52 rhodecode/templates/register.html:49
+#: rhodecode/templates/admin/my_account/my_account.html:39
+#: rhodecode/templates/admin/users/user_add.html:44
+#: rhodecode/templates/base/base.html:252
 msgid "Password"
 msgstr "Mot de passe"
 
-#: rhodecode/templates/login.html:50
+#: rhodecode/templates/login.html:62
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
-#: rhodecode/templates/login.html:54
+#: rhodecode/templates/login.html:66
 msgid "Sign In"
 msgstr "Connexion"
 
-#: rhodecode/templates/login.html:60
+#: rhodecode/templates/login.html:72
 msgid "Forgot your password ?"
 msgstr "Mot de passe oublié ?"
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235
+#: rhodecode/templates/login.html:75 rhodecode/templates/base/base.html:263
 msgid "Don't have an account ?"
 msgstr "Vous n’avez pas de compte ?"
 
@@ -1789,111 +2153,112 @@
 msgid "Password Reset"
 msgstr ""
 
-#: rhodecode/templates/password_reset.html:11
-msgid "Reset your password to"
-msgstr "Réinitialiser votre mot de passe"
-
-#: rhodecode/templates/password_reset.html:21
-msgid "Email address"
-msgstr "Adresse e-mail"
-
-#: rhodecode/templates/password_reset.html:30
-msgid "Reset my password"
-msgstr "Réinitialiser mon mot de passe"
+#: rhodecode/templates/password_reset.html:29
+#, python-format
+msgid "Reset your Password to %s"
+msgstr ""
 
 #: rhodecode/templates/password_reset.html:31
+msgid "Reset your Password"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:42
+msgid "Email Address"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:52
+#: rhodecode/templates/register.html:95
+msgid "Captcha"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:63
+msgid "Send password reset email"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:64
 msgid "Password reset link will be send to matching email address"
 msgstr "Votre nouveau mot de passe sera envoyé à l’adresse correspondante."
 
-#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74
+#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:30
+#: rhodecode/templates/register.html:106
 msgid "Sign Up"
 msgstr "Inscription"
 
-#: rhodecode/templates/register.html:11
-msgid "Sign Up to"
-msgstr "Inscription à"
-
-#: rhodecode/templates/register.html:38
+#: rhodecode/templates/register.html:28
+#, python-format
+msgid "Sign Up to %s"
+msgstr ""
+
+#: rhodecode/templates/register.html:58
 msgid "Re-enter password"
 msgstr "Confirmation"
 
-#: rhodecode/templates/register.html:47
-#: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
+#: rhodecode/templates/register.html:67
+#: rhodecode/templates/admin/my_account/my_account_profile.html:41
+#: rhodecode/templates/admin/users/user_add.html:62
+#: rhodecode/templates/admin/users/user_edit_profile.html:87
 msgid "First Name"
 msgstr "Prénom"
 
-#: rhodecode/templates/register.html:56
-#: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:106
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
+#: rhodecode/templates/register.html:76
+#: rhodecode/templates/admin/my_account/my_account_profile.html:50
+#: rhodecode/templates/admin/users/user_add.html:71
+#: rhodecode/templates/admin/users/user_edit_profile.html:96
 msgid "Last Name"
 msgstr "Nom"
 
-#: rhodecode/templates/register.html:65
-#: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:115
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/summary/summary.html:125
+#: rhodecode/templates/register.html:85
+#: rhodecode/templates/admin/my_account/my_account_profile.html:59
+#: rhodecode/templates/admin/settings/settings.html:44
+#: rhodecode/templates/admin/users/user_add.html:80
+#: rhodecode/templates/admin/users/user_edit_profile.html:42
 msgid "Email"
 msgstr "E-mail"
 
-#: rhodecode/templates/register.html:76
+#: rhodecode/templates/register.html:108
 msgid "Your account will be activated right after registration"
 msgstr "Votre compte utilisateur sera actif dès la fin de l’enregistrement."
 
-#: rhodecode/templates/register.html:78
+#: rhodecode/templates/register.html:110
 msgid "Your account must wait for activation by administrator"
 msgstr "Votre compte utilisateur devra être activé par un administrateur."
 
-#: rhodecode/templates/repo_switcher_list.html:10
-#: rhodecode/templates/admin/defaults/defaults.html:44
-#: rhodecode/templates/admin/repos/repo_add_base.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:78
-#: rhodecode/templates/data_table/_dt_elements.html:61
-#: rhodecode/templates/summary/summary.html:77
-msgid "Private repository"
-msgstr "Dépôt privé"
-
-#: rhodecode/templates/repo_switcher_list.html:12
-#: rhodecode/templates/data_table/_dt_elements.html:63
-#: rhodecode/templates/summary/summary.html:79
-msgid "Public repository"
-msgstr "Dépôt public"
-
 #: rhodecode/templates/switch_to_list.html:10
-#: rhodecode/templates/branches/branches_data.html:57
+#: rhodecode/templates/branches/branches_data.html:67
 msgid "There are no branches yet"
 msgstr "Aucune branche n’a été créée pour le moment."
 
-#: rhodecode/templates/switch_to_list.html:22
-#: rhodecode/templates/tags/tags_data.html:38
+#: rhodecode/templates/switch_to_list.html:16
+msgid "Closed Branches"
+msgstr ""
+
+#: rhodecode/templates/switch_to_list.html:32
+#: rhodecode/templates/tags/tags_data.html:44
 msgid "There are no tags yet"
 msgstr "Aucun tag n’a été créé pour le moment."
 
-#: rhodecode/templates/switch_to_list.html:35
-#: rhodecode/templates/bookmarks/bookmarks_data.html:37
+#: rhodecode/templates/switch_to_list.html:45
+#: rhodecode/templates/bookmarks/bookmarks_data.html:43
 msgid "There are no bookmarks yet"
 msgstr "Aucun signet n’a été créé."
 
 #: rhodecode/templates/admin/admin.html:5
-#: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/base/base.html:73
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/base/base.html:69
 msgid "Admin journal"
 msgstr "Historique d’administration"
 
-#: rhodecode/templates/admin/admin.html:10
+#: rhodecode/templates/admin/admin.html:13
 msgid "journal filter..."
 msgstr ""
 
-#: rhodecode/templates/admin/admin.html:12
-#: rhodecode/templates/journal/journal.html:11
+#: rhodecode/templates/admin/admin.html:15
+#: rhodecode/templates/journal/journal.html:14
 msgid "filter"
 msgstr ""
 
-#: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/journal/journal.html:15
 #, python-format
 msgid "%s entry"
 msgid_plural "%s entries"
@@ -1901,28 +2266,30 @@
 msgstr[1] ""
 
 #: rhodecode/templates/admin/admin_log.html:6
-#: rhodecode/templates/admin/repos/repos.html:79
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
-#: rhodecode/templates/admin/users/user_edit_my_account.html:176
-#: rhodecode/templates/admin/users/users.html:87
-#: rhodecode/templates/admin/users_groups/users_groups.html:40
-#: rhodecode/templates/journal/journal.html:197
-#: rhodecode/templates/journal/journal.html:287
+#: rhodecode/templates/admin/my_account/my_account_repos.html:50
+#: rhodecode/templates/admin/my_account/my_account_watched.html:50
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:54
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:8
+#: rhodecode/templates/admin/repos/repos.html:55
+#: rhodecode/templates/admin/user_groups/user_groups.html:55
+#: rhodecode/templates/admin/users/users.html:60
+#: rhodecode/templates/journal/journal.html:201
+#: rhodecode/templates/journal/journal.html:292
 msgid "Action"
 msgstr "Action"
 
 #: rhodecode/templates/admin/admin_log.html:7
-#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/permissions/permissions_globals.html:18
 msgid "Repository"
 msgstr "Dépôt"
 
 #: rhodecode/templates/admin/admin_log.html:8
-#: rhodecode/templates/bookmarks/bookmarks.html:49
-#: rhodecode/templates/bookmarks/bookmarks_data.html:7
-#: rhodecode/templates/branches/branches.html:48
-#: rhodecode/templates/branches/branches_data.html:7
-#: rhodecode/templates/tags/tags.html:49
-#: rhodecode/templates/tags/tags_data.html:7
+#: rhodecode/templates/bookmarks/bookmarks.html:53
+#: rhodecode/templates/bookmarks/bookmarks_data.html:9
+#: rhodecode/templates/branches/branches.html:52
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/tags/tags.html:53
+#: rhodecode/templates/tags/tags_data.html:9
 msgid "Date"
 msgstr "Date"
 
@@ -1934,309 +2301,598 @@
 msgid "No actions yet"
 msgstr "Aucune action n’a été enregistrée pour le moment."
 
+#: rhodecode/templates/admin/auth/auth_settings.html:5
+msgid "Authentication Settings"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:14
+#: rhodecode/templates/base/base.html:75
+msgid "Authentication"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:31
+msgid "Authentication Plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:34
+msgid "Enabled Plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:36
+msgid ""
+"Comma separated list of plugins. Order of plugins is also order in which "
+"RhodeCode will try to authenticate user"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:37
+msgid "Available built-in plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:65
+msgid "enabled"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:66
+msgid "disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:51
+#: rhodecode/templates/admin/defaults/defaults.html:87
+#: rhodecode/templates/admin/my_account/my_account_password.html:33
+#: rhodecode/templates/admin/my_account/my_account_profile.html:68
+#: rhodecode/templates/admin/permissions/permissions_globals.html:108
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:72
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:114
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:101
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:134
+#: rhodecode/templates/admin/settings/settings_hooks.html:53
+#: rhodecode/templates/admin/user_groups/user_group_add.html:60
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:104
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:67
+#: rhodecode/templates/admin/users/user_add.html:99
+#: rhodecode/templates/admin/users/user_edit_profile.html:122
+#: rhodecode/templates/base/default_perms_box.html:64
+msgid "Save"
+msgstr "Enregistrer"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:57
+msgid "Plugin"
+msgstr ""
+
 #: rhodecode/templates/admin/defaults/defaults.html:5
-#: rhodecode/templates/admin/defaults/defaults.html:25
+#: rhodecode/templates/admin/defaults/defaults.html:28
 msgid "Repositories defaults"
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:11
-#: rhodecode/templates/base/base.html:80
+#: rhodecode/templates/admin/defaults/defaults.html:14
+#: rhodecode/templates/base/base.html:76
 msgid "Defaults"
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:35
-#: rhodecode/templates/admin/repos/repo_add_base.html:38
+#: rhodecode/templates/admin/defaults/defaults.html:38
+#: rhodecode/templates/admin/repos/repo_add_base.html:59
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:7
 msgid "Type"
 msgstr "Type"
 
-#: rhodecode/templates/admin/defaults/defaults.html:48
-#: rhodecode/templates/admin/repos/repo_add_base.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:82
-#: rhodecode/templates/forks/fork.html:69
+#: rhodecode/templates/admin/defaults/defaults.html:47
+#: rhodecode/templates/admin/repos/repo_add_base.html:77
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:82
+#: rhodecode/templates/data_table/_dt_elements.html:70
+msgid "Private repository"
+msgstr "Dépôt privé"
+
+#: rhodecode/templates/admin/defaults/defaults.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:81
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:86
+#: rhodecode/templates/forks/fork.html:75
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
 msgstr "Les dépôts privés sont visibles seulement par les utilisateurs ajoutés comme collaborateurs."
 
-#: rhodecode/templates/admin/defaults/defaults.html:55
-#: rhodecode/templates/admin/repos/repo_edit.html:87
+#: rhodecode/templates/admin/defaults/defaults.html:58
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:91
 msgid "Enable statistics"
 msgstr "Activer les statistiques"
 
-#: rhodecode/templates/admin/defaults/defaults.html:59
-#: rhodecode/templates/admin/repos/repo_edit.html:91
+#: rhodecode/templates/admin/defaults/defaults.html:62
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:95
 msgid "Enable statistics window on summary page."
 msgstr "Afficher les statistiques sur la page du dépôt."
 
-#: rhodecode/templates/admin/defaults/defaults.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:96
+#: rhodecode/templates/admin/defaults/defaults.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:100
 msgid "Enable downloads"
 msgstr "Activer les téléchargements"
 
-#: rhodecode/templates/admin/defaults/defaults.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:100
+#: rhodecode/templates/admin/defaults/defaults.html:72
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:104
 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/defaults/defaults.html:75
-#: rhodecode/templates/admin/repos/repo_edit.html:105
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64
+#: rhodecode/templates/admin/defaults/defaults.html:78
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:34
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:109
 msgid "Enable locking"
 msgstr "Activer le verrouillage"
 
-#: rhodecode/templates/admin/defaults/defaults.html:79
-#: rhodecode/templates/admin/repos/repo_edit.html:109
+#: rhodecode/templates/admin/defaults/defaults.html:82
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:113
 msgid "Enable lock-by-pulling on repository."
 msgstr "Activer le verrouillage lors d’un pull sur le dépôt."
 
-#: rhodecode/templates/admin/defaults/defaults.html:84
-#: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/permissions/permissions.html:122
-#: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos/repo_edit.html:166
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96
-#: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_add.html:94
-#: rhodecode/templates/admin/users/user_edit.html:140
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88
-#: rhodecode/templates/admin/users_groups/users_group_add.html:49
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:143
-#: rhodecode/templates/base/default_perms_box.html:53
-msgid "Save"
-msgstr "Enregistrer"
-
-#: rhodecode/templates/admin/gists/index.html:5
-#: rhodecode/templates/base/base.html:299
-msgid "Gists"
+#: rhodecode/templates/admin/gists/edit.html:5
+#: rhodecode/templates/admin/gists/edit.html:22
+msgid "Edit Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:40
+#, python-format
+msgid ""
+"Gist was update since you started editing. Copy your changes and click "
+"%(here)s to reload new version."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:59
+#: rhodecode/templates/admin/gists/new.html:43
+msgid "Gist description ..."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:61
+#: rhodecode/templates/admin/gists/new.html:45
+msgid "Gist lifetime"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/edit.html:67
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/index.html:62
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/gists/show.html:52
+msgid "Expires"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+msgid "never"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:80
+#: rhodecode/templates/admin/gists/new.html:52
+#: rhodecode/templates/files/files_add.html:59
+#: rhodecode/templates/files/files_edit.html:64
+msgid "plain"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:147
+msgid "Update Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:148
+#: rhodecode/templates/changeset/changeset_file_comment.html:89
+msgid "Cancel"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:6
+#: rhodecode/templates/admin/gists/index.html:19
+#, python-format
+msgid "Private Gists for user %s"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:8
+#: rhodecode/templates/admin/gists/index.html:21
+#, python-format
+msgid "Public Gists for user %s"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:10
-#, python-format
-msgid "Private Gists for user %s"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:12
-#, python-format
-msgid "Public Gists for user %s"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:14
+#: rhodecode/templates/admin/gists/index.html:23
 msgid "Public Gists"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.html:31
-#: rhodecode/templates/admin/gists/show.html:24
-#: rhodecode/templates/base/base.html:302
-msgid "Create new gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:48
+#: rhodecode/templates/admin/gists/index.html:40
+#: rhodecode/templates/admin/gists/show.html:28
+msgid "Create New Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:57
+#: rhodecode/templates/data_table/_dt_elements.html:143
 msgid "Created"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.html:51
-#: rhodecode/templates/admin/gists/index.html:53
-#: rhodecode/templates/admin/gists/show.html:43
-#: rhodecode/templates/admin/gists/show.html:45
-msgid "Expires"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:51
-#: rhodecode/templates/admin/gists/show.html:43
-msgid "never"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:68
+#: rhodecode/templates/admin/gists/index.html:77
 msgid "There are no gists yet"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/new.html:5
-#: rhodecode/templates/admin/gists/new.html:16
-msgid "New gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:37
-msgid "Gist description ..."
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:52
-msgid "Create private gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:53
-msgid "Create public gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:54
-#: rhodecode/templates/admin/permissions/permissions.html:123
-#: rhodecode/templates/admin/permissions/permissions.html:185
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos/repo_edit.html:167
-#: rhodecode/templates/admin/repos/repo_edit.html:381
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97
-#: rhodecode/templates/admin/settings/settings.html:115
-#: rhodecode/templates/admin/settings/settings.html:196
-#: rhodecode/templates/admin/settings/settings.html:288
-#: rhodecode/templates/admin/users/user_edit.html:141
-#: rhodecode/templates/admin/users/user_edit.html:198
-#: rhodecode/templates/admin/users/user_edit.html:246
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:144
-#: rhodecode/templates/base/default_perms_box.html:54
-#: rhodecode/templates/files/files_add.html:80
-#: rhodecode/templates/files/files_edit.html:66
-#: rhodecode/templates/pullrequests/pullrequest.html:86
+#: rhodecode/templates/admin/gists/new.html:22
+msgid "New Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:51
+msgid "name this file..."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:60
+msgid "Create Private Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:61
+msgid "Create Public Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:62
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:70
+#: rhodecode/templates/admin/my_account/my_account_emails.html:46
+#: rhodecode/templates/admin/my_account/my_account_password.html:34
+#: rhodecode/templates/admin/my_account/my_account_profile.html:69
+#: rhodecode/templates/admin/permissions/permissions_globals.html:109
+#: rhodecode/templates/admin/permissions/permissions_ips.html:41
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:115
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:43
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:59
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:102
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:135
+#: rhodecode/templates/admin/settings/settings_global.html:56
+#: rhodecode/templates/admin/settings/settings_license.html:43
+#: rhodecode/templates/admin/settings/settings_vcs.html:81
+#: rhodecode/templates/admin/settings/settings_visual.html:116
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:105
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:70
+#: rhodecode/templates/admin/users/user_edit_emails.html:46
+#: rhodecode/templates/admin/users/user_edit_ips.html:50
+#: rhodecode/templates/admin/users/user_edit_profile.html:123
+#: rhodecode/templates/base/default_perms_box.html:65
+#: rhodecode/templates/files/files_add.html:70
+#: rhodecode/templates/files/files_delete.html:58
+#: rhodecode/templates/files/files_edit.html:73
+#: rhodecode/templates/pullrequests/pullrequest.html:83
 msgid "Reset"
 msgstr "Réinitialiser"
 
 #: rhodecode/templates/admin/gists/show.html:5
-msgid "gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:9
+#: rhodecode/templates/admin/gists/show.html:12
 msgid "Gist"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/show.html:36
-msgid "Public gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:38
-msgid "Private gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:54
-#: rhodecode/templates/admin/repos/repo_edit.html:299
-#: rhodecode/templates/changeset/changeset_file_comment.html:40
+#: rhodecode/templates/admin/gists/show.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:4
+#: rhodecode/templates/email_templates/pull_request.html:4
+#: rhodecode/templates/email_templates/pull_request_comment.html:4
+msgid "URL"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:40
+msgid "Public Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:42
+msgid "Private Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:59
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:80
+#: rhodecode/templates/changeset/changeset_file_comment.html:48
+#: rhodecode/templates/files/files_source.html:39
+#: rhodecode/templates/files/files_source.html:42
+#: rhodecode/templates/files/files_source.html:45
 msgid "Delete"
 msgstr "Supprimer"
 
-#: rhodecode/templates/admin/gists/show.html:54
-msgid "Confirm to delete this gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:63
-#: rhodecode/templates/admin/gists/show.html:84
-#: rhodecode/templates/files/files_edit.html:48
-#: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:55
-msgid "Show as raw"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:71
+#: rhodecode/templates/admin/gists/show.html:59
+msgid "Confirm to delete this Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:66
+#: rhodecode/templates/changeset/changeset_file_comment.html:81
+#: rhodecode/templates/changeset/changeset_file_comment.html:190
+#: rhodecode/templates/data_table/_dt_elements.html:167
+#: rhodecode/templates/data_table/_dt_elements.html:183
+#: rhodecode/templates/files/files_source.html:41
+#: rhodecode/templates/files/files_source.html:44
+msgid "Edit"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:68
+#: rhodecode/templates/files/files_edit.html:54
+#: rhodecode/templates/files/files_source.html:34
+msgid "Show as Raw"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:76
 msgid "created"
 msgstr ""
 
-#: rhodecode/templates/admin/ldap/ldap.html:5
-msgid "LDAP administration"
-msgstr "Administration LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:11
-#: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:79
-msgid "LDAP"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:28
-msgid "Connection settings"
-msgstr "Options de connexion"
-
-#: rhodecode/templates/admin/ldap/ldap.html:30
-msgid "Enable LDAP"
-msgstr "Activer le LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:34
-msgid "Host"
-msgstr "Serveur"
-
-#: rhodecode/templates/admin/ldap/ldap.html:38
-msgid "Port"
-msgstr "Port"
-
-#: rhodecode/templates/admin/ldap/ldap.html:42
-msgid "Account"
-msgstr "Compte"
-
-#: rhodecode/templates/admin/ldap/ldap.html:50
-msgid "Connection security"
-msgstr "Connexion sécurisée"
-
-#: rhodecode/templates/admin/ldap/ldap.html:54
-msgid "Certificate Checks"
-msgstr "Vérif. des certificats"
-
-#: rhodecode/templates/admin/ldap/ldap.html:57
-msgid "Search settings"
-msgstr "Réglages de recherche"
-
-#: rhodecode/templates/admin/ldap/ldap.html:59
-msgid "Base DN"
-msgstr "Base de recherche"
-
-#: rhodecode/templates/admin/ldap/ldap.html:63
-msgid "LDAP Filter"
-msgstr "Filtre de recherche"
-
-#: rhodecode/templates/admin/ldap/ldap.html:67
-msgid "LDAP Search Scope"
-msgstr "Portée de recherche"
-
-#: rhodecode/templates/admin/ldap/ldap.html:70
-msgid "Attribute mappings"
-msgstr "Correspondance des attributs"
-
-#: rhodecode/templates/admin/ldap/ldap.html:72
-msgid "Login Attribute"
-msgstr "Attribut pour le nom d’utilisateur"
-
-#: rhodecode/templates/admin/ldap/ldap.html:76
-msgid "First Name Attribute"
-msgstr "Attribut pour le prénom"
-
-#: rhodecode/templates/admin/ldap/ldap.html:80
-msgid "Last Name Attribute"
-msgstr "Attribut pour le nom de famille"
-
-#: rhodecode/templates/admin/ldap/ldap.html:84
-msgid "E-mail Attribute"
-msgstr "Attribut pour l’e-mail"
+#: rhodecode/templates/admin/gists/show.html:89
+#: rhodecode/templates/files/files_source.html:71
+msgid "Show as raw"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:5
+#: rhodecode/templates/base/base.html:282
+msgid "My account"
+msgstr "Mon compte"
+
+#: rhodecode/templates/admin/my_account/my_account.html:12
+msgid "My Account"
+msgstr "Mon compte"
+
+#: rhodecode/templates/admin/my_account/my_account.html:38
+#: rhodecode/templates/admin/users/user_edit.html:42
+msgid "Profile"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:40
+#: rhodecode/templates/admin/users/user_edit.html:43
+msgid "API keys"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:41
+msgid "My Emails"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:42
+msgid "My Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:43
+#: rhodecode/templates/journal/journal.html:54
+msgid "Watched"
+msgstr "Surveillé"
+
+#: rhodecode/templates/admin/my_account/my_account.html:44
+msgid "Pull requests"
+msgstr "Requêtes de pull"
+
+#: rhodecode/templates/admin/my_account/my_account.html:45
+msgid "My permissions"
+msgstr "Mes permissions"
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:6
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:6
+msgid "Built-in"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:32
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:32
+msgid "expires"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:14
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:14
+#, python-format
+msgid "Confirm to reset this api key: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:15
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:15
+msgid "reset"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:30
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:30
+msgid "expired"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:40
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:40
+#, python-format
+msgid "Confirm to remove this api key: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:42
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:42
+msgid "remove"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:49
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:49
+msgid "No additional api keys specified"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:61
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:61
+msgid "New api key"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:69
+#: rhodecode/templates/admin/my_account/my_account_emails.html:45
+#: rhodecode/templates/admin/permissions/permissions_ips.html:40
+#: rhodecode/templates/admin/repos/repo_add_base.html:85
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:58
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:69
+#: rhodecode/templates/admin/users/user_edit_emails.html:45
+#: rhodecode/templates/admin/users/user_edit_ips.html:49
+msgid "Add"
+msgstr "Ajouter"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:7
+#: rhodecode/templates/admin/users/user_edit_emails.html:7
+msgid "Primary"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:19
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:24
+#: rhodecode/templates/admin/permissions/permissions_ips.html:14
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:18
+#: rhodecode/templates/admin/settings/settings_hooks.html:36
+#: rhodecode/templates/admin/users/user_edit_emails.html:19
+#: rhodecode/templates/admin/users/user_edit_ips.html:22
+#: rhodecode/templates/data_table/_dt_elements.html:131
+#: rhodecode/templates/data_table/_dt_elements.html:159
+#: rhodecode/templates/data_table/_dt_elements.html:175
+#: rhodecode/templates/data_table/_dt_elements.html:191
+msgid "delete"
+msgstr "Supprimer"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:20
+#: rhodecode/templates/admin/users/user_edit_emails.html:20
+#, python-format
+msgid "Confirm to delete this email: %s"
+msgstr "Veuillez confirmer la suppression de l’e-mail : %s"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:26
+#: rhodecode/templates/admin/users/user_edit_emails.html:26
+msgid "No additional emails specified"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:38
+#: rhodecode/templates/admin/users/user_edit_emails.html:38
+msgid "New email address"
+msgstr "Nouvelle adrese"
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:1
+msgid "Change your account password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:7
+msgid "Current password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:16
+#: rhodecode/templates/admin/users/user_edit_profile.html:69
+msgid "New password"
+msgstr "Nouveau mot de passe"
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:25
+msgid "Confirm new password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:9
+msgid "Change your avatar at"
+msgstr "Vous pouvez changer votre avatar sur"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:10
+#: rhodecode/templates/admin/users/user_edit_profile.html:9
+msgid "Using"
+msgstr "en utilisant l’adresse"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:11
+msgid "Avatars are disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:13
+msgid "Missing email, please update your user email address."
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:14
+#: rhodecode/templates/admin/users/user_edit_profile.html:15
+msgid "current IP"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:26
+msgid ""
+"Your user is in an external Source of Record; some details cannot be managed"
+" here"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:2
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:4
+msgid "Show closed pull requests"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:6
+msgid "Opened by me"
+msgstr "Ouvertes par moi"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:15
+#, python-format
+msgid "Pull request #%s opened on %s"
+msgstr "Requête de pull nº%s ouverte le %s"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:17
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:47
+#: rhodecode/templates/pullrequests/pullrequest_data.html:11
+#: rhodecode/templates/pullrequests/pullrequest_show.html:30
+#: rhodecode/templates/pullrequests/pullrequest_show.html:45
+msgid "Closed"
+msgstr "Fermée"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:25
+msgid "Confirm to delete this pull request"
+msgstr "Veuillez confirmer la suppression de cette requête de pull."
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:32
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:53
+msgid "Nothing here yet"
+msgstr "Rien ici pour le moment"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:36
+msgid "I participate in"
+msgstr "Je participe à"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:44
+#: rhodecode/templates/pullrequests/pullrequest_data.html:8
+#, python-format
+msgid "Pull request #%s opened by %s on %s"
+msgstr "Requête de pull nº%s ouverte par %s le %s"
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:1
+msgid "Repositories you are owner of"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:59
+#: rhodecode/templates/admin/my_account/my_account_watched.html:59
+#: rhodecode/templates/base/root.html:71
+#: rhodecode/templates/bookmarks/bookmarks.html:83
+#: rhodecode/templates/branches/branches.html:82
+#: rhodecode/templates/journal/journal.html:210
+#: rhodecode/templates/journal/journal.html:301
+#: rhodecode/templates/tags/tags.html:83
+msgid "No records found."
+msgstr "Aucun élément n’a été trouvé."
+
+#: rhodecode/templates/admin/my_account/my_account_watched.html:1
+msgid "Repositories you are watching"
+msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:5
-#: rhodecode/templates/admin/notifications/notifications.html:9
+#: rhodecode/templates/admin/notifications/notifications.html:12
 msgid "My Notifications"
 msgstr "Mes notifications"
 
-#: rhodecode/templates/admin/notifications/notifications.html:29
+#: rhodecode/templates/admin/notifications/notifications.html:32
 msgid "All"
 msgstr "Tous"
 
-#: rhodecode/templates/admin/notifications/notifications.html:30
+#: rhodecode/templates/admin/notifications/notifications.html:33
 msgid "Comments"
 msgstr "Commentaires"
 
-#: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
-msgid "Pull requests"
-msgstr "Requêtes de pull"
-
-#: rhodecode/templates/admin/notifications/notifications.html:35
+#: rhodecode/templates/admin/notifications/notifications.html:34
+#: rhodecode/templates/base/base.html:193
+msgid "Pull Requests"
+msgstr ""
+
+#: rhodecode/templates/admin/notifications/notifications.html:38
 msgid "Mark all read"
 msgstr "Tout marquer comme lu"
 
-#: rhodecode/templates/admin/notifications/notifications_data.html:39
+#: rhodecode/templates/admin/notifications/notifications_data.html:40
 msgid "No notifications here yet"
 msgstr "Aucune notification pour le moment."
 
 #: rhodecode/templates/admin/notifications/show_notification.html:5
-#: rhodecode/templates/admin/notifications/show_notification.html:11
+#: rhodecode/templates/admin/notifications/show_notification.html:14
 msgid "Show notification"
 msgstr "Notification"
 
-#: rhodecode/templates/admin/notifications/show_notification.html:9
-#: rhodecode/templates/base/base.html:253
+#: rhodecode/templates/admin/notifications/show_notification.html:12
+#: rhodecode/templates/base/base.html:281
 msgid "Notifications"
 msgstr "Notifications"
 
@@ -2244,1443 +2900,1792 @@
 msgid "Permissions administration"
 msgstr "Gestion des permissions"
 
-#: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:151
-#: rhodecode/templates/admin/repos/repo_edit.html:158
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88
-#: rhodecode/templates/admin/users/user_edit.html:150
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:129
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/base/base.html:78
+#: rhodecode/templates/admin/permissions/permissions.html:14
+#: rhodecode/templates/admin/permissions/permissions.html:37
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:55
+#: rhodecode/templates/admin/repos/repo_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:45
+#: rhodecode/templates/base/base.html:74
 msgid "Permissions"
 msgstr "Permissions"
 
-#: rhodecode/templates/admin/permissions/permissions.html:24
-msgid "Default permissions"
-msgstr "Permissions par défaut"
-
-#: rhodecode/templates/admin/permissions/permissions.html:31
+#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/settings/settings.html:42
+msgid "Global"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:42
+msgid "IP whitelist"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:43
+msgid "Overview"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:7
 msgid "Anonymous access"
 msgstr "Accès anonyme"
 
-#: rhodecode/templates/admin/permissions/permissions.html:49
+#: rhodecode/templates/admin/permissions/permissions_globals.html:13
+#, python-format
+msgid ""
+"Allow access to RhodeCode without need to log in. Anonymous users use %s "
+"user permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:26
 msgid ""
 "All default permissions on each repository will be reset to chosen "
 "permission, note that all custom default permission on repositories will be "
 "lost"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:50
-#: rhodecode/templates/admin/permissions/permissions.html:63
-#: rhodecode/templates/admin/permissions/permissions.html:77
+#: rhodecode/templates/admin/permissions/permissions_globals.html:27
+#: rhodecode/templates/admin/permissions/permissions_globals.html:40
+#: rhodecode/templates/admin/permissions/permissions_globals.html:54
 msgid "Overwrite existing settings"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:62
+#: rhodecode/templates/admin/permissions/permissions_globals.html:32
+#: rhodecode/templates/admin/repos/repo_add_base.html:41
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:42
+#: rhodecode/templates/data_table/_dt_elements.html:204
+#: rhodecode/templates/forks/fork.html:51
+msgid "Repository group"
+msgstr "Groupe de dépôt"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:39
 msgid ""
 "All default permissions on each repository group will be reset to chosen "
 "permission, note that all custom default permission on repository groups "
 "will be lost"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:69
+#: rhodecode/templates/admin/permissions/permissions_globals.html:46
+#: rhodecode/templates/data_table/_dt_elements.html:211
 msgid "User group"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:76
+#: rhodecode/templates/admin/permissions/permissions_globals.html:53
 msgid ""
 "All default permissions on each user group will be reset to chosen "
 "permission, note that all custom default permission on repository groups "
 "will be lost"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:83
+#: rhodecode/templates/admin/permissions/permissions_globals.html:60
 msgid "Repository creation"
 msgstr "Création de dépôt"
 
-#: rhodecode/templates/admin/permissions/permissions.html:91
+#: rhodecode/templates/admin/permissions/permissions_globals.html:68
+msgid "Repository creation with group write access"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:72
+msgid ""
+"Write permission to repository groups allows creating repositories inside "
+"that group"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:77
 msgid "User group creation"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:99
+#: rhodecode/templates/admin/permissions/permissions_globals.html:85
 msgid "Repository forking"
 msgstr "Fork de dépôt"
 
-#: rhodecode/templates/admin/permissions/permissions.html:107
+#: rhodecode/templates/admin/permissions/permissions_globals.html:93
 msgid "Registration"
 msgstr "Enregistrement"
 
-#: rhodecode/templates/admin/permissions/permissions.html:115
+#: rhodecode/templates/admin/permissions/permissions_globals.html:101
 msgid "External auth account activation"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:133
-msgid "Default User Permissions"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:144
-#: rhodecode/templates/admin/users/user_edit.html:207
-msgid "Allowed IP addresses"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:158
-#: rhodecode/templates/admin/repos/repo_edit.html:340
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
-#: rhodecode/templates/admin/users/user_edit.html:175
-#: rhodecode/templates/admin/users/user_edit.html:220
-#: rhodecode/templates/admin/users_groups/users_groups.html:54
-#: rhodecode/templates/data_table/_dt_elements.html:122
-#: rhodecode/templates/data_table/_dt_elements.html:136
-msgid "delete"
-msgstr "Supprimer"
-
-#: rhodecode/templates/admin/permissions/permissions.html:159
-#: rhodecode/templates/admin/users/user_edit.html:221
+#: rhodecode/templates/admin/permissions/permissions_ips.html:1
+msgid "Default ip whitelist for all users"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_ips.html:15
+#: rhodecode/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:165
-#: rhodecode/templates/admin/users/user_edit.html:227
+#: rhodecode/templates/admin/permissions/permissions_ips.html:21
+#: rhodecode/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:176
-#: rhodecode/templates/admin/users/user_edit.html:238
+#: rhodecode/templates/admin/permissions/permissions_ips.html:32
+#: rhodecode/templates/admin/users/user_edit_ips.html:42
 msgid "New ip address"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:184
-#: rhodecode/templates/admin/repos/repo_add_base.html:73
-#: rhodecode/templates/admin/repos/repo_edit.html:380
-#: rhodecode/templates/admin/users/user_edit.html:197
-#: rhodecode/templates/admin/users/user_edit.html:245
-msgid "Add"
-msgstr "Ajouter"
-
-#: rhodecode/templates/admin/repos/repo_add.html:12
-#: rhodecode/templates/admin/repos/repo_add.html:16
-#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88
-#: rhodecode/templates/base/base.html:116
-#: rhodecode/templates/base/base.html:275
-msgid "Repositories"
-msgstr "Dépôts"
-
-#: rhodecode/templates/admin/repos/repo_add.html:19
-msgid "Add new"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:96
-#: rhodecode/templates/summary/summary.html:97
-msgid "Clone from"
-msgstr "Cloner depuis"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:24
-#: rhodecode/templates/admin/repos/repo_edit.html:45
-msgid "Optional http[s] url from which repository should be cloned."
-msgstr "URL http(s) depuis laquelle le dépôt doit être cloné."
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:33
-#: rhodecode/templates/forks/fork.html:51
-msgid "Optionaly select a group to put this repository into."
-msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt."
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:42
-msgid "Type of repository to create."
-msgstr "Type de dépôt à créer."
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:47
-#: rhodecode/templates/admin/repos/repo_edit.html:59
-#: rhodecode/templates/forks/fork.html:38
-msgid "Landing revision"
-msgstr "Révision d’arrivée"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:51
-#: rhodecode/templates/admin/repos/repo_edit.html:63
-#: rhodecode/templates/forks/fork.html:42
-msgid "Default revision for files page, downloads, whoosh and readme"
-msgstr "Révision par défaut pour les pages de fichiers, de téléchargements, de recherche et de documentation."
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:60
-#: rhodecode/templates/admin/repos/repo_edit.html:72
-#: rhodecode/templates/forks/fork.html:60
-msgid ""
-"Keep it short and to the point. Use a README file for longer descriptions."
-msgstr "Gardez cette description précise et concise. Utilisez un fichier README pour des descriptions plus détaillées."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:8
-msgid "Edit repository"
-msgstr "Éditer le dépôt"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:12
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:11
-#: rhodecode/templates/base/base.html:81
-#: rhodecode/templates/base/base.html:134
-#: rhodecode/templates/summary/summary.html:212
+#: rhodecode/templates/admin/permissions/permissions_perms.html:1
+msgid "Default user permissions overview"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:5
+msgid "Add repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:14
+#: rhodecode/templates/base/base.html:71 rhodecode/templates/base/base.html:90
+msgid "Repository groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:36
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:8
+#: rhodecode/templates/admin/user_groups/user_group_add.html:35
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:7
+msgid "Group name"
+msgstr "Nom de groupe"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:54
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:26
+msgid "Group parent"
+msgstr "Parent du groupe"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:63
+#: rhodecode/templates/admin/repos/repo_add_base.html:50
+msgid "Copy parent group permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:67
+#: rhodecode/templates/admin/repos/repo_add_base.html:54
+msgid "Copy permission set from parent repository group."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:5
+#, python-format
+msgid "%s Repository group settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:105
+msgid "Repository Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:24
+msgid "Add Child Group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:53
+#: rhodecode/templates/admin/repos/repo_edit.html:15
+#: rhodecode/templates/admin/repos/repo_edit.html:43
+#: rhodecode/templates/admin/settings/settings.html:14
+#: rhodecode/templates/admin/settings/settings.html:36
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:42
+#: rhodecode/templates/base/base.html:77
+#: rhodecode/templates/base/base.html:159
 msgid "Settings"
 msgstr "Options"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:36
-msgid "Non-changeable id"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:41
-msgid "Clone uri"
-msgstr "URL de clone"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:54
-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:119
-msgid "Change owner of this repository."
-msgstr "Changer le propriétaire de ce dépôt."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:177
-msgid "Advanced settings"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:180
-msgid "Statistics"
-msgstr "Statistiques"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Reset current statistics"
-msgstr "Réinitialiser les statistiques"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:184
-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:187
-msgid "Fetched to rev"
-msgstr "Parcouru jusqu’à la révision"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:188
-msgid "Stats gathered"
-msgstr "Statistiques obtenues"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:196
-msgid "Remote"
-msgstr "Dépôt distant"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:200
-msgid "Pull changes from remote location"
-msgstr "Récupérer les changements depuis le site distant"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:200
-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:211
-msgid "Cache"
-msgstr "Cache"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:215
-msgid "Invalidate repository cache"
-msgstr "Invalider le cache du dépôt"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:215
-msgid "Confirm to invalidate repository cache"
-msgstr "Voulez-vous vraiment invalider le cache du dépôt ?"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:218
-msgid ""
-"Manually invalidate cache for this repository. On first access repository "
-"will be cached again"
-msgstr "Invalide manuellement le cache de ce dépôt. Au prochain accès sur ce dépôt, il sera à nouveau mis en cache."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:223
-msgid "List of cached values"
-msgstr "Liste des valeurs en cache"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:226
-msgid "Prefix"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:227
-msgid "Key"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:228
-#: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:124
-#: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/admin/users_groups/users_group_add.html:41
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-#: rhodecode/templates/admin/users_groups/users_groups.html:39
-msgid "Active"
-msgstr "Actif"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:243
-#: rhodecode/templates/base/base.html:292
-#: rhodecode/templates/base/base.html:293
-msgid "Public journal"
-msgstr "Journal public"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:249
-msgid "Remove from public journal"
-msgstr "Supprimer du journal public"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:251
-msgid "Add to public journal"
-msgstr "Ajouter le dépôt au journal public"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:256
-msgid ""
-"All actions made on this repository will be accessible to everyone in public"
-" journal"
-msgstr "Le descriptif des actions réalisées sur ce dépôt sera visible à tous depuis le journal public."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:263
-msgid "Locking"
-msgstr "Verrouillage"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
-msgid "Unlock locked repo"
-msgstr "Déverrouiller le dépôt"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
-msgid "Confirm to unlock repository"
-msgstr "Veuillez confirmer le déverrouillage de ce dépôt."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:271
-msgid "Lock repo"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:271
-msgid "Confirm to lock repository"
-msgstr "Veuillez confirmer le verrouillage de ce dépôt."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:272
-msgid "Repository is not locked"
-msgstr "Ce dépôt n’est pas verrouillé."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:277
-msgid ""
-"Force locking on repository. Works only when anonymous access is disabled"
-msgstr "Forcer le verrouillage du dépôt. Ce réglage fonctionne uniquement quand l‘accès anonyme est désactivé."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:284
-msgid "Set as fork of"
-msgstr "Indiquer comme fork"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:289
-msgid "Set"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:293
-msgid "Manually set this repository as a fork of another from the list"
-msgstr "Marquer ce dépôt comme fork d’un autre dépôt de la liste."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:308
-msgid "Remove this repository"
-msgstr "Supprimer ce dépôt"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:308
-msgid "Confirm to delete this repository"
-msgstr "Voulez-vous vraiment supprimer ce dépôt ?"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:310
-#, python-format
-msgid "this repository has %s fork"
-msgid_plural "this repository has %s forks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:311
-msgid "Detach forks"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:312
-msgid "Delete forks"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:315
-msgid ""
-"This repository will be renamed in a special way in order to be unaccesible "
-"for RhodeCode and VCS systems. If you need to fully delete it from file "
-"system please do it manually"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:329
-msgid "Extra fields"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:341
-#, python-format
-msgid "Confirm to delete this field: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:355
-msgid "New field key"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:363
-msgid "New field label"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:366
-msgid "Enter short label"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:372
-msgid "New field description"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:375
-msgid "Enter description of a field"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:3
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3
-msgid "none"
-msgstr "Aucune"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:4
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4
-msgid "read"
-msgstr "Lecture"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:5
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5
-msgid "write"
-msgstr "Écriture"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:6
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6
-msgid "admin"
-msgstr "Administration"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:7
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7
-msgid "member"
-msgstr "Membre"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-msgid "private repository"
-msgstr "Dépôt privé"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:19
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:28
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35
-msgid "default"
-msgstr "[Par défaut]"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:33
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:58
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:55
-msgid "revoke"
-msgstr "Révoquer"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:83
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81
-msgid "Add another member"
-msgstr "Ajouter un utilisateur"
-
-#: rhodecode/templates/admin/repos/repos.html:5
-msgid "Repositories administration"
-msgstr "Administration des dépôts"
-
-#: rhodecode/templates/admin/repos/repos.html:88
-#: rhodecode/templates/admin/users/user_edit_my_account.html:185
-#: rhodecode/templates/admin/users/users.html:109
-#: rhodecode/templates/bookmarks/bookmarks.html:76
-#: rhodecode/templates/branches/branches.html:75
-#: rhodecode/templates/journal/journal.html:206
-#: rhodecode/templates/journal/journal.html:296
-#: rhodecode/templates/tags/tags.html:76
-msgid "No records found."
-msgstr "Aucun élément n’a été trouvé."
-
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
-msgid "apply to children"
-msgstr "Appliquer aux enfants"
-
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88
-msgid ""
-"Set or revoke permission to all children of that group, including non-"
-"private repositories and other groups"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
-#, python-format
-msgid "%s Group Dashboard"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:9
-msgid "Home"
-msgstr "Accueil"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:13
-msgid "with"
-msgstr "comprenant"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
-msgid "Add repository group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16
-#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91
-msgid "Repository groups"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13
-msgid "Add new repository group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56
-msgid "Group parent"
-msgstr "Parent du groupe"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59
-msgid "save"
-msgstr "Enregistrer"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
-msgid "Edit repository group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13
-#, python-format
-msgid "Edit repository group %s"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27
-msgid "Add child group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68
-msgid ""
-"Enable lock-by-pulling on group. This option will be applied to all other "
-"groups and repositories inside"
-msgstr "Activer le verrou lors d’un pull sur le groupe. Cette option sera appliquée à tous les sous-groupes et dépôts de ce groupe."
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
-msgid "Repository groups administration"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45
-msgid "Number of toplevel repositories"
-msgstr "Nombre de sous-dépôts"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64
-#: rhodecode/templates/admin/users_groups/users_groups.html:48
-#: rhodecode/templates/changeset/changeset_file_comment.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:171
-msgid "Edit"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65
-#: rhodecode/templates/admin/users_groups/users_groups.html:49
-#: rhodecode/templates/base/perms_summary.html:29
-#: rhodecode/templates/base/perms_summary.html:60
-#: rhodecode/templates/base/perms_summary.html:62
-#: rhodecode/templates/data_table/_dt_elements.html:116
-#: rhodecode/templates/data_table/_dt_elements.html:117
-#: rhodecode/templates/data_table/_dt_elements.html:130
-#: rhodecode/templates/data_table/_dt_elements.html:131
-msgid "edit"
-msgstr "éditer"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:54
+#: rhodecode/templates/admin/repos/repo_edit.html:49
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:43
+#: rhodecode/templates/admin/users/user_edit.html:44
+msgid "Advanced"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:1
+#, python-format
+msgid "Repository Group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:6
+msgid "Top level repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:7
+msgid "Total repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:8
+msgid "Children groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_advanced.html:8
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+msgid "Created on"
+msgstr "Créé le"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:192
 #, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78
-msgid "There are no repository groups yet"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/hooks.html:5
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:25
+msgid "Delete this repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:7
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:8
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:7
+#: rhodecode/templates/base/perms_summary.html:14
+msgid "none"
+msgstr "Aucune"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:8
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:8
+#: rhodecode/templates/base/perms_summary.html:15
+msgid "read"
+msgstr "Lecture"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:9
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:10
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:9
+#: rhodecode/templates/base/perms_summary.html:16
+msgid "write"
+msgstr "Écriture"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:10
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:10
+#: rhodecode/templates/base/perms_summary.html:17
+msgid "admin"
+msgstr "Administration"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:11
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:12
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:11
+msgid "user/user group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:28
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:45
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:24
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:37
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:28
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:45
+msgid "default"
+msgstr "[Par défaut]"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:34
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:71
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:43
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:68
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:34
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:71
+msgid "revoke"
+msgstr "Révoquer"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:47
+msgid "delegated admin"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:97
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:94
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:97
+msgid "Add new"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:103
+msgid "apply to children"
+msgstr "Appliquer aux enfants"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:107
+msgid "Both"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:108
+msgid ""
+"Set or revoke permission to all children of that group, including non-"
+"private repositories and other groups if selected."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:38
+msgid ""
+"Enable lock-by-pulling on group. This option will be applied to all other "
+"groups and repositories inside"
+msgstr "Activer le verrou lors d’un pull sur le groupe. Cette option sera appliquée à tous les sous-groupes et dépôts de ce groupe."
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:4
+#, python-format
+msgid "%s Repository group dashboard"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:12
+msgid "Home"
+msgstr "Accueil"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:16
+msgid "with"
+msgstr "comprenant"
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:5
+msgid "Repository groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+msgid "repository groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:52
+msgid "Number of toplevel repositories"
+msgstr "Nombre de sous-dépôts"
+
+#: rhodecode/templates/admin/repos/repo_add.html:5
+msgid "Add repository"
+msgstr "Ajouter un dépôt"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:14
+msgid "Import existing repository ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:23
+#: rhodecode/templates/summary/summary.html:32
+msgid "Clone from"
+msgstr "Cloner depuis"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:27
+msgid "Optional http[s] url from which repository should be cloned."
+msgstr "URL http(s) depuis laquelle le dépôt doit être cloné."
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:36
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:76
+#: rhodecode/templates/forks/fork.html:45
+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:45
+#: rhodecode/templates/forks/fork.html:55
+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:63
+msgid "Type of repository to create."
+msgstr "Type de dépôt à créer."
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:51
+#: rhodecode/templates/forks/fork.html:61
+msgid "Landing revision"
+msgstr "Révision d’arrivée"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:72
+msgid ""
+"Default revision for files page, downloads, full text search index and "
+"readme generation"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:9
+#, python-format
+msgid "%s Creating repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:16
+msgid "Creating repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:30
+#, python-format
+msgid ""
+"Repository \"%(repo_name)s\" is beeing created, you will be redirected when "
+"this process is finished.repo_name"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:42
+msgid ""
+"We're sorry but error occured during this operation. Please check your "
+"RhodeCode server logs, or contact administrator."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:8
+#, python-format
+msgid "%s repository settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:52
+msgid "Extra fields"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:55
+msgid "Caches"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:58
+msgid "Remote"
+msgstr "Dépôt distant"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:61
+#: rhodecode/templates/summary/statistics.html:11
+#: rhodecode/templates/summary/summary.html:178
+#: rhodecode/templates/summary/summary.html:179
+msgid "Statistics"
+msgstr "Statistiques"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:1
+#: rhodecode/templates/summary/summary.html:25
+msgid "Fork of"
+msgstr "Fork de"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:6
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:5
+msgid "Set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:10
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:9
+msgid "Manually set this repository as a fork of another from the list"
+msgstr "Marquer ce dépôt comme fork d’un autre dépôt de la liste."
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:24
+msgid "Public journal visibility"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:32
+msgid "Remove from public journal"
+msgstr "Supprimer du journal public"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:37
+msgid "Add to public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:43
+msgid ""
+"All actions made on this repository will be accessible to everyone in public"
+" journal"
+msgstr "Le descriptif des actions réalisées sur ce dépôt sera visible à tous depuis le journal public."
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:49
+msgid "Change locking"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:56
+msgid "Confirm to unlock repository"
+msgstr "Veuillez confirmer le déverrouillage de ce dépôt."
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:58
+msgid "Unlock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:64
+msgid "Confirm to lock repository"
+msgstr "Veuillez confirmer le verrouillage de ce dépôt."
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:66
+msgid "Lock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:68
+msgid "Repository is not locked"
+msgstr "Ce dépôt n’est pas verrouillé."
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:73
+msgid ""
+"Force locking on repository. Works only when anonymous access is disabled. "
+"Trigering a pull locks repository by user who pulled, only the same user can"
+" unlock by doing a push"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:83
+#: rhodecode/templates/data_table/_dt_elements.html:132
+#, python-format
+msgid "Confirm to delete this repository: %s"
+msgstr "Voulez-vous vraiment supprimer le dépôt %s ?"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:85
+msgid "Delete this repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:88
+#, python-format
+msgid "this repository has %s fork"
+msgid_plural "this repository has %s forks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:89
+msgid "Detach forks"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:90
+msgid "Delete forks"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:94
+msgid ""
+"This repository will be renamed in a special way in order to be unaccesible "
+"for RhodeCode and VCS systems. If you need to fully delete it from file "
+"system please do it manually"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Invalidate repository cache"
+msgstr "Invalider le cache du dépôt"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Confirm to invalidate repository cache"
+msgstr "Voulez-vous vraiment invalider le cache du dépôt ?"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:7
+msgid ""
+"Manually invalidate cache for this repository. On first access repository "
+"will be cached again"
+msgstr "Invalide manuellement le cache de ce dépôt. Au prochain accès sur ce dépôt, il sera à nouveau mis en cache."
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:12
+msgid "List of cached values"
+msgstr "Liste des valeurs en cache"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:15
+msgid "Prefix"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:16
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:6
+msgid "Key"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:17
+#: rhodecode/templates/admin/user_groups/user_group_add.html:52
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:24
+#: rhodecode/templates/admin/user_groups/user_groups.html:53
+#: rhodecode/templates/admin/users/user_add.html:91
+#: rhodecode/templates/admin/users/user_edit_profile.html:105
+#: rhodecode/templates/admin/users/users.html:57
+msgid "Active"
+msgstr "Actif"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:5
+msgid "Label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:19
+#, python-format
+msgid "Confirm to delete this field: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:33
+msgid "New field key"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:41
+msgid "New field label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:44
+msgid "Enter short label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:50
+msgid "New field description"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:53
+msgid "Enter description of a field"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:66
+msgid "Extra fields are disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:21
+msgid "private repository"
+msgstr "Dépôt privé"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:3
+msgid "Remote url"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+msgid "Pull changes from remote location"
+msgstr "Récupérer les changements depuis le site distant"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+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_remote.html:14
+msgid "This repository does not have any remote url set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "Non-changeable id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "what is that ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:13
+msgid "URL by id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:14
+msgid ""
+"In case this repository is renamed or moved into another group the repository url changes.\n"
+"                               Using above url guarantees that this repository will allways be accessible under such url.\n"
+"                               Usefull for CI systems, or any other cases that you need to hardcode the url into 3rd party service."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:21
+msgid "Clone uri"
+msgstr "URL de clone"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:27
+#: rhodecode/templates/base/perms_summary.html:43
+#: rhodecode/templates/base/perms_summary.html:79
+#: rhodecode/templates/base/perms_summary.html:81
+#: rhodecode/templates/data_table/_dt_elements.html:124
+#: rhodecode/templates/data_table/_dt_elements.html:125
+#: rhodecode/templates/data_table/_dt_elements.html:152
+#: rhodecode/templates/data_table/_dt_elements.html:153
+#: rhodecode/templates/data_table/_dt_elements.html:169
+#: rhodecode/templates/data_table/_dt_elements.html:185
+msgid "edit"
+msgstr "éditer"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:30
+msgid "new value"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:37
+msgid "http[s] url used for doing remote pulls."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:46
+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_settings.html:55
+#: rhodecode/templates/forks/fork.html:65
+msgid "Default revision for files page, downloads, whoosh and readme"
+msgstr "Révision par défaut pour les pages de fichiers, de téléchargements, de recherche et de documentation."
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:65
+msgid "Change owner of this repository."
+msgstr "Changer le propriétaire de ce dépôt."
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:6
+msgid "Processed commits"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:7
+msgid "Processed progress"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Reset statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Confirm to remove current statistics"
+msgstr "Souhaitez-vous vraiment réinitialiser les statistiques de ce dépôt ?"
+
+#: rhodecode/templates/admin/repos/repos.html:5
+msgid "Repositories administration"
+msgstr "Administration des dépôts"
+
+#: rhodecode/templates/admin/repos/repos.html:54
+msgid "State"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings.html:5
 msgid "Settings administration"
 msgstr "Administration générale"
 
-#: rhodecode/templates/admin/settings/hooks.html:24
-msgid "Built in hooks - read only"
-msgstr "Hooks prédéfinis (lecture seule)"
-
-#: rhodecode/templates/admin/settings/hooks.html:40
-msgid "Custom hooks"
-msgstr "Hooks personnalisés"
-
-#: rhodecode/templates/admin/settings/hooks.html:56
-msgid "remove"
-msgstr "Enlever"
-
-#: rhodecode/templates/admin/settings/hooks.html:88
-msgid "Failed to remove hook"
-msgstr "Erreur lors de la suppression du hook."
-
-#: rhodecode/templates/admin/settings/settings.html:26
-msgid "Remap and rescan repositories"
-msgstr "Ré-associer et re-scanner les dépôts"
-
-#: rhodecode/templates/admin/settings/settings.html:34
-msgid "Rescan option"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:40
-msgid ""
-"In case a repository was deleted from filesystem and there are leftovers in "
-"the database check this option to scan obsolete data in database and remove "
-"it."
-msgstr "Cochez cette option pour supprimer d’éventuelles données obsolètes (concernant des dépôts manuellement supprimés) de la base de données."
+msgid "VCS"
+msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:41
-msgid "Destroy old data"
+msgid "Remap and rescan"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:43
-msgid ""
-"Rescan repositories location for new repositories. Also deletes obsolete if "
-"`destroy` flag is checked "
-msgstr "Rescanner le dossier contenant les dépôts pour en trouver de nouveaux. Supprime égalements les entrées de dépôts obsolètes si « Supprimer les données obsolètes » est coché."
+msgid "Visual"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:45
+#: rhodecode/templates/admin/settings/settings_vcs.html:19
+msgid "Hooks"
+msgstr "Hooks"
+
+#: rhodecode/templates/admin/settings/settings.html:46
+msgid "Full text search"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:47
+msgid "System Info"
+msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:48
-msgid "Rescan repositories"
-msgstr "Re-scanner les dépôts"
-
-#: rhodecode/templates/admin/settings/settings.html:54
-msgid "Whoosh indexing"
-msgstr "Indexation Whoosh"
-
-#: rhodecode/templates/admin/settings/settings.html:62
-msgid "Index build option"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:67
-msgid "Build from scratch"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:73
-msgid "Reindex"
-msgstr "Mettre à jour l’index"
-
-#: rhodecode/templates/admin/settings/settings.html:79
-msgid "Global application settings"
-msgstr "Réglages d’application globaux"
-
-#: rhodecode/templates/admin/settings/settings.html:88
+msgid "License"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:4
+msgid "Email prefix"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:5
+msgid "RhodeCode email from"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:6
+msgid "Error email from"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:7
+msgid "Error email recipients"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:9
+msgid "SMTP server"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:10
+msgid "SMTP username"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:11
+msgid "SMTP password"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:12
+msgid "SMTP port"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:14
+msgid "SMTP use TLS"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:15
+msgid "SMTP use SSL"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:16
+msgid "SMTP auth"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:31
+msgid "Send test email to"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:39
+msgid "Send"
+msgstr "Envoyer"
+
+#: rhodecode/templates/admin/settings/settings_global.html:8
 msgid "Site branding"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:97
+#: rhodecode/templates/admin/settings/settings_global.html:12
+msgid "Set a custom title for your RhodeCode Service."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:18
 msgid "HTTP authentication realm"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:106
+#: rhodecode/templates/admin/settings/settings_global.html:27
 msgid "Google Analytics code"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:114
-#: rhodecode/templates/admin/settings/settings.html:195
-#: rhodecode/templates/admin/settings/settings.html:287
+#: rhodecode/templates/admin/settings/settings_global.html:36
+msgid "ReCaptcha public key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:40
+msgid "Public key for reCaptcha system."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:46
+msgid "ReCaptcha private key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:50
+msgid ""
+"Private key for reCaptcha system. Setting this value will enable captcha on "
+"registration"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:55
+#: rhodecode/templates/admin/settings/settings_license.html:42
+#: rhodecode/templates/admin/settings/settings_vcs.html:80
+#: rhodecode/templates/admin/settings/settings_visual.html:115
 msgid "Save settings"
 msgstr "Enregister les options"
 
-#: rhodecode/templates/admin/settings/settings.html:121
-msgid "Visualisation settings"
-msgstr "Réglages d’affichage"
-
-#: rhodecode/templates/admin/settings/settings.html:129
-msgid "General"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:134
-msgid "Use repository extra fields"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:136
-msgid "Allows storing additional customized fields per repository."
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:139
-msgid "Show RhodeCode version"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:141
-msgid "Shows or hides displayed version of RhodeCode in the footer"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:146
-msgid "Dashboard items"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:150
+#: rhodecode/templates/admin/settings/settings_hooks.html:1
+msgid "Built in Mercurial hooks - read only"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:15
+msgid ""
+"Hooks can be used to trigger actions on certain events such as push / pull. "
+"They can trigger Python functions or external applications."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:19
+msgid "Custom hooks"
+msgstr "Hooks personnalisés"
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:69
+msgid "Failed to remove hook"
+msgstr "Erreur lors de la suppression du hook."
+
+#: rhodecode/templates/admin/settings/settings_license.html:2
+msgid "Currently you're using a free license, which is limited to 20 users."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:9
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "RhodeCode version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "License token"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "No license token"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:13
+msgid "License issued to"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:14
+msgid "License issued on"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "License users limit"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "unlimited"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:16
+msgid "License expires on"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:33
+msgid "License key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:37
+msgid "Paste your RhodeCode license key into that textarea."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:52
+msgid ""
+"Please enter following lines (if yet not present) into [app:main] section of"
+" your .ini file. The token below is autogenerated."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:6
+msgid "Rescan option"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:11
+msgid "Destroy old data"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:13
 msgid ""
-"Number of items displayed in lightweight dashboard before pagination is "
-"shown."
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:155
-msgid "Icons"
-msgstr "Icônes"
-
-#: rhodecode/templates/admin/settings/settings.html:160
-msgid "Show public repo icon on repositories"
-msgstr "Afficher l’icône de dépôt public sur les dépôts"
-
-#: rhodecode/templates/admin/settings/settings.html:164
-msgid "Show private repo icon on repositories"
-msgstr "Afficher l’icône de dépôt privé sur les dépôts"
-
-#: rhodecode/templates/admin/settings/settings.html:166
-msgid "Show public/private icons next to repositories names"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:172
-msgid "Meta-Tagging"
-msgstr "Meta-Tagging"
-
-#: rhodecode/templates/admin/settings/settings.html:177
-msgid "Stylify recognised metatags:"
-msgstr "Styliser les méta-tags reconnus :"
-
-#: rhodecode/templates/admin/settings/settings.html:204
-msgid "VCS settings"
-msgstr "Réglages de gestionnaire de version"
-
-#: rhodecode/templates/admin/settings/settings.html:213
+"In case a repository was deleted from filesystem and it still exists in the "
+"database check this option to scan obsolete data in database and remove it."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:17
+msgid "Invalidate cache for all repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:19
+msgid ""
+"Each cache data for repositories will be cleaned with this option selected. "
+"Use this to reload data and clear cache keys."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:23
+msgid "Install GIT hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:25
+msgid ""
+"Verify if RhodeCodes GIT hooks are installed for each repository. Current "
+"hooks will be updated to latest version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:32
+msgid "Rescan Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:7
+msgid "Index build option"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:12
+msgid "Build from scratch"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:15
+msgid ""
+"This option completely reindex all the files within RhodeCode for proper "
+"fulltext search capabilities."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:21
+msgid "Reindex"
+msgstr "Mettre à jour l’index"
+
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "check for updates"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:5
+msgid "Python version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:6
+msgid "Platform"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:7
+msgid "GIT version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:8
+msgid "GIT path"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Upgrade info endpoint"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Note: please make sure this server can access this url"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:14
+msgid "Checking for updates..."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:22
+msgid "Python packages"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr "Web"
 
-#: rhodecode/templates/admin/settings/settings.html:218
+#: rhodecode/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:220
+#: rhodecode/templates/admin/settings/settings_vcs.html:13
 msgid ""
-"RhodeCode will require SSL for pushing or pulling. If SSL is missing it will"
-" return HTTP Error 406: Not Acceptable"
-msgstr "RhodeCode requièrera SSL pour les pushs et pulls. Si le SSL n’est pas utilisé l’erreur HTTP 406 (Non Acceptable) sera renvoyée."
-
-#: rhodecode/templates/admin/settings/settings.html:226
-msgid "Hooks"
-msgstr "Hooks"
-
-#: rhodecode/templates/admin/settings/settings.html:231
-msgid "Update repository after push (hg update)"
-msgstr "Mettre à jour les dépôts après un push (hg update)"
-
-#: rhodecode/templates/admin/settings/settings.html:235
+"Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
+"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr "Afficher la taille du dépôt après un push"
 
-#: rhodecode/templates/admin/settings/settings.html:239
+#: rhodecode/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr "Journaliser les commandes de push"
 
-#: rhodecode/templates/admin/settings/settings.html:243
+#: rhodecode/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
 msgstr "Journaliser les commandes de pull"
 
-#: rhodecode/templates/admin/settings/settings.html:247
-msgid "Advanced setup"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:252
+#: rhodecode/templates/admin/settings/settings_vcs.html:36
+msgid "Update repository after push (hg update)"
+msgstr "Mettre à jour les dépôts après un push (hg update)"
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:42
 msgid "Mercurial Extensions"
 msgstr "Extensions Mercurial"
 
-#: rhodecode/templates/admin/settings/settings.html:257
+#: rhodecode/templates/admin/settings/settings_vcs.html:47
 msgid "Enable largefiles extension"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:261
+#: rhodecode/templates/admin/settings/settings_vcs.html:51
 msgid "Enable hgsubversion extension"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:263
+#: rhodecode/templates/admin/settings/settings_vcs.html:53
 msgid ""
-"Requires hgsubversion library installed. Allows cloning from svn remote "
-"locations"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:274
+"Requires hgsubversion library to be installed. Allows cloning remote SVN "
+"repositories and migrates them to Mercurial type."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:64
 msgid "Repositories location"
 msgstr "Emplacement des dépôts"
 
-#: rhodecode/templates/admin/settings/settings.html:279
+#: rhodecode/templates/admin/settings/settings_vcs.html:69
 msgid ""
 "Click to unlock. You must restart RhodeCode in order to make this setting "
 "take effect."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:280
-#: rhodecode/templates/base/base.html:143
-msgid "Unlock"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:282
+#: rhodecode/templates/admin/settings/settings_vcs.html:72
+msgid ""
+"Filesystem location where repositories should be stored. After changing this"
+" value a restart and rescan of the repository folder are required."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:8
+msgid "General"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:13
+msgid "Use repository extra fields"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:15
+msgid "Allows storing additional customized fields per repository."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:18
+msgid "Show RhodeCode version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:20
+msgid "Shows or hides a version number of RhodeCode displayed in the footer."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:24
+msgid "Use Gravatars in RhodeCode"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:30
+msgid ""
+"Gravatar url allows you to use other avatar server application.\n"
+"                                                        Following variables of the URL will be replaced accordingly.\n"
+"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {email}     user email,\n"
+"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
+"                                                        {size}      size of the image that is expected from the server application,\n"
+"                                                        {netloc}    network location/server host of running RhodeCode server"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:42
+msgid ""
+"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
+"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {user}   current user username,\n"
+"                                                        {netloc} network location/server host of running RhodeCode server,\n"
+"                                                        {repo}   full repository name,\n"
+"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:54
+msgid "Dashboard items"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:58
+msgid ""
+"Number of items displayed in the main page dashboard before pagination is "
+"shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:64
+msgid "Admin pages items"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:68
 msgid ""
-"Location where repositories are stored. After changing this value a restart,"
-" and rescan is required"
-msgstr "Emplacement de stockage des dépôts. Si cette valeur est changée, Rhodecode devra être redémarré les les dépôts rescannés."
-
-#: rhodecode/templates/admin/settings/settings.html:303
-msgid "Test Email"
-msgstr "E-mail de test"
-
-#: rhodecode/templates/admin/settings/settings.html:311
-msgid "Email to"
-msgstr "Envoyer l’e-mail à"
-
-#: rhodecode/templates/admin/settings/settings.html:319
-msgid "Send"
-msgstr "Envoyer"
-
-#: rhodecode/templates/admin/settings/settings.html:325
-msgid "System Info and Packages"
-msgstr "Information système et paquets"
-
-#: rhodecode/templates/admin/settings/settings.html:328
-#: rhodecode/templates/changelog/changelog.html:51
-msgid "Show"
-msgstr "Afficher"
+"Number of items displayed in the admin pages grids before pagination is "
+"shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:74
+msgid "Icons"
+msgstr "Icônes"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:79
+msgid "Show public repo icon on repositories"
+msgstr "Afficher l’icône de dépôt public sur les dépôts"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:83
+msgid "Show private repo icon on repositories"
+msgstr "Afficher l’icône de dépôt privé sur les dépôts"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:85
+msgid "Show public/private icons next to repositories names."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:91
+msgid "Meta-Tagging"
+msgstr "Meta-Tagging"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:96
+msgid "Stylify recognised meta tags:"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:110
+msgid ""
+"Parses meta tags from repository description field and turns them into "
+"colored tags."
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:5
+msgid "Add user group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:13
+#: rhodecode/templates/base/base.html:73 rhodecode/templates/base/base.html:93
+msgid "User groups"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:28
+msgid "Add User Group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:19
+msgid "Short, optional description for this user group."
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:5
+#, python-format
+msgid "%s user group settings"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:14
+msgid "User Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:44
+#: rhodecode/templates/admin/users/user_edit.html:45
+msgid "Default permissions"
+msgstr "Permissions par défaut"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:6
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:32
+#: rhodecode/templates/admin/user_groups/user_groups.html:52
+msgid "Members"
+msgstr "Membres"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:1
+#, python-format
+msgid "User Group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:19
+#: rhodecode/templates/data_table/_dt_elements.html:176
+#, python-format
+msgid "Confirm to delete this user group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:21
+msgid "Delete this user group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_members.html:15
+msgid "No members yet"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:40
+msgid "Chosen group members"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:43
+msgid "Remove all elements"
+msgstr "Tout enlever"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:53
+msgid "Available members"
+msgstr "Membres disponibles"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:56
+msgid "Add all elements"
+msgstr "Tout ajouter"
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:5
+msgid "User groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+msgid "user groups"
+msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr "Ajouter un utilisateur"
 
-#: rhodecode/templates/admin/users/user_add.html:10
-#: rhodecode/templates/admin/users/user_edit.html:11
-#: rhodecode/templates/base/base.html:76
+#: rhodecode/templates/admin/users/user_add.html:13
+#: rhodecode/templates/admin/users/user_edit.html:14
+#: rhodecode/templates/base/base.html:72
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: rhodecode/templates/admin/users/user_add.html:12
-#: rhodecode/templates/admin/users/users.html:23
-msgid "Add new user"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_add.html:50
+#: rhodecode/templates/admin/users/user_add.html:15
+#: rhodecode/templates/admin/users/users.html:27
+msgid "Add User"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_add.html:53
 msgid "Password confirmation"
 msgstr "Confirmation"
 
 #: rhodecode/templates/admin/users/user_edit.html:5
-msgid "Edit user"
-msgstr "Éditer l'utilisateur"
-
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#, python-format
-msgid "Edit %s"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:34
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:10
-msgid "Change your avatar at"
-msgstr "Vous pouvez changer votre avatar sur"
-
-#: rhodecode/templates/admin/users/user_edit.html:35
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:11
-msgid "Using"
-msgstr "en utilisant l’adresse"
-
-#: rhodecode/templates/admin/users/user_edit.html:43
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:20
-msgid "API key"
-msgstr "Clé d’API"
-
-#: rhodecode/templates/admin/users/user_edit.html:50
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25
-msgid "Current IP"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:70
-msgid "LDAP DN"
-msgstr "DN LDAP"
-
-#: rhodecode/templates/admin/users/user_edit.html:79
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
-msgid "New password"
-msgstr "Nouveau mot de passe"
-
-#: rhodecode/templates/admin/users/user_edit.html:88
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
+#, python-format
+msgid "%s user settings"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:46
+msgid "Emails"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:47
+msgid "Ip whitelist"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:1
+#, python-format
+msgid "User: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_profile.html:51
+msgid "Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:9
+msgid "Last Login"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:10
+msgid "Member of User groups"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:160
+#, python-format
+msgid "Confirm to delete this user: %s"
+msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?"
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:23
+msgid "Delete this user"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_ips.html:8
+#, python-format
+msgid "Inherited from %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:8
+msgid "Change avatar at"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:12
+msgid "Missing email, please update this user email address."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:27
+#, python-format
+msgid ""
+"This user is in an external Source of Record (%s); some details cannot be "
+"managed here."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:60
+msgid "Name in Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr "Confirmation du nouveau mot de passe"
 
-#: rhodecode/templates/admin/users/user_edit.html:163
-msgid "Email addresses"
-msgstr "Adresses e-mail"
-
-#: rhodecode/templates/admin/users/user_edit.html:176
-#, python-format
-msgid "Confirm to delete this email: %s"
-msgstr "Veuillez confirmer la suppression de l’e-mail : %s"
-
-#: rhodecode/templates/admin/users/user_edit.html:190
-msgid "New email address"
-msgstr "Nouvelle adrese"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:254
-msgid "My account"
-msgstr "Mon compte"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:9
-msgid "My Account"
-msgstr "Mon compte"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:35
-msgid "My permissions"
-msgstr "Mes permissions"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:54
-msgid "My repos"
-msgstr "Mes dépôts"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:41
-msgid "My pull requests"
-msgstr "Mes requêtes de pull"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4
-msgid "Show closed pull requests"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6
-msgid "Opened by me"
-msgstr "Ouvertes par moi"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
-#, python-format
-msgid "Pull request #%s opened on %s"
-msgstr "Requête de pull nº%s ouverte le %s"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45
-#: rhodecode/templates/pullrequests/pullrequest_data.html:11
-#: rhodecode/templates/pullrequests/pullrequest_show.html:27
-#: rhodecode/templates/pullrequests/pullrequest_show.html:42
-msgid "Closed"
-msgstr "Fermée"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23
-msgid "Confirm to delete this pull request"
-msgstr "Veuillez confirmer la suppression de cette requête de pull."
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51
-msgid "Nothing here yet"
-msgstr "Rien ici pour le moment"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34
-msgid "I participate in"
-msgstr "Je participe à"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42
-#: rhodecode/templates/pullrequests/pullrequest_data.html:8
-#, python-format
-msgid "Pull request #%s opened by %s on %s"
-msgstr "Requête de pull nº%s ouverte par %s le %s"
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "Administration des utilisateurs"
 
-#: rhodecode/templates/admin/users/users.html:9
+#: rhodecode/templates/admin/users/users.html:13
 msgid "users"
 msgstr "Utilisateurs"
 
-#: rhodecode/templates/admin/users/users.html:80
+#: rhodecode/templates/admin/users/users.html:54
 msgid "Firstname"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:81
+#: rhodecode/templates/admin/users/users.html:55
 msgid "Lastname"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:82
+#: rhodecode/templates/admin/users/users.html:56
 msgid "Last login"
 msgstr ""
 
-#: rhodecode/templates/admin/users_groups/users_group_add.html:5
-msgid "Add user group"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_add.html:10
-#: rhodecode/templates/admin/users_groups/users_groups.html:11
-#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94
-msgid "User groups"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_add.html:12
-#: rhodecode/templates/admin/users_groups/users_groups.html:26
-msgid "Add new user group"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:5
-msgid "Edit user group"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:11
-msgid "UserGroups"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:50
-#: rhodecode/templates/admin/users_groups/users_groups.html:38
-msgid "Members"
-msgstr "Membres"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:58
-msgid "Chosen group members"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:61
-msgid "Remove all elements"
-msgstr "Tout enlever"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:75
-msgid "Available members"
-msgstr "Membres disponibles"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:79
-msgid "Add all elements"
-msgstr "Tout ajouter"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:109
-msgid "No members yet"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:117
-msgid "Global Permissions"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:5
-msgid "User groups administration"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:55
-#, python-format
-msgid "Confirm to delete this user group: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:62
-msgid "There are no user groups yet"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:42
+#: rhodecode/templates/admin/users/users.html:59
+msgid "Auth type"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:37
 #, python-format
 msgid "Server instance: %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:52
-msgid "Report a bug"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:121
-#: rhodecode/templates/data_table/_dt_elements.html:9
+#: rhodecode/templates/base/base.html:46
+msgid "Support"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:131
+msgid "Create fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:142
 #: rhodecode/templates/data_table/_dt_elements.html:11
-#: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/summary/summary.html:8
+#: rhodecode/templates/data_table/_dt_elements.html:15
+#: rhodecode/templates/summary/summary.html:11
 msgid "Summary"
 msgstr "Résumé"
 
-#: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/changelog/changelog.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:17
+#: rhodecode/templates/base/base.html:143
+#: rhodecode/templates/changelog/changelog.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
-#: rhodecode/templates/data_table/_dt_elements.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:23
 msgid "Changelog"
 msgstr "Historique"
 
-#: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/data_table/_dt_elements.html:25
+#: rhodecode/templates/base/base.html:144
 #: rhodecode/templates/data_table/_dt_elements.html:27
-#: rhodecode/templates/data_table/_dt_elements.html:29
-#: rhodecode/templates/files/files.html:12
+#: rhodecode/templates/data_table/_dt_elements.html:31
+#: rhodecode/templates/files/files.html:15
 msgid "Files"
 msgstr "Fichiers"
 
-#: rhodecode/templates/base/base.html:125
+#: rhodecode/templates/base/base.html:146
 msgid "Switch To"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:127
-#: rhodecode/templates/base/base.html:279
-msgid "loading..."
-msgstr "Chargement…"
-
-#: rhodecode/templates/base/base.html:131
-msgid "Options"
-msgstr "Options"
-
-#: rhodecode/templates/base/base.html:137
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
-msgstr "Comparer le fork"
-
-#: rhodecode/templates/base/base.html:139
-#: rhodecode/templates/base/base.html:312
-#: rhodecode/templates/search/search.html:14
-#: rhodecode/templates/search/search.html:54
-msgid "Search"
-msgstr "Rechercher"
-
-#: rhodecode/templates/base/base.html:145
-msgid "Lock"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:153
-msgid "Follow"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:154
-msgid "Unfollow"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:157
-#: rhodecode/templates/data_table/_dt_elements.html:33
-#: rhodecode/templates/data_table/_dt_elements.html:35
-#: rhodecode/templates/data_table/_dt_elements.html:37
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/forks/fork.html:9
-msgid "Fork"
-msgstr "Fork"
-
-#: rhodecode/templates/base/base.html:159
-msgid "Create Pull Request"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:165
-msgid "Show Pull Requests"
-msgstr ""
+#: rhodecode/templates/base/base.html:155
+msgid "Options"
+msgstr "Options"
+
+#: rhodecode/templates/base/base.html:163
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
+msgstr "Comparer le fork"
 
 #: rhodecode/templates/base/base.html:165
-msgid "Pull Requests"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:202
+#: rhodecode/templates/bookmarks/bookmarks.html:58
+#: rhodecode/templates/bookmarks/bookmarks_data.html:13
+#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/branches/branches_data.html:13
+#: rhodecode/templates/tags/tags.html:58
+#: rhodecode/templates/tags/tags_data.html:13
+msgid "Compare"
+msgstr "Comparer"
+
+#: rhodecode/templates/base/base.html:167
+#: rhodecode/templates/base/base.html:334
+#: rhodecode/templates/search/search.html:17
+#: rhodecode/templates/search/search.html:57
+msgid "Search"
+msgstr "Rechercher"
+
+#: rhodecode/templates/base/base.html:171
+msgid "Unlock"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:173
+msgid "Lock"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:181
+msgid "Follow"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:182
+msgid "Unfollow"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:185
+#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/data_table/_dt_elements.html:39
+#: rhodecode/templates/forks/fork.html:12
+msgid "Fork"
+msgstr "Fork"
+
+#: rhodecode/templates/base/base.html:187
+msgid "Create Pull Request"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:193
+#, python-format
+msgid "Show Pull Requests for %s"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:230
 msgid "Not logged in"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:209
+#: rhodecode/templates/base/base.html:237
 msgid "Login to your account"
 msgstr "Connexion à votre compte"
 
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/templates/base/base.html:260
 msgid "Forgot password ?"
 msgstr "Mot de passe oublié ?"
 
-#: rhodecode/templates/base/base.html:255
+#: rhodecode/templates/base/base.html:283
 msgid "Log Out"
 msgstr "Se déconnecter"
 
-#: rhodecode/templates/base/base.html:274
-msgid "Switch repository"
-msgstr "Aller au dépôt"
-
-#: rhodecode/templates/base/base.html:286
+#: rhodecode/templates/base/base.html:308
 msgid "Show recent activity"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:287
+#: rhodecode/templates/base/base.html:309
 #: rhodecode/templates/journal/journal.html:4
 msgid "Journal"
 msgstr "Historique"
 
-#: rhodecode/templates/base/base.html:298
+#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:315
+msgid "Public journal"
+msgstr "Journal public"
+
+#: rhodecode/templates/base/base.html:320
 msgid "Show public gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:303
+#: rhodecode/templates/base/base.html:321
+msgid "Gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:324
+msgid "Create new gist"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:325
 msgid "All public gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:305
+#: rhodecode/templates/base/base.html:327
 msgid "My public gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/base/base.html:328
 msgid "My private gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:311
+#: rhodecode/templates/base/base.html:333
 msgid "Search in repositories"
 msgstr ""
 
+#: rhodecode/templates/base/base.html:394
+msgid "No matches found"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:522
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:531
+msgid "Site-wide shortcuts"
+msgstr ""
+
 #: rhodecode/templates/base/default_perms_box.html:14
-msgid "Inherit default permissions"
-msgstr "Utiliser les permissions par défaut"
-
-#: rhodecode/templates/base/default_perms_box.html:18
+msgid "Inherit from defaults"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:19
 #, python-format
 msgid ""
-"Select to inherit permissions from %s settings. With this selected below "
-"options does not apply."
-msgstr ""
-
-#: rhodecode/templates/base/default_perms_box.html:26
+"Select to inherit permissions from %s permissions settings, and default IP "
+"address whitelist."
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:28
 msgid "Create repositories"
 msgstr "Création de dépôts"
 
-#: rhodecode/templates/base/default_perms_box.html:30
+#: rhodecode/templates/base/default_perms_box.html:33
 msgid "Select this option to allow repository creation for this user"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.html:35
+#: rhodecode/templates/base/default_perms_box.html:40
 msgid "Create user groups"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.html:39
+#: rhodecode/templates/base/default_perms_box.html:45
 msgid "Select this option to allow user group creation for this user"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.html:44
+#: rhodecode/templates/base/default_perms_box.html:52
 msgid "Fork repositories"
 msgstr "Forker les dépôts"
 
-#: rhodecode/templates/base/default_perms_box.html:48
+#: rhodecode/templates/base/default_perms_box.html:57
 msgid "Select this option to allow repository forking for this user"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:11
+#: rhodecode/templates/base/perms_summary.html:13
+msgid "show"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:22
 msgid "No permissions defined yet"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:19
-#: rhodecode/templates/base/perms_summary.html:38
+#: rhodecode/templates/base/perms_summary.html:30
+#: rhodecode/templates/base/perms_summary.html:54
 msgid "Permission"
 msgstr "Permission"
 
-#: rhodecode/templates/base/perms_summary.html:20
-#: rhodecode/templates/base/perms_summary.html:39
+#: rhodecode/templates/base/perms_summary.html:32
+#: rhodecode/templates/base/perms_summary.html:56
 msgid "Edit Permission"
 msgstr "Éditer"
 
-#: rhodecode/templates/base/root.html:44
-msgid "Add another comment"
-msgstr ""
-
-#: rhodecode/templates/base/root.html:45
-#: rhodecode/templates/data_table/_dt_elements.html:147
-msgid "Stop following this repository"
-msgstr "Arrêter de suivre ce dépôt"
-
-#: rhodecode/templates/base/root.html:46
-msgid "Start following this repository"
-msgstr "Suivre ce dépôt"
+#: rhodecode/templates/base/perms_summary.html:90
+msgid "No permission defined"
+msgstr ""
 
 #: rhodecode/templates/base/root.html:47
-msgid "Group"
-msgstr "Groupe"
+msgid "Add another comment"
+msgstr ""
 
 #: rhodecode/templates/base/root.html:48
-msgid "members"
-msgstr "Membres"
+#: rhodecode/templates/data_table/_dt_elements.html:216
+msgid "Stop following this repository"
+msgstr "Arrêter de suivre ce dépôt"
 
 #: rhodecode/templates/base/root.html:49
-#: rhodecode/templates/pullrequests/pullrequest.html:203
-msgid "Loading ..."
-msgstr ""
+msgid "Start following this repository"
+msgstr "Suivre ce dépôt"
 
 #: rhodecode/templates/base/root.html:50
-msgid "Search truncated"
-msgstr ""
+msgid "Group"
+msgstr "Groupe"
 
 #: rhodecode/templates/base/root.html:51
-msgid "No matching files"
-msgstr ""
+msgid "members"
+msgstr "Membres"
 
 #: rhodecode/templates/base/root.html:52
-#: rhodecode/templates/changelog/changelog.html:45
-msgid "Open new pull request"
-msgstr "Nouvelle requête de pull"
+#: rhodecode/templates/pullrequests/pullrequest.html:202
+msgid "Loading ..."
+msgstr ""
 
 #: rhodecode/templates/base/root.html:53
-msgid "Open new pull request for selected changesets"
+msgid "loading ..."
 msgstr ""
 
 #: rhodecode/templates/base/root.html:54
-msgid "Show selected changesets __S -> __E"
+msgid "Search truncated"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:55
-msgid "Show selected changeset __S"
+msgid "No matching files"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:56
-msgid "Selection link"
-msgstr "Lien vers la sélection"
+#: rhodecode/templates/changelog/changelog.html:51
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
+msgid "Open new pull request"
+msgstr "Nouvelle requête de pull"
 
 #: rhodecode/templates/base/root.html:57
-#: rhodecode/templates/changeset/diff_block.html:8
-msgid "Collapse diff"
+msgid "Open new pull request for selected changesets"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:58
-msgid "Expand diff"
+msgid "Show selected changesets __S -> __E"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:59
+msgid "Show selected changeset __S"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:60
+msgid "Selection link"
+msgstr "Lien vers la sélection"
+
+#: rhodecode/templates/base/root.html:61
+#: rhodecode/templates/changeset/diff_block.html:8
+msgid "Collapse diff"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:62
+msgid "Expand diff"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:63
 msgid "Failed to revoke permission"
 msgstr ""
 
+#: rhodecode/templates/base/root.html:64
+msgid "confirm to revoke permission for {0}: {1} ?"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:68
+msgid "specify changeset"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr "Signets de %s"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:26
-msgid "Compare bookmarks"
-msgstr ""
-
-#: rhodecode/templates/bookmarks/bookmarks.html:51
-#: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:50
-#: rhodecode/templates/branches/branches_data.html:8
+#: rhodecode/templates/bookmarks/bookmarks.html:29
+msgid "Compare Bookmarks"
+msgstr ""
+
+#: rhodecode/templates/bookmarks/bookmarks.html:55
+#: rhodecode/templates/bookmarks/bookmarks_data.html:10
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:10
 #: rhodecode/templates/changelog/changelog_summary_data.html:8
-#: rhodecode/templates/tags/tags.html:51
-#: rhodecode/templates/tags/tags_data.html:8
+#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/tags/tags_data.html:10
 msgid "Author"
 msgstr "Auteur"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:52
-#: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:51
-#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/bookmarks/bookmarks.html:56
+#: rhodecode/templates/bookmarks/bookmarks_data.html:12
+#: rhodecode/templates/branches/branches.html:55
+#: rhodecode/templates/branches/branches_data.html:12
 #: rhodecode/templates/changelog/changelog_summary_data.html:5
-#: rhodecode/templates/tags/tags.html:52
-#: rhodecode/templates/tags/tags_data.html:9
+#: rhodecode/templates/tags/tags.html:56
+#: rhodecode/templates/tags/tags_data.html:12
 msgid "Revision"
 msgstr "Révision"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:54
-#: rhodecode/templates/bookmarks/bookmarks_data.html:10
-#: rhodecode/templates/branches/branches.html:53
-#: rhodecode/templates/branches/branches_data.html:10
-#: rhodecode/templates/tags/tags.html:54
-#: rhodecode/templates/tags/tags_data.html:10
-msgid "Compare"
-msgstr "Comparer"
-
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
 msgstr "Branches de %s"
 
-#: rhodecode/templates/branches/branches.html:26
-msgid "Compare branches"
-msgstr "Comparer les branches"
+#: rhodecode/templates/branches/branches.html:29
+msgid "Compare Branches"
+msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr "Historique de %s"
 
-#: rhodecode/templates/changelog/changelog.html:19
+#: rhodecode/templates/changelog/changelog.html:21
 #, python-format
 msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
 msgstr[0] "Affichage de %d révision sur %d"
 msgstr[1] "Affichage de %d révisions sur %d"
 
-#: rhodecode/templates/changelog/changelog.html:39
+#: rhodecode/templates/changelog/changelog.html:43
 msgid "Clear selection"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:42
+#: rhodecode/templates/changelog/changelog.html:47
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:42
-msgid "Compare fork with parent"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:78
-#: rhodecode/templates/changelog/changelog_summary_data.html:28
-#, python-format
-msgid "Click to open associated pull request #%s"
-msgstr "Cliquez ici pour ouvrir la requête de pull associée #%s."
-
-#: rhodecode/templates/changelog/changelog.html:102
-#: rhodecode/templates/summary/summary.html:403
-msgid "Show more"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changelog/changelog.html:49
+#, python-format
+msgid "Compare fork with Parent(%s)"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:56
+msgid "Show"
+msgstr "Afficher"
+
+#: rhodecode/templates/changelog/changelog.html:82
+#: rhodecode/templates/changelog/changelog_summary_data.html:19
+#, python-format
+msgid ""
+"Changeset status: %s\n"
+"Click to open associated pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:86
+#: rhodecode/templates/compare/compare_cs.html:18
+#, python-format
+msgid "Changeset status: %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:105
+#: rhodecode/templates/compare/compare_cs.html:36
+msgid "Expand commit message"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:114
+msgid "Changeset has comments"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:124
 #: rhodecode/templates/changelog/changelog_summary_data.html:50
-#: rhodecode/templates/changeset/changeset.html:107
-#: rhodecode/templates/changeset/changeset_range.html:86
+#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset_range.html:93
 #, python-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:121
+#: rhodecode/templates/changelog/changelog.html:130
 #: rhodecode/templates/changelog/changelog_summary_data.html:56
-#: rhodecode/templates/changeset/changeset.html:113
-#: rhodecode/templates/changeset/changeset_range.html:92
+#: rhodecode/templates/changeset/changeset.html:100
+#: rhodecode/templates/changeset/changeset_range.html:99
 #, python-format
 msgid "Tag %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:135
 #: rhodecode/templates/changelog/changelog_summary_data.html:61
-#: rhodecode/templates/changeset/changeset.html:117
-#: rhodecode/templates/changeset/changeset_range.html:96
+#: rhodecode/templates/changeset/changeset.html:105
+#: rhodecode/templates/changeset/changeset_range.html:103
 #, python-format
 msgid "Branch %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:286
+#: rhodecode/templates/changelog/changelog.html:299
 msgid "There are no changes yet"
 msgstr "Il n’y a aucun changement pour le moment"
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:91
+#: rhodecode/templates/changeset/changeset.html:76
 msgid "Removed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:92
+#: rhodecode/templates/changeset/changeset.html:77
 msgid "Changed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset.html:78
 msgid "Added"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:8
 #: rhodecode/templates/changelog/changelog_details.html:9
 #: rhodecode/templates/changelog/changelog_details.html:10
-#: rhodecode/templates/changeset/changeset.html:95
-#: rhodecode/templates/changeset/changeset.html:96
-#: rhodecode/templates/changeset/changeset.html:97
+#: rhodecode/templates/changeset/changeset.html:80
+#: rhodecode/templates/changeset/changeset.html:81
+#: rhodecode/templates/changeset/changeset.html:82
 #, python-format
 msgid "Affected %s files"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:6
-#: rhodecode/templates/files/files_add.html:75
-#: rhodecode/templates/files/files_edit.html:61
+#: rhodecode/templates/files/files_add.html:65
+#: rhodecode/templates/files/files_delete.html:53
 msgid "Commit message"
 msgstr ""
 
@@ -3697,10 +4702,9 @@
 msgstr "Ajouter ou téléverser des fichiers directement via RhodeCode…"
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:89
-#: rhodecode/templates/files/files_add.html:38
-#: rhodecode/templates/files/files_browser.html:31
-msgid "Add new file"
-msgstr "Ajouter un nouveau fichier"
+#: rhodecode/templates/files/files_ypjax.html:9
+msgid "Add New File"
+msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:95
 msgid "Push new repo"
@@ -3715,182 +4719,204 @@
 msgid "%s Changeset"
 msgstr "Changeset de %s"
 
-#: rhodecode/templates/changeset/changeset.html:39
-msgid "No parents"
-msgstr "Aucun parent"
-
-#: rhodecode/templates/changeset/changeset.html:49
-msgid "No children"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:62
-#: rhodecode/templates/changeset/changeset_file_comment.html:20
-#: rhodecode/templates/changeset/changeset_range.html:44
+#: rhodecode/templates/changeset/changeset.html:37
+msgid "parent rev."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:43
+msgid "child rev."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:51
+#: rhodecode/templates/changeset/changeset_file_comment.html:41
+#: rhodecode/templates/changeset/changeset_range.html:51
 msgid "Changeset status"
 msgstr "Statut du changeset"
 
+#: rhodecode/templates/changeset/changeset.html:55
+#: rhodecode/templates/changeset/diff_block.html:27
+#: rhodecode/templates/files/diff_2way.html:52
+msgid "Raw diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:58
+msgid "Patch diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:61
+#: rhodecode/templates/changeset/diff_block.html:30
+#: rhodecode/templates/files/diff_2way.html:55
+msgid "Download diff"
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset.html:67
-#: rhodecode/templates/changeset/diff_block.html:22
-msgid "Raw diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:68
-msgid "Patch diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:69
-#: rhodecode/templates/changeset/diff_block.html:23
-msgid "Download diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:103
+#: rhodecode/templates/changeset/changeset_file_comment.html:111
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d commentaire"
 msgstr[1] "%d commentaires"
 
-#: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:103
+#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:111
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
 msgstr[0] "(et %d en ligne)"
 msgstr[1] "(et %d en ligne)"
 
-#: rhodecode/templates/changeset/changeset.html:103
-#: rhodecode/templates/changeset/changeset_range.html:82
+#: rhodecode/templates/changeset/changeset.html:88
+#: rhodecode/templates/changeset/changeset_range.html:89
 msgid "merge"
 msgstr "Fusion"
 
-#: rhodecode/templates/changeset/changeset.html:126
-#: rhodecode/templates/compare/compare_diff.html:40
-#: rhodecode/templates/pullrequests/pullrequest_show.html:113
+#: rhodecode/templates/changeset/changeset.html:124
+#: rhodecode/templates/compare/compare_diff.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:160
 #, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:128
-#: rhodecode/templates/compare/compare_diff.html:42
-#: rhodecode/templates/pullrequests/pullrequest_show.html:115
+#: rhodecode/templates/changeset/changeset.html:126
+#: rhodecode/templates/compare/compare_diff.html:59
+#: rhodecode/templates/pullrequests/pullrequest_show.html:162
 #, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Showing a huge diff might take some time and resources"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Show full diff"
 msgstr ""
 
+#: rhodecode/templates/changeset/changeset.html:214
+#: rhodecode/templates/changeset/changeset.html:251
+msgid "no revisions"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:23
+#, python-format
+msgid "Vote on pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:25
+#, python-format
+msgid "Comment on pull request #%s"
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset_file_comment.html:30
-#, python-format
-msgid "Status change on pull request #%s"
+msgid "Status change on changeset"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:32
-#, python-format
-msgid "Comment on pull request #%s"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:55
+msgid "Comment on changeset"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:63
 msgid "Submitting..."
 msgstr "Envoi…"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:58
+#: rhodecode/templates/changeset/changeset_file_comment.html:66
 msgid "Commenting on line {1}."
 msgstr "Commentaire sur la ligne {1}."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:59
-#: rhodecode/templates/changeset/changeset_file_comment.html:145
+#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:153
 #, 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:61
-#: rhodecode/templates/changeset/changeset_file_comment.html:147
+#: rhodecode/templates/changeset/changeset_file_comment.html:69
+#: rhodecode/templates/changeset/changeset_file_comment.html:155
 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:65
-#: rhodecode/templates/changeset/changeset_file_comment.html:152
+#: rhodecode/templates/changeset/changeset_file_comment.html:73
+#: rhodecode/templates/changeset/changeset_file_comment.html:166
 msgid "Preview"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:72
-#: rhodecode/templates/changeset/changeset_file_comment.html:170
-msgid "Comment preview"
-msgstr ""
-
 #: rhodecode/templates/changeset/changeset_file_comment.html:80
-#: rhodecode/templates/changeset/changeset_file_comment.html:177
-#: rhodecode/templates/email_templates/changeset_comment.html:16
+#: rhodecode/templates/changeset/changeset_file_comment.html:189
+msgid "Comment preview"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:196
+#: rhodecode/templates/email_templates/changeset_comment.html:11
 #: rhodecode/templates/email_templates/pull_request_comment.html:16
 msgid "Comment"
 msgstr "Commentaire"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:81
-msgid "Cancel"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:96
 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:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:96
 msgid "Login now"
 msgstr "Se connecter maintenant"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:92
+#: rhodecode/templates/changeset/changeset_file_comment.html:100
 msgid "Hide"
 msgstr "Masquer"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:149
-msgid "Change status"
+#: rhodecode/templates/changeset/changeset_file_comment.html:159
+msgid "Vote for pull request status"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:161
+msgid "Change changeset status"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:179
-msgid "Comment and close"
-msgstr "Commenter et fermer"
+msgid "Close (when approved or rejected)"
+msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.html:5
 #, python-format
 msgid "%s Changesets"
 msgstr "Changesets de %s"
 
-#: rhodecode/templates/changeset/changeset_range.html:52
+#: rhodecode/templates/changeset/changeset_range.html:59
 msgid "Files affected"
 msgstr "Fichiers affectés"
 
 #: rhodecode/templates/changeset/diff_block.html:21
+#: rhodecode/templates/files/diff_2way.html:46
 msgid "Show full diff for this file"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:29
+#: rhodecode/templates/changeset/diff_block.html:24
+#: rhodecode/templates/changeset/diff_block.html:68
+#: rhodecode/templates/files/diff_2way.html:49
+msgid "Show full side-by-side diff for this file"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:38
 msgid "Show inline comments"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:53
+#: rhodecode/templates/changeset/diff_block.html:62
 msgid "Show file at latest version in this repo"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:54
+#: rhodecode/templates/changeset/diff_block.html:64
 msgid "Show file at initial version in this repo"
 msgstr ""
 
@@ -3898,82 +4924,79 @@
 msgid "No changesets"
 msgstr "Aucun changeset"
 
-#: rhodecode/templates/compare/compare_cs.html:32
+#: rhodecode/templates/compare/compare_cs.html:8
 msgid "Ancestor"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:5
+#: rhodecode/templates/compare/compare_diff.html:6
+#: rhodecode/templates/compare/compare_diff.html:8
 #, python-format
 msgid "%s Compare"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:9
+#: rhodecode/templates/compare/compare_diff.html:16
 msgid "Compare revisions"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:33
-#: rhodecode/templates/pullrequests/pullrequest_show.html:106
+#: rhodecode/templates/compare/compare_diff.html:36
+msgid "Swap"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:38
+msgid "Compare Revisions"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:45
+msgid "Compare revisions, branches, bookmarks or tags."
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:50
+#: rhodecode/templates/pullrequests/pullrequest_show.html:153
 #, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/compare/compare_diff.html:48
-#: rhodecode/templates/pullrequests/pullrequest_show.html:121
+#: rhodecode/templates/compare/compare_diff.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:168
 msgid "No files"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-msgid "confirm to show potentially huge diff"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.html:54
-#: rhodecode/templates/summary/summary.html:69
+#: rhodecode/templates/data_table/_dt_elements.html:63
 msgid "Mercurial repository"
 msgstr "Dépôt Mercurial"
 
-#: rhodecode/templates/data_table/_dt_elements.html:56
-#: rhodecode/templates/summary/summary.html:72
+#: rhodecode/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr "Dépôt Git"
 
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#, python-format
-msgid "Fork of %s"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.html:88
+#: rhodecode/templates/data_table/_dt_elements.html:72
+msgid "Public repository"
+msgstr "Dépôt public"
+
+#: rhodecode/templates/data_table/_dt_elements.html:82
+msgid "Repository creating in progress..."
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr "Dépôt vide"
 
-#: rhodecode/templates/data_table/_dt_elements.html:95
-#: rhodecode/templates/data_table/_dt_elements.html:97
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "S’abonner au flux RSS de %s"
 
-#: rhodecode/templates/data_table/_dt_elements.html:103
-#: rhodecode/templates/data_table/_dt_elements.html:105
+#: rhodecode/templates/data_table/_dt_elements.html:111
+#: rhodecode/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "S’abonner au flux ATOM de %s"
 
-#: rhodecode/templates/data_table/_dt_elements.html:122
-#, python-format
-msgid "Confirm to delete this repository: %s"
-msgstr "Voulez-vous vraiment supprimer le dépôt %s ?"
-
-#: rhodecode/templates/data_table/_dt_elements.html:137
-#, python-format
-msgid "Confirm to delete this user: %s"
-msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?"
-
-#: rhodecode/templates/email_templates/changeset_comment.html:4
-#: rhodecode/templates/email_templates/pull_request.html:4
-#: rhodecode/templates/email_templates/pull_request_comment.html:4
-msgid "URL"
+#: rhodecode/templates/data_table/_dt_elements.html:141
+msgid "Creating"
 msgstr ""
 
 #: rhodecode/templates/email_templates/changeset_comment.html:6
@@ -3981,7 +5004,7 @@
 msgid "%s commented on a %s changeset."
 msgstr ""
 
-#: rhodecode/templates/email_templates/changeset_comment.html:14
+#: rhodecode/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
 msgstr ""
 
@@ -4013,9 +5036,9 @@
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:8
-#: rhodecode/templates/pullrequests/pullrequest.html:34
+#: rhodecode/templates/pullrequests/pullrequest.html:31
 #: rhodecode/templates/pullrequests/pullrequest_data.html:14
-#: rhodecode/templates/pullrequests/pullrequest_show.html:25
+#: rhodecode/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr "Titre"
 
@@ -4036,76 +5059,84 @@
 msgid "View this user here"
 msgstr ""
 
-#: rhodecode/templates/errors/error_document.html:55
+#: rhodecode/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr "Vous serez redirigé vers %s dans %s secondes."
 
+#: rhodecode/templates/files/diff_2way.html:15
+#, python-format
+msgid "%s File side-by-side diff"
+msgstr ""
+
+#: rhodecode/templates/files/diff_2way.html:22
+#: rhodecode/templates/files/file_diff.html:11
+msgid "File diff"
+msgstr "Diff de fichier"
+
+#: rhodecode/templates/files/diff_2way.html:58
+msgid "ignore white space"
+msgstr ""
+
+#: rhodecode/templates/files/diff_2way.html:59
+msgid "turn on edit mode"
+msgstr ""
+
 #: rhodecode/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr ""
 
-#: rhodecode/templates/files/file_diff.html:8
-msgid "File diff"
-msgstr "Diff de fichier"
-
 #: rhodecode/templates/files/files.html:4
-#: rhodecode/templates/files/files.html:76
+#: rhodecode/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr "Fichiers de %s"
 
-#: rhodecode/templates/files/files.html:30
-#: rhodecode/templates/files/files_add.html:31
-#: rhodecode/templates/files/files_edit.html:31
-msgid "Branch"
-msgstr ""
-
 #: rhodecode/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:19
-msgid "Add file"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.html:43
-msgid "File Name"
-msgstr "Nom de fichier"
-
-#: rhodecode/templates/files/files_add.html:47
-#: rhodecode/templates/files/files_add.html:56
-msgid "or"
-msgstr "ou"
-
-#: rhodecode/templates/files/files_add.html:47
-#: rhodecode/templates/files/files_add.html:52
-msgid "Upload file"
-msgstr "Téléverser un fichier"
-
-#: rhodecode/templates/files/files_add.html:56
-msgid "Create new file"
-msgstr "Créer un nouveau fichier"
-
-#: rhodecode/templates/files/files_add.html:61
-#: rhodecode/templates/files/files_edit.html:37
+#: rhodecode/templates/files/files_add.html:25
+msgid "Add new file"
+msgstr "Ajouter un nouveau fichier"
+
+#: rhodecode/templates/files/files_add.html:45
+#: rhodecode/templates/files/files_edit.html:43
 #: rhodecode/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "Emplacement"
 
-#: rhodecode/templates/files/files_add.html:65
-msgid "use / to separate directories"
-msgstr "Utilisez / pour séparer les répertoires"
-
-#: rhodecode/templates/files/files_add.html:79
-#: rhodecode/templates/files/files_edit.html:65
+#: rhodecode/templates/files/files_add.html:47
+msgid "Enter filename..."
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:49
+#: rhodecode/templates/files/files_add.html:53
+msgid "or"
+msgstr "ou"
+
+#: rhodecode/templates/files/files_add.html:49
+msgid "Upload File"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:53
+msgid "Create New File"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:58
+msgid "New file mode"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:69
+#: rhodecode/templates/files/files_delete.html:57
+#: rhodecode/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr "Commiter les changements"
 
 #: rhodecode/templates/files/files_browser.html:13
-msgid "View"
+msgid "revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:14
@@ -4116,115 +5147,129 @@
 msgid "Next revision"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:23
+#: rhodecode/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:27
-msgid "Search file list"
-msgstr ""
-
-#: rhodecode/templates/files/files_browser.html:35
+#: rhodecode/templates/files/files_browser.html:25
+msgid "Search File List"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr "Chargement de la liste des fichiers…"
 
-#: rhodecode/templates/files/files_browser.html:48
+#: rhodecode/templates/files/files_browser.html:42
 msgid "Size"
 msgstr "Taille"
 
-#: rhodecode/templates/files/files_browser.html:49
+#: rhodecode/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr "Type MIME"
 
-#: rhodecode/templates/files/files_browser.html:50
+#: rhodecode/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr "Dernière révision"
 
-#: rhodecode/templates/files/files_browser.html:51
+#: rhodecode/templates/files/files_browser.html:45
 msgid "Last modified"
 msgstr "Dernière modification"
 
-#: rhodecode/templates/files/files_browser.html:52
+#: rhodecode/templates/files/files_browser.html:46
 msgid "Last committer"
 msgstr "Dernier commiteur"
 
+#: rhodecode/templates/files/files_delete.html:4
+#, python-format
+msgid "%s Files Delete"
+msgstr ""
+
+#: rhodecode/templates/files/files_delete.html:25
+#: rhodecode/templates/files/files_delete.html:45
+msgid "Delete file"
+msgstr ""
+
 #: rhodecode/templates/files/files_edit.html:4
 #, python-format
-msgid "%s Files Edit"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:19
+msgid "%s File Edit"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:25
 msgid "Edit file"
 msgstr ""
 
-#: rhodecode/templates/files/files_edit.html:47
-#: rhodecode/templates/files/files_source.html:23
-msgid "Show annotation"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:26
-msgid "Download as raw"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:52
+#: rhodecode/templates/files/files_edit.html:53
+#: rhodecode/templates/files/files_source.html:32
+msgid "Show Annotation"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:55
+#: rhodecode/templates/files/files_source.html:35
+msgid "Download as Raw"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:58
 msgid "Source"
 msgstr ""
 
-#: rhodecode/templates/files/files_edit.html:57
+#: rhodecode/templates/files/files_edit.html:63
 msgid "Editing file"
 msgstr "Édition du fichier"
 
+#: rhodecode/templates/files/files_edit.html:68
+msgid "Commit Message"
+msgstr ""
+
 #: rhodecode/templates/files/files_history_box.html:2
-msgid "History"
-msgstr "Historique"
-
-#: rhodecode/templates/files/files_history_box.html:9
-msgid "Diff to revision"
-msgstr ""
-
-#: rhodecode/templates/files/files_history_box.html:10
-msgid "Show at revision"
-msgstr ""
-
-#: rhodecode/templates/files/files_history_box.html:11
-msgid "Show full history"
-msgstr ""
-
-#: rhodecode/templates/files/files_history_box.html:16
 #, python-format
 msgid "%s author"
 msgid_plural "%s authors"
 msgstr[0] "%s auteur"
 msgstr[1] "%s auteurs"
 
-#: rhodecode/templates/files/files_source.html:6
-msgid "Load file history"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.html:21
-msgid "Show source"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.html:29
-#, python-format
-msgid "Edit on branch:%s"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.html:31
-msgid "Edit on branch:?"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.html:31
+#: rhodecode/templates/files/files_source.html:7
+msgid "Diff to Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:8
+msgid "Show at Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:10
+msgid "Show Full History"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:11
+msgid "Show Authors"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:30
+msgid "Show Source"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:38
+#, python-format
+msgid "Edit on Branch:%s"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:41
+msgid "Editing binary files not allowed"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:44
 msgid "Editing files allowed only when on branch head revision"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:46
+#: rhodecode/templates/files/files_source.html:45
+msgid "Deleting files allowed only when on branch head revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:61
 #, python-format
 msgid "Binary file (%s)"
 msgstr "Fichier binaire (%s)"
 
-#: rhodecode/templates/files/files_source.html:55
+#: rhodecode/templates/files/files_source.html:71
 msgid "File is too big to display"
 msgstr "Ce fichier est trop gros pour être affiché."
 
@@ -4232,11 +5277,11 @@
 msgid "annotation"
 msgstr "annotation"
 
-#: rhodecode/templates/files/files_ypjax.html:15
-msgid "Go back"
-msgstr "Revenir en arrière"
-
-#: rhodecode/templates/files/files_ypjax.html:16
+#: rhodecode/templates/files/files_ypjax.html:23
+msgid "Go Back"
+msgstr ""
+
+#: rhodecode/templates/files/files_ypjax.html:24
 msgid "No files at given path"
 msgstr "Aucun fichier à cet endroit"
 
@@ -4245,9 +5290,9 @@
 msgid "%s Followers"
 msgstr "Followers de %s"
 
-#: rhodecode/templates/followers/followers.html:9
-#: rhodecode/templates/summary/summary.html:183
-#: rhodecode/templates/summary/summary.html:184
+#: rhodecode/templates/followers/followers.html:12
+#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/templates/summary/summary.html:150
 msgid "Followers"
 msgstr "Followers"
 
@@ -4257,35 +5302,35 @@
 
 #: rhodecode/templates/forks/fork.html:5
 #, python-format
-msgid "%s Fork"
-msgstr "Fork de %s"
-
-#: rhodecode/templates/forks/fork.html:28
+msgid "Fork repository %s"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:30
 msgid "Fork name"
 msgstr "Nom du fork"
 
-#: rhodecode/templates/forks/fork.html:65
+#: rhodecode/templates/forks/fork.html:71
 msgid "Private"
 msgstr "Privé"
 
-#: rhodecode/templates/forks/fork.html:74
+#: rhodecode/templates/forks/fork.html:80
 msgid "Copy permissions"
 msgstr "Copier les permissions"
 
-#: rhodecode/templates/forks/fork.html:78
+#: rhodecode/templates/forks/fork.html:84
 msgid "Copy permissions from forked repository"
 msgstr "Copier les permissions depuis le dépôt forké"
 
-#: rhodecode/templates/forks/fork.html:84
+#: rhodecode/templates/forks/fork.html:90
 msgid "Update after clone"
 msgstr "MÀJ après le clonage"
 
-#: rhodecode/templates/forks/fork.html:88
+#: rhodecode/templates/forks/fork.html:94
 msgid "Checkout source after making a clone"
 msgstr "Mettre à jour depuis la source après clonage"
 
-#: rhodecode/templates/forks/fork.html:93
-msgid "Fork this repository"
+#: rhodecode/templates/forks/fork.html:99
+msgid "Fork this Repository"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.html:5
@@ -4293,9 +5338,9 @@
 msgid "%s Forks"
 msgstr "Forks de %s"
 
-#: rhodecode/templates/forks/forks.html:9
-#: rhodecode/templates/summary/summary.html:189
-#: rhodecode/templates/summary/summary.html:190
+#: rhodecode/templates/forks/forks.html:12
+#: rhodecode/templates/summary/summary.html:155
+#: rhodecode/templates/summary/summary.html:156
 msgid "Forks"
 msgstr "Forks"
 
@@ -4307,41 +5352,32 @@
 msgid "There are no forks yet"
 msgstr "Il n’y a pas encore de forks."
 
-#: rhodecode/templates/journal/journal.html:21
+#: rhodecode/templates/journal/journal.html:24
 msgid "ATOM journal feed"
 msgstr "Flux ATOM du journal"
 
-#: rhodecode/templates/journal/journal.html:22
+#: rhodecode/templates/journal/journal.html:25
 msgid "RSS journal feed"
 msgstr "Flux RSS du journal"
 
-#: rhodecode/templates/journal/journal.html:32
-msgid "Refresh"
-msgstr "Rafraîchir"
-
-#: rhodecode/templates/journal/journal.html:35
-#: rhodecode/templates/journal/public_journal.html:24
-msgid "ATOM feed"
-msgstr "Flux ATOM"
-
-#: rhodecode/templates/journal/journal.html:51
-msgid "Watched"
-msgstr "Surveillé"
+#: rhodecode/templates/journal/journal.html:57
+msgid "My repos"
+msgstr "Mes dépôts"
 
 #: rhodecode/templates/journal/journal_data.html:55
 msgid "No entries yet"
 msgstr "Aucune entrée pour le moment"
 
 #: rhodecode/templates/journal/public_journal.html:4
-#: rhodecode/templates/journal/public_journal.html:21
+#: rhodecode/templates/journal/public_journal.html:24
 msgid "Public Journal"
 msgstr "Journal public"
 
-#: rhodecode/templates/journal/public_journal.html:13
+#: rhodecode/templates/journal/public_journal.html:16
 msgid "ATOM public journal feed"
 msgstr "Flux ATOM du journal public"
 
-#: rhodecode/templates/journal/public_journal.html:14
+#: rhodecode/templates/journal/public_journal.html:17
 msgid "RSS public journal feed"
 msgstr "Flux RSS du journal public"
 
@@ -4350,46 +5386,42 @@
 msgid "New pull request"
 msgstr "Nouvelle requête de pull"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:25
-msgid "Create new pull request"
-msgstr "Nouvelle requête de pull"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:47
+#: rhodecode/templates/pullrequests/pullrequest.html:44
 msgid "Write a short description on this pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:53
+#: rhodecode/templates/pullrequests/pullrequest.html:50
 msgid "Changeset flow"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:60
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+#: rhodecode/templates/pullrequests/pullrequest.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:68
 msgid "Origin repository"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:85
-msgid "Send pull request"
-msgstr "Envoyer la requête de pull"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:94
-#: rhodecode/templates/pullrequests/pullrequest_show.html:137
+#: rhodecode/templates/pullrequests/pullrequest.html:82
+msgid "Send Pull Request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:91
+#: rhodecode/templates/pullrequests/pullrequest_show.html:104
 msgid "Pull request reviewers"
 msgstr "Relecteurs de la requête de pull"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:103
-#: rhodecode/templates/pullrequests/pullrequest_show.html:149
+#: rhodecode/templates/pullrequests/pullrequest.html:100
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
 msgid "owner"
 msgstr "Propriétaire"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:115
+#: rhodecode/templates/pullrequests/pullrequest.html:114
 msgid "Add reviewer to this pull request."
 msgstr "Ajouter un relecteur à cette requête de pull."
 
-#: rhodecode/templates/pullrequests/pullrequest.html:129
+#: rhodecode/templates/pullrequests/pullrequest.html:128
 msgid "Detailed compare view"
 msgstr "Comparaison détaillée"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:150
+#: rhodecode/templates/pullrequests/pullrequest.html:149
 msgid "Destination repository"
 msgstr ""
 
@@ -4398,80 +5430,111 @@
 msgid "%s Pull Request #%s"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:35
+#: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Review status"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:40
-msgid "Pull request status"
-msgstr "Statut de la requête de pull"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:53
+#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:43
+msgid "Pull request status calculated from votes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:56
 msgid "Still not reviewed by"
 msgstr "Pas encore relue par"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:60
 #, python-format
 msgid "%d reviewer"
 msgid_plural "%d reviewers"
 msgstr[0] "%d relecteur"
 msgstr[1] "%d relecteurs"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:59
+#: rhodecode/templates/pullrequests/pullrequest_show.html:62
 msgid "Pull request was reviewed by all reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:89
-msgid "Created on"
-msgstr "Créé le"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:102
+#: rhodecode/templates/pullrequests/pullrequest_show.html:77
+#: rhodecode/templates/pullrequests/pullrequest_show.html:79
+msgid "Pull changes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
+msgid "reviewer"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:133
+msgid "Add or remove reviewer to this pull request."
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:137
+msgid "Save Changes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "Compare view"
 msgstr "Vue de comparaison"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:149
-msgid "reviewer"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:164
-msgid "Add or remove reviewer to this pull request."
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:168
-msgid "Save changes"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
 #, python-format
 msgid "%s Pull Requests"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
+#, python-format
+msgid "Pull requests from %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:14
+#, python-format
+msgid "Pull requests to %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:38
+#, python-format
+msgid "Show pull requests to %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:40
+#, python-format
+msgid "Show pull requests from %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:50
+msgid "Hide closed pull requests"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:52
+msgid "Show closed pull requests too"
+msgstr ""
+
 #: rhodecode/templates/search/search.html:6
-msgid "Search repository"
+#, python-format
+msgid "%s Search"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:8
-#: rhodecode/templates/search/search.html:16
+#: rhodecode/templates/search/search.html:19
 msgid "Search in all repositories"
 msgstr "Rechercher dans tous les dépôts"
 
-#: rhodecode/templates/search/search.html:50
+#: rhodecode/templates/search/search.html:53
 msgid "Search term"
 msgstr "Termes de la recherches"
 
-#: rhodecode/templates/search/search.html:62
+#: rhodecode/templates/search/search.html:65
 msgid "Search in"
 msgstr "Rechercher dans"
 
-#: rhodecode/templates/search/search.html:65
+#: rhodecode/templates/search/search.html:68
 msgid "File contents"
 msgstr "Le contenu des fichiers"
 
-#: rhodecode/templates/search/search.html:66
+#: rhodecode/templates/search/search.html:69
 msgid "Commit messages"
 msgstr "Les messages de commit"
 
-#: rhodecode/templates/search/search.html:67
+#: rhodecode/templates/search/search.html:70
 msgid "File names"
 msgstr "Les noms de fichiers"
 
@@ -4481,6 +5544,75 @@
 msgid "Permission denied"
 msgstr "Permission refusée"
 
+#: rhodecode/templates/summary/statistics.html:4
+#, python-format
+msgid "%s Statistics"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:19
+#: rhodecode/templates/summary/summary.html:42
+#, python-format
+msgid "%s ATOM feed"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:20
+#: rhodecode/templates/summary/summary.html:43
+#, python-format
+msgid "%s RSS feed"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:39
+#: rhodecode/templates/summary/summary.html:107
+#: rhodecode/templates/summary/summary.html:123
+msgid "Enable"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:42
+msgid "Stats gathered: "
+msgstr "Statistiques obtenues :"
+
+#: rhodecode/templates/summary/statistics.html:91
+#: rhodecode/templates/summary/summary.html:354
+msgid "files"
+msgstr "Fichiers"
+
+#: rhodecode/templates/summary/statistics.html:115
+#: rhodecode/templates/summary/summary.html:378
+msgid "Show more"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:392
+msgid "commits"
+msgstr "commits"
+
+#: rhodecode/templates/summary/statistics.html:393
+msgid "files added"
+msgstr "fichiers ajoutés"
+
+#: rhodecode/templates/summary/statistics.html:394
+msgid "files changed"
+msgstr "fichiers modifiés"
+
+#: rhodecode/templates/summary/statistics.html:395
+msgid "files removed"
+msgstr "fichiers supprimés"
+
+#: rhodecode/templates/summary/statistics.html:397
+msgid "commit"
+msgstr "commit"
+
+#: rhodecode/templates/summary/statistics.html:398
+msgid "file added"
+msgstr "fichier ajouté"
+
+#: rhodecode/templates/summary/statistics.html:399
+msgid "file changed"
+msgstr "fichié modifié"
+
+#: rhodecode/templates/summary/statistics.html:400
+msgid "file removed"
+msgstr "fichier supprimé"
+
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
 msgid "%s Summary"
@@ -4488,170 +5620,85 @@
 
 #: rhodecode/templates/summary/summary.html:16
 #, python-format
-msgid "%s ATOM feed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:17
-#, python-format
-msgid "%s RSS feed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:62
-#, python-format
 msgid "Repository locked by %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:64
+#: rhodecode/templates/summary/summary.html:18
 msgid "Repository unlocked"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:83
-#, python-format
-msgid "Non changable ID %s"
-msgstr "Identifiant permanent : %s"
-
-#: rhodecode/templates/summary/summary.html:88
-msgid "Public"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:88
-#: rhodecode/templates/summary/summary.html:89
-msgid "Fork of"
-msgstr "Fork de"
-
-#: rhodecode/templates/summary/summary.html:97
-msgid "Remote clone"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:117
-msgid "Contact"
-msgstr "Contact"
-
-#: rhodecode/templates/summary/summary.html:131
+#: rhodecode/templates/summary/summary.html:76
 msgid "Clone url"
 msgstr "URL de clone"
 
-#: rhodecode/templates/summary/summary.html:136
+#: rhodecode/templates/summary/summary.html:81
 msgid "Show by Name"
 msgstr "Afficher par nom"
 
-#: rhodecode/templates/summary/summary.html:137
+#: rhodecode/templates/summary/summary.html:82
 msgid "Show by ID"
 msgstr "Afficher par ID"
 
-#: rhodecode/templates/summary/summary.html:143
+#: rhodecode/templates/summary/summary.html:99
 msgid "Trending files"
 msgstr "Populaires"
 
-#: rhodecode/templates/summary/summary.html:151
-#: rhodecode/templates/summary/summary.html:167
-msgid "Enable"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:159
+#: rhodecode/templates/summary/summary.html:115
 msgid "Download"
 msgstr "Téléchargements"
 
-#: rhodecode/templates/summary/summary.html:163
+#: rhodecode/templates/summary/summary.html:119
 msgid "There are no downloads yet"
 msgstr "Il n’y a pas encore de téléchargements proposés."
 
-#: rhodecode/templates/summary/summary.html:165
+#: rhodecode/templates/summary/summary.html:121
 msgid "Downloads are disabled for this repository"
 msgstr "Les téléchargements sont désactivés pour ce dépôt."
 
-#: rhodecode/templates/summary/summary.html:170
+#: rhodecode/templates/summary/summary.html:127
 msgid "Download as zip"
 msgstr "Télécharger en ZIP"
 
-#: rhodecode/templates/summary/summary.html:174
+#: rhodecode/templates/summary/summary.html:132
 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:174
+#: rhodecode/templates/summary/summary.html:132
 msgid "with subrepos"
 msgstr "avec les sous-dépôts"
 
-#: rhodecode/templates/summary/summary.html:197
+#: rhodecode/templates/summary/summary.html:163
 msgid "Repository Size"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:204
-#: rhodecode/templates/summary/summary.html:206
+#: rhodecode/templates/summary/summary.html:170
+#: rhodecode/templates/summary/summary.html:172
 msgid "Feed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:224
-msgid "Commit activity by day / author"
-msgstr "Activité de commit par jour et par auteur"
-
-#: rhodecode/templates/summary/summary.html:232
-msgid "enable"
-msgstr "Activer"
-
-#: rhodecode/templates/summary/summary.html:235
-msgid "Stats gathered: "
-msgstr "Statistiques obtenues :"
-
-#: rhodecode/templates/summary/summary.html:256
+#: rhodecode/templates/summary/summary.html:193
 msgid "Latest changes"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:258
+#: rhodecode/templates/summary/summary.html:195
 msgid "Quick start"
 msgstr "Démarrage rapide"
 
-#: rhodecode/templates/summary/summary.html:272
-#, python-format
-msgid "Readme file from revision %s"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:332
+#: rhodecode/templates/summary/summary.html:209
+#, python-format
+msgid "Readme file from revision %s:%s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:299
 #, python-format
 msgid "Download %s as %s"
 msgstr "Télécharger %s comme archive %s"
 
-#: rhodecode/templates/summary/summary.html:379
-msgid "files"
-msgstr "Fichiers"
-
-#: rhodecode/templates/summary/summary.html:689
-msgid "commits"
-msgstr "commits"
-
-#: rhodecode/templates/summary/summary.html:690
-msgid "files added"
-msgstr "fichiers ajoutés"
-
-#: rhodecode/templates/summary/summary.html:691
-msgid "files changed"
-msgstr "fichiers modifiés"
-
-#: rhodecode/templates/summary/summary.html:692
-msgid "files removed"
-msgstr "fichiers supprimés"
-
-#: rhodecode/templates/summary/summary.html:694
-msgid "commit"
-msgstr "commit"
-
-#: rhodecode/templates/summary/summary.html:695
-msgid "file added"
-msgstr "fichier ajouté"
-
-#: rhodecode/templates/summary/summary.html:696
-msgid "file changed"
-msgstr "fichié modifié"
-
-#: rhodecode/templates/summary/summary.html:697
-msgid "file removed"
-msgstr "fichier supprimé"
-
 #: rhodecode/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr "Tags de %s"
 
-#: rhodecode/templates/tags/tags.html:26
+#: rhodecode/templates/tags/tags.html:29
 msgid "Compare tags"
 msgstr ""
--- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po	Wed Jul 02 19:03:19 2014 -0400
+++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po	Wed Jul 02 19:03:20 2014 -0400
@@ -1,17 +1,22 @@
 # Translations template for RhodeCode.
-# Copyright (C) 2013 Marcin Kuzminski RhodeCode
+# Copyright (C) 2014 RhodeCode GmbH
 # This file is distributed under the same license as the RhodeCode project.
 # Translators:
-# しろう <>, 2013
+# しろう, 2013
+# shirou - しろう, 2013
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
+# こいんとす <tkondou@gmail.com>, 2013
 # Takumi IINO <trot.thunder@gmail.com>, 2013
+# こいんとす <tkondou@gmail.com>, 2013
+# shirou - しろう, 2013
+# whosaysni <whosaysni@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: RhodeCode\n"
-"Report-Msgid-Bugs-To: marcin@maq.io\n"
-"POT-Creation-Date: 2013-06-05 19:55+0200\n"
-"PO-Revision-Date: 2013-06-05 07:39+0000\n"
-"Last-Translator: Takumi IINO <trot.thunder@gmail.com>\n"
+"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
+"POT-Creation-Date: 2014-02-13 15:30+0100\n"
+"PO-Revision-Date: 2014-02-13 14:34+0000\n"
+"Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/RhodeCode/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,1904 +25,2271 @@
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: rhodecode/controllers/changelog.py:149
+#: rhodecode/controllers/changelog.py:88 rhodecode/controllers/compare.py:88
+#: rhodecode/controllers/pullrequests.py:263
+msgid "There are no changesets yet"
+msgstr "まだチェンジセットがありません"
+
+#: rhodecode/controllers/changelog.py:184
 msgid "All Branches"
 msgstr "すべてのブランチ"
 
-#: rhodecode/controllers/changeset.py:84
+#: rhodecode/controllers/changelog.py:187
+msgid "(closed)"
+msgstr "(閉鎖済み)"
+
+#: rhodecode/controllers/changeset.py:85
 msgid "Show white space"
 msgstr "空白を表示"
 
-#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
+#: rhodecode/controllers/changeset.py:92 rhodecode/controllers/changeset.py:99
 msgid "Ignore white space"
 msgstr "空白を無視"
 
-#: rhodecode/controllers/changeset.py:164
-#, python-format
-msgid "%s line context"
-msgstr ""
-
-#: rhodecode/controllers/changeset.py:345
-#: rhodecode/controllers/pullrequests.py:478
+#: rhodecode/controllers/changeset.py:165
+#, python-format
+msgid "increase diff context to %(num)s lines"
+msgstr "diff コンテキストを %(num)s 行増やす"
+
+#: rhodecode/controllers/changeset.py:207 rhodecode/controllers/files.py:96
+#: rhodecode/controllers/files.py:119
+msgid "Such revision does not exist for this repository"
+msgstr "お探しのリビジョンはこのリポジトリにはありません"
+
+#: rhodecode/controllers/changeset.py:353
+#: rhodecode/controllers/pullrequests.py:480
 #, python-format
 msgid "Status change -> %s"
 msgstr "ステータス変更 -> %s"
 
-#: rhodecode/controllers/changeset.py:376
+#: rhodecode/controllers/changeset.py:384
 msgid ""
 "Changing status on a changeset associated with a closed pull request is not "
 "allowed"
 msgstr "クローズしたプルリクエストに関連するチェンジセットのステータスを変更することは許可されていません"
 
-#: rhodecode/controllers/compare.py:74
-#: rhodecode/controllers/pullrequests.py:256
-msgid "There are no changesets yet"
-msgstr "まだ変更がありません"
-
-#: rhodecode/controllers/error.py:69
+#: rhodecode/controllers/compare.py:192 rhodecode/templates/base/root.html:67
+msgid "Select changeset"
+msgstr "リビジョンを選択"
+
+#: rhodecode/controllers/error.py:70
 msgid "Home page"
 msgstr "ホームページ"
 
-#: rhodecode/controllers/error.py:98
+#: rhodecode/controllers/error.py:99
 msgid ""
 "The request could not be understood by the server due to malformed syntax."
-msgstr "形式が間違っているため、サーバーはリクエストを処理出来ませんでした"
-
-#: rhodecode/controllers/error.py:101
+msgstr "形式が間違っているため、サーバーはリクエストを処理できませんでした"
+
+#: rhodecode/controllers/error.py:102
 msgid "Unauthorized access to resource"
 msgstr "リソースにアクセスする権限がありません"
 
-#: rhodecode/controllers/error.py:103
+#: rhodecode/controllers/error.py:104
 msgid "You don't have permission to view this page"
 msgstr "このページを閲覧する権限がありません"
 
-#: rhodecode/controllers/error.py:105
+#: rhodecode/controllers/error.py:106
 msgid "The resource could not be found"
 msgstr "リソースが見つかりません"
 
-#: rhodecode/controllers/error.py:107
+#: rhodecode/controllers/error.py:108
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr "サーバーが不正な状態になったため、リクエストに答えることができませんでした。"
 
-#: rhodecode/controllers/feed.py:52
+#: rhodecode/controllers/feed.py:53
 #, python-format
 msgid "Changes on %s repository"
 msgstr "%s リポジトリでの変更"
 
-#: rhodecode/controllers/feed.py:53
+#: rhodecode/controllers/feed.py:54
 #, python-format
 msgid "%s %s feed"
 msgstr "%s %s フィード"
 
-#: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/controllers/feed.py:87
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr "チェンジセットが大きすぎるため、省略しました"
 
-#: rhodecode/controllers/feed.py:90
+#: rhodecode/controllers/feed.py:91
 #, python-format
 msgid "%s committed on %s"
-msgstr "%s コミット %s"
-
-#: rhodecode/controllers/files.py:89
+msgstr "%s が %s にコミット"
+
+#: rhodecode/controllers/files.py:90
 msgid "Click here to add new file"
 msgstr "新しいファイルを追加"
 
-#: rhodecode/controllers/files.py:90
-#, python-format
-msgid "There are no files yet %s"
-msgstr "まだファイルがありません %s"
-
-#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339
+#: rhodecode/controllers/files.py:91
+#, python-format
+msgid "There are no files yet. %s"
+msgstr "まだファイルがありません。 %s"
+
+#: rhodecode/controllers/files.py:299 rhodecode/controllers/files.py:359
+#: rhodecode/controllers/files.py:426
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr "このリポジトリは %s によって %s にロックされました"
 
-#: rhodecode/controllers/files.py:283
+#: rhodecode/controllers/files.py:311
+msgid "You can only delete files with revision being a valid branch "
+msgstr "有効なブランチ上のリビジョンからしかファイルを削除できません"
+
+#: rhodecode/controllers/files.py:322
+#, python-format
+msgid "Deleted file %s via RhodeCode"
+msgstr "RhodeCode経由で %s を削除"
+
+#: rhodecode/controllers/files.py:344
+#, python-format
+msgid "Successfully deleted file %s"
+msgstr "%s ファイルの削除に成功しました"
+
+#: rhodecode/controllers/files.py:348 rhodecode/controllers/files.py:414
+#: rhodecode/controllers/files.py:496
+msgid "Error occurred during commit"
+msgstr "コミット中にエラーが発生しました"
+
+#: rhodecode/controllers/files.py:371
 msgid "You can only edit files with revision being a valid branch "
-msgstr ""
-
-#: rhodecode/controllers/files.py:297
+msgstr "有効なブランチを示すリビジョンでのみファイルを編集できます。"
+
+#: rhodecode/controllers/files.py:385
 #, python-format
 msgid "Edited file %s via RhodeCode"
 msgstr "RhodeCode経由で %s を変更"
 
-#: rhodecode/controllers/files.py:313
+#: rhodecode/controllers/files.py:401
 msgid "No changes"
 msgstr "変更点なし"
 
-#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394
+#: rhodecode/controllers/files.py:410 rhodecode/controllers/files.py:485
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "%s へのコミットが成功しました"
 
-#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405
-msgid "Error occurred during commit"
-msgstr "コミット中にエラーが発生しました"
-
-#: rhodecode/controllers/files.py:351
+#: rhodecode/controllers/files.py:438
 msgid "Added file via RhodeCode"
 msgstr "RhodeCode経由でファイルを追加"
 
-#: rhodecode/controllers/files.py:368
+#: rhodecode/controllers/files.py:459
 msgid "No content"
 msgstr "内容がありません"
 
-#: rhodecode/controllers/files.py:372
+#: rhodecode/controllers/files.py:463
 msgid "No filename"
 msgstr "ファイル名がありません"
 
-#: rhodecode/controllers/files.py:397
+#: rhodecode/controllers/files.py:488
 msgid "Location must be relative path and must not contain .. in path"
 msgstr "場所には相対パスかつ .. を含まないパスを入力してください"
 
-#: rhodecode/controllers/files.py:431
+#: rhodecode/controllers/files.py:522
 msgid "Downloads disabled"
 msgstr "ダウンロードは無効化されています"
 
-#: rhodecode/controllers/files.py:442
+#: rhodecode/controllers/files.py:533
 #, python-format
 msgid "Unknown revision %s"
 msgstr "%s は未知のリビジョンです"
 
-#: rhodecode/controllers/files.py:444
+#: rhodecode/controllers/files.py:535
 msgid "Empty repository"
 msgstr "空のリポジトリ"
 
-#: rhodecode/controllers/files.py:446
+#: rhodecode/controllers/files.py:537
 msgid "Unknown archive type"
 msgstr "未知のアーカイブ種別です"
 
-#: rhodecode/controllers/files.py:631
-#: rhodecode/templates/changeset/changeset_range.html:9
+#: rhodecode/controllers/files.py:773
+#: rhodecode/templates/changeset/changeset_range.html:12
 #: rhodecode/templates/email_templates/pull_request.html:12
-#: rhodecode/templates/pullrequests/pullrequest.html:124
+#: rhodecode/templates/pullrequests/pullrequest.html:123
 msgid "Changesets"
 msgstr "チェンジセット"
 
-#: rhodecode/controllers/files.py:632
-#: rhodecode/controllers/pullrequests.py:149
-#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682
+#: rhodecode/controllers/files.py:774
+#: rhodecode/controllers/pullrequests.py:158
+#: rhodecode/controllers/summary.py:74 rhodecode/model/scm.py:816
 #: rhodecode/templates/switch_to_list.html:3
-#: rhodecode/templates/branches/branches.html:10
+#: rhodecode/templates/branches/branches.html:13
 msgid "Branches"
 msgstr "ブランチ"
 
-#: rhodecode/controllers/files.py:633
-#: rhodecode/controllers/pullrequests.py:150
-#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693
-#: rhodecode/templates/switch_to_list.html:15
-#: rhodecode/templates/tags/tags.html:10
+#: rhodecode/controllers/files.py:775
+#: rhodecode/controllers/pullrequests.py:159
+#: rhodecode/controllers/summary.py:75 rhodecode/model/scm.py:827
+#: rhodecode/templates/switch_to_list.html:25
+#: rhodecode/templates/tags/tags.html:13
 msgid "Tags"
 msgstr "タグ"
 
-#: rhodecode/controllers/forks.py:176
-#, python-format
-msgid "Forked repository %s as %s"
-msgstr "リポジトリ %s を %s としてフォークしました"
-
-#: rhodecode/controllers/forks.py:190
+#: rhodecode/controllers/forks.py:189
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "リポジトリ %s のフォーク中にエラーが発生しました"
 
-#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153
+#: rhodecode/controllers/home.py:81
+msgid "Groups"
+msgstr "グループ"
+
+#: rhodecode/controllers/home.py:86
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:106
+#: rhodecode/templates/admin/repos/repo_add.html:15
+#: rhodecode/templates/admin/repos/repo_add.html:19
+#: rhodecode/templates/admin/users/user_edit_advanced.html:6
+#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:87
+#: rhodecode/templates/base/base.html:136
+#: rhodecode/templates/base/base.html:389
+#: rhodecode/templates/base/base.html:560
+msgid "Repositories"
+msgstr "リポジトリ"
+
+#: rhodecode/controllers/home.py:127 rhodecode/templates/files/files.html:33
+#: rhodecode/templates/files/files_add.html:37
+#: rhodecode/templates/files/files_delete.html:37
+#: rhodecode/templates/files/files_edit.html:37
+msgid "Branch"
+msgstr "ブランチ"
+
+#: rhodecode/controllers/home.py:133
+msgid "Tag"
+msgstr "タグ"
+
+#: rhodecode/controllers/home.py:139
+msgid "Bookmark"
+msgstr "ブックマーク"
+
+#: rhodecode/controllers/journal.py:112 rhodecode/controllers/journal.py:155
 msgid "public journal"
 msgstr "公開ジャーナル"
 
-#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157
-#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/controllers/journal.py:116 rhodecode/controllers/journal.py:159
+#: rhodecode/templates/journal/journal.html:15
 msgid "journal"
 msgstr "ジャーナル"
 
-#: rhodecode/controllers/login.py:138
+#: rhodecode/controllers/login.py:185 rhodecode/controllers/login.py:230
+msgid "bad captcha"
+msgstr "キャプチャが一致しません"
+
+#: rhodecode/controllers/login.py:191
 msgid "You have successfully registered into RhodeCode"
 msgstr "RhodeCodeへの登録を受け付けました"
 
-#: rhodecode/controllers/login.py:159
+#: rhodecode/controllers/login.py:235
 msgid "Your password reset link was sent"
 msgstr "パスワードリセットのリンクを送信しました"
 
-#: rhodecode/controllers/login.py:179
+#: rhodecode/controllers/login.py:255
 msgid ""
 "Your password reset was successful, new password has been sent to your email"
-msgstr "パスワードをリセットしました。新しいパスワードをあなたのメールアドレスに送りました"
-
-#: rhodecode/controllers/pullrequests.py:136
-#: rhodecode/templates/changeset/changeset.html:10
-#: rhodecode/templates/email_templates/changeset_comment.html:8
+msgstr "パスワードをリセットに成功しました。新しいパスワードをあなたのメールアドレスに送りました"
+
+#: rhodecode/controllers/pullrequests.py:138
+#: rhodecode/templates/changeset/changeset.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:15
 msgid "Changeset"
 msgstr "チェンジセット"
 
-#: rhodecode/controllers/pullrequests.py:146
+#: rhodecode/controllers/pullrequests.py:155
 msgid "Special"
-msgstr ""
-
-#: rhodecode/controllers/pullrequests.py:147
+msgstr "スペシャル"
+
+#: rhodecode/controllers/pullrequests.py:156
 msgid "Peer branches"
 msgstr "相手のブランチ"
 
-#: rhodecode/controllers/pullrequests.py:148 rhodecode/model/scm.py:688
-#: rhodecode/templates/switch_to_list.html:28
-#: rhodecode/templates/bookmarks/bookmarks.html:10
+#: rhodecode/controllers/pullrequests.py:157 rhodecode/model/scm.py:822
+#: rhodecode/templates/switch_to_list.html:38
+#: rhodecode/templates/bookmarks/bookmarks.html:13
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
-#: rhodecode/controllers/pullrequests.py:321
+#: rhodecode/controllers/pullrequests.py:328
 msgid "Pull request requires a title with min. 3 chars"
 msgstr "プルリクエストには3文字以上のタイトルが必要です"
 
-#: rhodecode/controllers/pullrequests.py:323
-msgid "Error creating pull request"
-msgstr "プルリクエストの作成中にエラーが発生しました"
-
-#: rhodecode/controllers/pullrequests.py:343
+#: rhodecode/controllers/pullrequests.py:330
+#, python-format
+msgid "Error creating pull request: %s"
+msgstr "プルリクエスト作成中にエラーが発生しました: %s"
+
+#: rhodecode/controllers/pullrequests.py:352
 msgid "Successfully opened new pull request"
-msgstr "新しいプルリクエストを作成しました"
-
-#: rhodecode/controllers/pullrequests.py:346
+msgstr "新しいプルリクエストの作成に成功しました"
+
+#: rhodecode/controllers/pullrequests.py:355
 msgid "Error occurred during sending pull request"
 msgstr "プルリクエストの作成中にエラーが発生しました"
 
-#: rhodecode/controllers/pullrequests.py:385
+#: rhodecode/controllers/pullrequests.py:395
 msgid "Successfully deleted pull request"
-msgstr "プルリクエストを削除しました"
-
-#: rhodecode/controllers/pullrequests.py:481
+msgstr "プルリクエストの削除に成功しました"
+
+#: rhodecode/controllers/pullrequests.py:483
 msgid "Closing with"
-msgstr ""
-
-#: rhodecode/controllers/pullrequests.py:518
+msgstr "この状態で閉じる："
+
+#: rhodecode/controllers/pullrequests.py:520
 msgid ""
 "Closing pull request on other statuses than rejected or approved forbidden"
-msgstr ""
-
-#: rhodecode/controllers/search.py:132
+msgstr "拒否（rejected）または承諾（approved）以外のステータスでのプルリクエスト解決は禁止されています。"
+
+#: rhodecode/controllers/search.py:133
 msgid "Invalid search query. Try quoting it."
 msgstr "無効な検索クエリーです。\\\"で囲んで下さい"
 
-#: rhodecode/controllers/search.py:137
+#: rhodecode/controllers/search.py:138
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr "検索するためのインデックスがありません。whooshでインデックスを作成して下さい"
 
-#: rhodecode/controllers/search.py:141
+#: rhodecode/controllers/search.py:142
 msgid "An error occurred during this search operation"
-msgstr "検索を実行する際にエラーがおきました"
-
-#: rhodecode/controllers/summary.py:182
+msgstr "検索を実行する際にエラーが発生しました"
+
+#: rhodecode/controllers/summary.py:201
 msgid "No data loaded yet"
 msgstr "まだデータが読み込まれていません"
 
-#: rhodecode/controllers/summary.py:188
-#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/controllers/summary.py:204
+#: rhodecode/templates/summary/summary.html:105
 msgid "Statistics are disabled for this repository"
 msgstr "このリポジトリの統計は無効化されています"
 
-#: rhodecode/controllers/admin/defaults.py:96
+#: rhodecode/controllers/admin/auth_settings.py:125
+msgid "Auth settings updated successfully"
+msgstr "認証設定の更新に成功しました"
+
+#: rhodecode/controllers/admin/auth_settings.py:136
+msgid "error occurred during update of auth settings"
+msgstr "認証設定の更新中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/defaults.py:95
 msgid "Default settings updated successfully"
-msgstr "デフォルト設定を更新しました"
-
-#: rhodecode/controllers/admin/defaults.py:110
+msgstr "デフォルト設定の更新に成功しました"
+
+#: rhodecode/controllers/admin/defaults.py:109
 msgid "Error occurred during update of defaults"
 msgstr "デフォルト設定の更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/gists.py:56
+#: rhodecode/controllers/admin/gists.py:58
+#: rhodecode/controllers/admin/my_account.py:255
+#: rhodecode/controllers/admin/users.py:287
 msgid "forever"
-msgstr ""
-
-#: rhodecode/controllers/admin/gists.py:57
-msgid "5 minutes"
-msgstr ""
-
-#: rhodecode/controllers/admin/gists.py:58
-msgid "1 hour"
-msgstr ""
+msgstr "無期限"
 
 #: rhodecode/controllers/admin/gists.py:59
-msgid "1 day"
-msgstr ""
+#: rhodecode/controllers/admin/my_account.py:256
+#: rhodecode/controllers/admin/users.py:288
+msgid "5 minutes"
+msgstr "5 分"
 
 #: rhodecode/controllers/admin/gists.py:60
-msgid "1 month"
-msgstr ""
+#: rhodecode/controllers/admin/my_account.py:257
+#: rhodecode/controllers/admin/users.py:289
+msgid "1 hour"
+msgstr "1 時間"
+
+#: rhodecode/controllers/admin/gists.py:61
+#: rhodecode/controllers/admin/my_account.py:258
+#: rhodecode/controllers/admin/users.py:290
+msgid "1 day"
+msgstr "1 日"
 
 #: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/my_account.py:259
+#: rhodecode/controllers/admin/users.py:291
+msgid "1 month"
+msgstr "1 ヶ月"
+
+#: rhodecode/controllers/admin/gists.py:66
+#: rhodecode/controllers/admin/my_account.py:261
+#: rhodecode/controllers/admin/users.py:293
 msgid "Lifetime"
-msgstr ""
-
-#: rhodecode/controllers/admin/gists.py:127
+msgstr "有効期間"
+
+#: rhodecode/controllers/admin/gists.py:145
 msgid "Error occurred during gist creation"
-msgstr ""
-
-#: rhodecode/controllers/admin/gists.py:165
+msgstr "gist の作成中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/gists.py:183
 #, python-format
 msgid "Deleted gist %s"
+msgstr "gist %s を削除しました"
+
+#: rhodecode/controllers/admin/gists.py:232
+msgid "unmodified"
+msgstr "変更なし"
+
+#: rhodecode/controllers/admin/gists.py:261
+msgid "Successfully updated gist content"
+msgstr "Gist の内容を更新しました"
+
+#: rhodecode/controllers/admin/gists.py:266
+msgid "Successfully updated gist data"
+msgstr "Gist データを更新しました"
+
+#: rhodecode/controllers/admin/gists.py:269
+#, python-format
+msgid "Error occurred during update of gist %s"
+msgstr "Gist %s の更新中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/my_account.py:68
+msgid "You can't edit this user since it's crucial for entire application"
+msgstr "このユーザーを編集できません。このユーザーはアプリケーションにとって必要不可欠です。"
+
+#: rhodecode/controllers/admin/my_account.py:125
+msgid "Your account was updated successfully"
+msgstr "アカウントの更新に成功しました"
+
+#: rhodecode/controllers/admin/my_account.py:139
+#: rhodecode/controllers/admin/users.py:205
+#, python-format
+msgid "Error occurred during update of user %s"
+msgstr "ユーザー %s の更新中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/my_account.py:159
+msgid "Successfully updated password"
 msgstr ""
 
-#: rhodecode/controllers/admin/ldap_settings.py:50
-msgid "BASE"
-msgstr "BASE"
-
-#: rhodecode/controllers/admin/ldap_settings.py:51
-msgid "ONELEVEL"
-msgstr "ONELEVEL"
-
-#: rhodecode/controllers/admin/ldap_settings.py:52
-msgid "SUBTREE"
-msgstr "SUBTREE"
-
-#: rhodecode/controllers/admin/ldap_settings.py:56
-msgid "NEVER"
-msgstr "NEVER"
-
-#: rhodecode/controllers/admin/ldap_settings.py:57
-msgid "ALLOW"
-msgstr "ALLOW"
-
-#: rhodecode/controllers/admin/ldap_settings.py:58
-msgid "TRY"
-msgstr "TRY"
-
-#: rhodecode/controllers/admin/ldap_settings.py:59
-msgid "DEMAND"
-msgstr "DEMAND"
-
-#: rhodecode/controllers/admin/ldap_settings.py:60
-msgid "HARD"
-msgstr "HARD"
-
-#: rhodecode/controllers/admin/ldap_settings.py:64
-msgid "No encryption"
-msgstr "暗号化なし"
-
-#: rhodecode/controllers/admin/ldap_settings.py:65
-msgid "LDAPS connection"
-msgstr "LDAPS接続"
-
-#: rhodecode/controllers/admin/ldap_settings.py:66
-msgid "START_TLS on LDAP connection"
-msgstr "LDAP接続でSTART_TLSを使用"
-
-#: rhodecode/controllers/admin/ldap_settings.py:124
-msgid "LDAP settings updated successfully"
-msgstr "LDAP設定を更新しました"
-
-#: rhodecode/controllers/admin/ldap_settings.py:128
-msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
-msgstr "LDAPを有効にできませんでした。\"python-ldap\"ライブラリがありません。"
-
-#: rhodecode/controllers/admin/ldap_settings.py:145
-msgid "Error occurred during update of ldap settings"
-msgstr "LDAP設定の更新中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/permissions.py:58
-#: rhodecode/controllers/admin/permissions.py:62
-#: rhodecode/controllers/admin/permissions.py:66
-msgid "None"
-msgstr "なし"
-
-#: rhodecode/controllers/admin/permissions.py:59
-#: rhodecode/controllers/admin/permissions.py:63
-#: rhodecode/controllers/admin/permissions.py:67
-msgid "Read"
-msgstr "読込"
+#: rhodecode/controllers/admin/my_account.py:169
+msgid "Error occurred during update of user password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:211
+#: rhodecode/controllers/admin/users.py:430
+#, python-format
+msgid "Added email %s to user"
+msgstr "ユーザーにメールアドレス %s を追加しました"
+
+#: rhodecode/controllers/admin/my_account.py:217
+#: rhodecode/controllers/admin/users.py:436
+msgid "An error occurred during email saving"
+msgstr "メールの保存時にエラーが発生しました"
+
+#: rhodecode/controllers/admin/my_account.py:226
+#: rhodecode/controllers/admin/users.py:447
+msgid "Removed email from user"
+msgstr "ユーザーからメールアドレスを削除しました"
+
+#: rhodecode/controllers/admin/my_account.py:272
+#: rhodecode/controllers/admin/users.py:313
+msgid "Api key successfully created"
+msgstr "APIキーの作成に成功しました"
+
+#: rhodecode/controllers/admin/my_account.py:284
+#: rhodecode/controllers/admin/users.py:329
+msgid "Api key successfully reset"
+msgstr "APIキーのリセットに成功しました"
+
+#: rhodecode/controllers/admin/my_account.py:288
+#: rhodecode/controllers/admin/users.py:333
+msgid "Api key successfully deleted"
+msgstr "APIキーの削除に成功しました"
 
 #: rhodecode/controllers/admin/permissions.py:60
 #: rhodecode/controllers/admin/permissions.py:64
 #: rhodecode/controllers/admin/permissions.py:68
-msgid "Write"
-msgstr "書込"
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:104
+msgid "None"
+msgstr "なし"
 
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
 #: rhodecode/controllers/admin/permissions.py:69
-#: rhodecode/templates/admin/defaults/defaults.html:9
-#: rhodecode/templates/admin/ldap/ldap.html:9
-#: rhodecode/templates/admin/permissions/permissions.html:9
-#: rhodecode/templates/admin/repos/repo_add.html:10
-#: rhodecode/templates/admin/repos/repo_add.html:14
-#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:9
-#: rhodecode/templates/admin/users/user_add.html:8
-#: rhodecode/templates/admin/users/user_edit.html:9
-#: rhodecode/templates/admin/users/user_edit.html:133
-#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/admin/users_groups/users_group_add.html:8
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:9
-#: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:317
-#: rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:325
+msgid "Read"
+msgstr "読込"
+
+#: rhodecode/controllers/admin/permissions.py:62
+#: rhodecode/controllers/admin/permissions.py:66
+#: rhodecode/controllers/admin/permissions.py:70
+msgid "Write"
+msgstr "書込"
+
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
+#: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/templates/admin/auth/auth_settings.html:12
+#: rhodecode/templates/admin/defaults/defaults.html:12
+#: rhodecode/templates/admin/permissions/permissions.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:17
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/settings/settings.html:12
+#: rhodecode/templates/admin/user_groups/user_group_add.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+#: rhodecode/templates/admin/users/user_add.html:11
+#: rhodecode/templates/admin/users/user_edit.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:114
+#: rhodecode/templates/admin/users/users.html:13
+#: rhodecode/templates/admin/users/users.html:58
+#: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:340
+#: rhodecode/templates/base/base.html:346
+#: rhodecode/templates/base/base.html:347
 msgid "Admin"
 msgstr "管理"
 
-#: rhodecode/controllers/admin/permissions.py:72
-#: rhodecode/controllers/admin/permissions.py:83
-#: rhodecode/controllers/admin/permissions.py:86
-#: rhodecode/controllers/admin/permissions.py:89
-#: rhodecode/controllers/admin/permissions.py:92
-msgid "Disabled"
-msgstr "無効"
-
 #: rhodecode/controllers/admin/permissions.py:74
-msgid "Allowed with manual account activation"
-msgstr "手動でアカウントを有効にする"
+#: rhodecode/controllers/admin/permissions.py:85
+#: rhodecode/controllers/admin/permissions.py:90
+#: rhodecode/controllers/admin/permissions.py:93
+#: rhodecode/controllers/admin/permissions.py:96
+#: rhodecode/controllers/admin/permissions.py:99
+msgid "Disabled"
+msgstr "無効"
 
 #: rhodecode/controllers/admin/permissions.py:76
+msgid "Allowed with manual account activation"
+msgstr "手動でアカウントをアクティベートする"
+
+#: rhodecode/controllers/admin/permissions.py:78
 msgid "Allowed with automatic account activation"
-msgstr "自動でアカウントを有効にする"
-
-#: rhodecode/controllers/admin/permissions.py:79
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444
+msgstr "自動でアカウントをアクティベートする"
+
+#: rhodecode/controllers/admin/permissions.py:81
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1485
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1542
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1564
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1603
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1655
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1682 rhodecode/model/db.py:1692
 msgid "Manual activation of external account"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:80
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445
+msgstr "外部アカウントを手動でアクティベートする"
+
+#: rhodecode/controllers/admin/permissions.py:82
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1486
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1565
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1604
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1656
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1683 rhodecode/model/db.py:1693
 msgid "Automatic activation of external account"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:84
-#: rhodecode/controllers/admin/permissions.py:87
-#: rhodecode/controllers/admin/permissions.py:90
-#: rhodecode/controllers/admin/permissions.py:93
+msgstr "外部アカウントを自動でアクティベートする"
+
+#: rhodecode/controllers/admin/permissions.py:86
+#: rhodecode/controllers/admin/permissions.py:89
+#: rhodecode/controllers/admin/permissions.py:94
+#: rhodecode/controllers/admin/permissions.py:97
+#: rhodecode/controllers/admin/permissions.py:100
 msgid "Enabled"
 msgstr "有効"
 
-#: rhodecode/controllers/admin/permissions.py:138
-msgid "Default permissions updated successfully"
-msgstr "デフォルトの権限を更新しました"
-
-#: rhodecode/controllers/admin/permissions.py:152
+#: rhodecode/controllers/admin/permissions.py:123
+msgid "Global permissions updated successfully"
+msgstr "全般の権限の更新に成功しました"
+
+#: rhodecode/controllers/admin/permissions.py:137
 msgid "Error occurred during update of permissions"
 msgstr "権限の更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:128
-msgid "--REMOVE FORK--"
-msgstr "--フォーク元を削除--"
-
-#: rhodecode/controllers/admin/repos.py:168
+#: rhodecode/controllers/admin/repo_groups.py:184
+#, python-format
+msgid "Created repository group %s"
+msgstr "リポジトリグループ %s を作成しました"
+
+#: rhodecode/controllers/admin/repo_groups.py:196
+#, python-format
+msgid "Error occurred during creation of repository group %s"
+msgstr "リポジトリグループ %s の作成中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/repo_groups.py:254
+#, python-format
+msgid "Updated repository group %s"
+msgstr "リポジトリグループ %s を更新しました"
+
+#: rhodecode/controllers/admin/repo_groups.py:269
+#, python-format
+msgid "Error occurred during update of repository group %s"
+msgstr "リポジトリグループ %s の更新中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/repo_groups.py:287
+#, python-format
+msgid "This group contains %s repositores and cannot be deleted"
+msgstr "このグループは %s 個のリポジトリを含んでいるため削除できません"
+
+#: rhodecode/controllers/admin/repo_groups.py:294
+#, python-format
+msgid "This group contains %s subgroups and cannot be deleted"
+msgstr "このグループは %s 個のサブグループを含んでいるため削除できません"
+
+#: rhodecode/controllers/admin/repo_groups.py:300
+#, python-format
+msgid "Removed repository group %s"
+msgstr "リポジトリグループ %s を削除しました"
+
+#: rhodecode/controllers/admin/repo_groups.py:305
+#, python-format
+msgid "Error occurred during deletion of repository group %s"
+msgstr "リポジトリグループ %s の削除中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/repo_groups.py:417
+#: rhodecode/controllers/admin/repo_groups.py:452
+#: rhodecode/controllers/admin/user_groups.py:335
+msgid "Cannot revoke permission for yourself as admin"
+msgstr "自分自身の管理者としての権限を取り消すことはできません"
+
+#: rhodecode/controllers/admin/repo_groups.py:432
+msgid "Repository Group permissions updated"
+msgstr "リポジトリグループ権限を更新しました"
+
+#: rhodecode/controllers/admin/repo_groups.py:469
+#: rhodecode/controllers/admin/repos.py:424
+#: rhodecode/controllers/admin/user_groups.py:347
+msgid "An error occurred during revoking of permission"
+msgstr "権限の取消中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/repos.py:160
+#, python-format
+msgid "Error creating repository %s"
+msgstr "リポジトリ %s の作成中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/repos.py:235
 #, python-format
 msgid "Created repository %s from %s"
 msgstr "リポジトリ %s を %s から作成しました"
 
-#: rhodecode/controllers/admin/repos.py:174
+#: rhodecode/controllers/admin/repos.py:244
+#, python-format
+msgid "Forked repository %s as %s"
+msgstr "リポジトリ %s を %s としてフォークしました"
+
+#: rhodecode/controllers/admin/repos.py:247
 #, python-format
 msgid "Created repository %s"
 msgstr "リポジトリ %s を作成しました"
 
-#: rhodecode/controllers/admin/repos.py:197
-#, python-format
-msgid "Error creating repository %s"
-msgstr "リポジトリ %s の作成中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/repos.py:270
+#: rhodecode/controllers/admin/repos.py:287
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "リポジトリ %s の更新に成功しました"
 
-#: rhodecode/controllers/admin/repos.py:288
+#: rhodecode/controllers/admin/repos.py:305
 #, python-format
 msgid "Error occurred during update of repository %s"
 msgstr "リポジトリ %s の更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:315
+#: rhodecode/controllers/admin/repos.py:332
 #, python-format
 msgid "Detached %s forks"
 msgstr "%s 個のフォークを切り離しました"
 
-#: rhodecode/controllers/admin/repos.py:318
+#: rhodecode/controllers/admin/repos.py:335
 #, python-format
 msgid "Deleted %s forks"
 msgstr "%s 個のフォークを削除しました"
 
-#: rhodecode/controllers/admin/repos.py:323
+#: rhodecode/controllers/admin/repos.py:340
 #, python-format
 msgid "Deleted repository %s"
 msgstr "リポジトリ %s を削除しました"
 
-#: rhodecode/controllers/admin/repos.py:326
+#: rhodecode/controllers/admin/repos.py:343
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr "フォークしたリポジトリが存在するため、 %s は削除できません"
 
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/admin/repos.py:348
 #, python-format
 msgid "An error occurred during deletion of %s"
-msgstr "リポジトリ %s の削除中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/repos.py:345
+msgstr "%s の削除中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/repos.py:400
 msgid "Repository permissions updated"
 msgstr "リポジトリ権限を更新しました"
 
-#: rhodecode/controllers/admin/repos.py:375
-#: rhodecode/controllers/admin/repos_groups.py:332
-#: rhodecode/controllers/admin/users_groups.py:312
-msgid "An error occurred during revoking of permission"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:392
-msgid "An error occurred during deletion of repository stats"
-msgstr "リポジトリステートの削除中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/repos.py:409
-msgid "An error occurred during cache invalidation"
-msgstr "キャッシュの無効化中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/repos.py:429
 #: rhodecode/controllers/admin/repos.py:456
+msgid "An error occurred during creation of field"
+msgstr "フィールドの作成中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/repos.py:470
+msgid "An error occurred during removal of field"
+msgstr "フィールドの削除中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/repos.py:486
+msgid "-- Not a fork --"
+msgstr "-- フォークではありません --"
+
+#: rhodecode/controllers/admin/repos.py:520
+msgid "Updated repository visibility in public journal"
+msgstr "公開ジャーナルでのリポジトリの可視性を更新しました"
+
+#: rhodecode/controllers/admin/repos.py:524
+msgid "An error occurred during setting this repository in public journal"
+msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/repos.py:529 rhodecode/model/validators.py:359
+msgid "Token mismatch"
+msgstr "トークンが一致しません"
+
+#: rhodecode/controllers/admin/repos.py:544
+msgid "Nothing"
+msgstr "ありません"
+
+#: rhodecode/controllers/admin/repos.py:546
+#, python-format
+msgid "Marked repo %s as fork of %s"
+msgstr "%s リポジトリを %s のフォークとする"
+
+#: rhodecode/controllers/admin/repos.py:553
+msgid "An error occurred during this operation"
+msgstr "操作中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/repos.py:569
+msgid "Locked repository"
+msgstr "リポジトリをロックしました"
+
+#: rhodecode/controllers/admin/repos.py:572
+msgid "Unlocked repository"
+msgstr "リポジトリのロックを解除しました"
+
+#: rhodecode/controllers/admin/repos.py:575
+#: rhodecode/controllers/admin/repos.py:602
 msgid "An error occurred during unlocking"
 msgstr "アンロック中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:447
+#: rhodecode/controllers/admin/repos.py:593
 msgid "Unlocked"
 msgstr "アンロック"
 
-#: rhodecode/controllers/admin/repos.py:450
+#: rhodecode/controllers/admin/repos.py:596
 msgid "Locked"
 msgstr "ロック"
 
-#: rhodecode/controllers/admin/repos.py:452
+#: rhodecode/controllers/admin/repos.py:598
 #, python-format
 msgid "Repository has been %s"
 msgstr "リポジトリは %s されています"
 
-#: rhodecode/controllers/admin/repos.py:476
-msgid "Updated repository visibility in public journal"
-msgstr "公開ジャーナルでのリポジトリの可視性を更新しました"
-
-#: rhodecode/controllers/admin/repos.py:480
-msgid "An error occurred during setting this repository in public journal"
-msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302
-msgid "Token mismatch"
-msgstr "トークンが合いません"
-
-#: rhodecode/controllers/admin/repos.py:498
+#: rhodecode/controllers/admin/repos.py:616
+msgid "Cache invalidation successful"
+msgstr "キャッシュの無効化に成功しました"
+
+#: rhodecode/controllers/admin/repos.py:620
+msgid "An error occurred during cache invalidation"
+msgstr "キャッシュの無効化中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/repos.py:635
 msgid "Pulled from remote location"
 msgstr "リモートから取得"
 
-#: rhodecode/controllers/admin/repos.py:501
+#: rhodecode/controllers/admin/repos.py:638
 msgid "An error occurred during pull from remote location"
 msgstr "リモートから取得中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:517
-msgid "Nothing"
-msgstr "ありません"
-
-#: rhodecode/controllers/admin/repos.py:519
-#, python-format
-msgid "Marked repo %s as fork of %s"
-msgstr "%s リポジトリを %s のフォークとして印をつける"
-
-#: rhodecode/controllers/admin/repos.py:523
-msgid "An error occurred during this operation"
-msgstr "操作中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/repos.py:562
-msgid "An error occurred during creation of field"
-msgstr "フィールドの作成中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/repos.py:576
-msgid "An error occurred during removal of field"
-msgstr "フィールドの削除中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/repos_groups.py:147
-#, python-format
-msgid "Created repository group %s"
-msgstr "リポジトリグループ %s を作成しました"
-
-#: rhodecode/controllers/admin/repos_groups.py:159
-#, python-format
-msgid "Error occurred during creation of repository group %s"
-msgstr "リポジトリグループ %s の作成中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/repos_groups.py:217
-#, python-format
-msgid "Updated repository group %s"
-msgstr "リポジトリグループ %s を更新しました"
-
-#: rhodecode/controllers/admin/repos_groups.py:232
-#, python-format
-msgid "Error occurred during update of repository group %s"
-msgstr "リポジトリグループ %s の更新中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/repos_groups.py:250
-#, python-format
-msgid "This group contains %s repositores and cannot be deleted"
-msgstr "このグループは %s リポジトリを含んでいるため削除出来ません"
-
-#: rhodecode/controllers/admin/repos_groups.py:257
-#, python-format
-msgid "This group contains %s subgroups and cannot be deleted"
-msgstr "このグループは %s サブグループを含んでいるため削除出来ません"
-
-#: rhodecode/controllers/admin/repos_groups.py:263
-#, python-format
-msgid "Removed repository group %s"
-msgstr "リポジトリグループ %s を削除しました"
-
-#: rhodecode/controllers/admin/repos_groups.py:268
-#, python-format
-msgid "Error occurred during deletion of repository group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:279
-#: rhodecode/controllers/admin/repos_groups.py:314
-#: rhodecode/controllers/admin/users_groups.py:300
-msgid "Cannot revoke permission for yourself as admin"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:294
-msgid "Repository Group permissions updated"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:123
+#: rhodecode/controllers/admin/repos.py:671
+msgid "An error occurred during deletion of repository stats"
+msgstr "リポジトリステートの削除中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/settings.py:171
+msgid "Updated VCS settings"
+msgstr "VCS設定を更新しました"
+
+#: rhodecode/controllers/admin/settings.py:175
+msgid ""
+"Unable to activate hgsubversion support. The \"hgsubversion\" library is "
+"missing"
+msgstr "\"hgsubversion\"ライブラリが見つからないため、hgsubversionサポートを有効に出来ません。"
+
+#: rhodecode/controllers/admin/settings.py:181
+#: rhodecode/controllers/admin/settings.py:273
+msgid "Error occurred during updating application settings"
+msgstr "アプリケーション設定の更新中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/settings.py:214
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s"
 
-#: rhodecode/controllers/admin/settings.py:132
-msgid "Whoosh reindex task scheduled"
-msgstr "Whooshの再インデックスタスクを予定に入れました"
-
-#: rhodecode/controllers/admin/settings.py:163
+#: rhodecode/controllers/admin/settings.py:269
 msgid "Updated application settings"
 msgstr "アプリケーション設定を更新しました"
 
-#: rhodecode/controllers/admin/settings.py:167
-#: rhodecode/controllers/admin/settings.py:304
-msgid "Error occurred during updating application settings"
-msgstr "アプリケーション設定の更新中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/settings.py:219
+#: rhodecode/controllers/admin/settings.py:326
 msgid "Updated visualisation settings"
 msgstr "表示設定を更新しました"
 
-#: rhodecode/controllers/admin/settings.py:224
+#: rhodecode/controllers/admin/settings.py:331
 msgid "Error occurred during updating visualisation settings"
 msgstr "表示設定の更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/settings.py:300
-msgid "Updated VCS settings"
-msgstr "VCS設定を更新しました"
-
-#: rhodecode/controllers/admin/settings.py:314
+#: rhodecode/controllers/admin/settings.py:357
+msgid "Please enter email address"
+msgstr "メールアドレスを入力してください"
+
+#: rhodecode/controllers/admin/settings.py:369
+msgid "Send email task created"
+msgstr "メール送信タスクを作成しました"
+
+#: rhodecode/controllers/admin/settings.py:399
 msgid "Added new hook"
 msgstr "新しいフックを追加しました"
 
-#: rhodecode/controllers/admin/settings.py:326
+#: rhodecode/controllers/admin/settings.py:413
 msgid "Updated hooks"
 msgstr "フックを更新しました"
 
-#: rhodecode/controllers/admin/settings.py:330
+#: rhodecode/controllers/admin/settings.py:417
 msgid "Error occurred during hook creation"
 msgstr "フックの作成中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/settings.py:349
-msgid "Email task created"
-msgstr "メールのタスクを作成しました"
-
-#: rhodecode/controllers/admin/settings.py:413
-msgid "You can't edit this user since it's crucial for entire application"
-msgstr "このユーザーを編集出来ません。このユーザーはアプリケーションにとって必要不可欠です。"
-
-#: rhodecode/controllers/admin/settings.py:455
-msgid "Your account was updated successfully"
-msgstr "アカウントを更新しました"
-
-#: rhodecode/controllers/admin/settings.py:470
-#: rhodecode/controllers/admin/users.py:198
-#, python-format
-msgid "Error occurred during update of user %s"
-msgstr "ユーザー %s の更新中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/users.py:130
+#: rhodecode/controllers/admin/settings.py:443
+msgid "Whoosh reindex task scheduled"
+msgstr "Whooshの再インデックスタスクを予定に入れました"
+
+#: rhodecode/controllers/admin/settings.py:535
+msgid "Updated license information"
+msgstr "ライセンス情報を更新しました"
+
+#: rhodecode/controllers/admin/settings.py:540
+msgid "Error occurred during updating license info"
+msgstr "ライセンス情報の更新中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/settings.py:563
+#, python-format
+msgid ""
+"Your license will expire on %s, please contact support to extend your "
+"license."
+msgstr "%s にライセンスが失効します。サポート窓口に連絡してライセンスを延長してください。"
+
+#: rhodecode/controllers/admin/settings.py:566
+#, python-format
+msgid ""
+"Your license has expired on %s, please contact support to extend your "
+"license."
+msgstr "%s にライセンスが失効しました。サポート窓口に連絡してライセンスを延長してください。"
+
+#: rhodecode/controllers/admin/settings.py:571
+msgid ""
+"Unexpected error while reading license key. Please make sure your license "
+"token and key are correct"
+msgstr "ライセンスキーの読み込み中に予期しないエラーが発生しました。正しいライセンストークンとキーを使っているか確かめてください"
+
+#: rhodecode/controllers/admin/user_groups.py:148
+#, python-format
+msgid "Created user group %s"
+msgstr "ユーザーグループ %s を作成しました"
+
+#: rhodecode/controllers/admin/user_groups.py:159
+#, python-format
+msgid "Error occurred during creation of user group %s"
+msgstr "ユーザーグループ %s の作成中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/user_groups.py:197
+#, python-format
+msgid "Updated user group %s"
+msgstr "ユーザーグループ %s を更新しました"
+
+#: rhodecode/controllers/admin/user_groups.py:219
+#, python-format
+msgid "Error occurred during update of user group %s"
+msgstr "ユーザーグループ %s の更新中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/user_groups.py:237
+msgid "Successfully deleted user group"
+msgstr "ユーザーグループの削除に成功しました"
+
+#: rhodecode/controllers/admin/user_groups.py:242
+msgid "An error occurred during deletion of user group"
+msgstr "ユーザーグループの削除中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/user_groups.py:309
+msgid "Target group cannot be the same"
+msgstr "対象に同じ物を選ぶことはできません"
+
+#: rhodecode/controllers/admin/user_groups.py:315
+msgid "User Group permissions updated"
+msgstr "ユーザーグループ権限を更新しました"
+
+#: rhodecode/controllers/admin/user_groups.py:435
+#: rhodecode/controllers/admin/users.py:395
+msgid "Updated permissions"
+msgstr "権限を更新しました"
+
+#: rhodecode/controllers/admin/user_groups.py:439
+#: rhodecode/controllers/admin/users.py:399
+msgid "An error occurred during permissions saving"
+msgstr "権限の保存時にエラーが発生しました"
+
+#: rhodecode/controllers/admin/users.py:133
 #, python-format
 msgid "Created user %s"
 msgstr "ユーザー %s を作成しました"
 
-#: rhodecode/controllers/admin/users.py:142
+#: rhodecode/controllers/admin/users.py:147
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr "ユーザー %s の作成中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:176
+#: rhodecode/controllers/admin/users.py:186
 msgid "User updated successfully"
 msgstr "ユーザーの更新に成功しました"
 
-#: rhodecode/controllers/admin/users.py:214
+#: rhodecode/controllers/admin/users.py:221
 msgid "Successfully deleted user"
 msgstr "ユーザーの削除に成功しました"
 
-#: rhodecode/controllers/admin/users.py:219
+#: rhodecode/controllers/admin/users.py:226
 msgid "An error occurred during deletion of user"
 msgstr "ユーザーの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:234
+#: rhodecode/controllers/admin/users.py:240
+#: rhodecode/controllers/admin/users.py:258
+#: rhodecode/controllers/admin/users.py:281
+#: rhodecode/controllers/admin/users.py:306
+#: rhodecode/controllers/admin/users.py:319
+#: rhodecode/controllers/admin/users.py:343
+#: rhodecode/controllers/admin/users.py:406
+#: rhodecode/controllers/admin/users.py:453
 msgid "You can't edit this user"
 msgstr "このユーザーは編集できません"
 
-#: rhodecode/controllers/admin/users.py:293
-#: rhodecode/controllers/admin/users_groups.py:372
-msgid "Updated permissions"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:297
-#: rhodecode/controllers/admin/users_groups.py:376
-msgid "An error occurred during permissions saving"
-msgstr "権限の保存時にエラーが発生しました"
-
-#: rhodecode/controllers/admin/users.py:311
-#, python-format
-msgid "Added email %s to user"
-msgstr "ユーザーにメール %s を追加しました"
-
-#: rhodecode/controllers/admin/users.py:317
-msgid "An error occurred during email saving"
-msgstr "メールの保存時にエラーが発生しました"
-
-#: rhodecode/controllers/admin/users.py:327
-msgid "Removed email from user"
-msgstr "ユーザーからメールを削除しました"
-
-#: rhodecode/controllers/admin/users.py:340
-#, python-format
-msgid "Added ip %s to user"
-msgstr "ユーザーにIPアドレス %s を追加しました"
-
-#: rhodecode/controllers/admin/users.py:346
+#: rhodecode/controllers/admin/users.py:481
+#, python-format
+msgid "Added ip %s to user whitelist"
+msgstr "ユーザーホワイトリストにIP %s を追加しました"
+
+#: rhodecode/controllers/admin/users.py:487
 msgid "An error occurred during ip saving"
 msgstr "IPアドレスの保存中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:358
-msgid "Removed ip from user"
-msgstr "ユーザーからIPアドレスを削除しました"
-
-#: rhodecode/controllers/admin/users_groups.py:162
-#, python-format
-msgid "Created user group %s"
-msgstr "ユーザーグループ %s を作成しました"
-
-#: rhodecode/controllers/admin/users_groups.py:173
-#, python-format
-msgid "Error occurred during creation of user group %s"
-msgstr "ユーザーグループ %s の作成中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/users_groups.py:210
-#, python-format
-msgid "Updated user group %s"
-msgstr "ユーザーグループ %s を更新しました"
-
-#: rhodecode/controllers/admin/users_groups.py:232
-#, python-format
-msgid "Error occurred during update of user group %s"
-msgstr "ユーザーグループ %s の更新中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/users_groups.py:250
-msgid "Successfully deleted user group"
-msgstr "ユーザーグループの削除に成功しました"
-
-#: rhodecode/controllers/admin/users_groups.py:255
-msgid "An error occurred during deletion of user group"
-msgstr "ユーザーグループの削除中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/users_groups.py:274
-msgid "Target group cannot be the same"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:280
-msgid "User Group permissions updated"
-msgstr ""
-
-#: rhodecode/lib/auth.py:544
+#: rhodecode/controllers/admin/users.py:501
+msgid "Removed ip address from user whitelist"
+msgstr "ユーザーホワイトリストからIPアドレスを削除しました"
+
+#: rhodecode/lib/auth.py:746
 #, python-format
 msgid "IP %s not allowed"
 msgstr "IPアドレス %s は許可されません"
 
-#: rhodecode/lib/auth.py:593
+#: rhodecode/lib/auth.py:807
 msgid "You need to be a registered user to perform this action"
-msgstr "このアクションを実行するためには登録ユーザーである必要があります"
-
-#: rhodecode/lib/auth.py:634
+msgstr "このアクションを実行するためには登録済みのユーザーである必要があります"
+
+#: rhodecode/lib/auth.py:844
 msgid "You need to be a signed in to view this page"
 msgstr "このページを閲覧するためにはサインインが必要です"
 
-#: rhodecode/lib/diffs.py:66
+#: rhodecode/lib/diffs.py:64
 msgid "Binary file"
 msgstr "バイナリファイル"
 
-#: rhodecode/lib/diffs.py:82
+#: rhodecode/lib/diffs.py:80
 msgid ""
 "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr "チェンジセットが大きすぎるため省略しました。差分を表示する場合は差分メニューを使用してください"
 
-#: rhodecode/lib/diffs.py:92
+#: rhodecode/lib/diffs.py:90
 msgid "No changes detected"
 msgstr "検出された変更はありません"
 
-#: rhodecode/lib/helpers.py:539
-msgid "True"
-msgstr "True"
-
-#: rhodecode/lib/helpers.py:542
-msgid "False"
-msgstr "False"
-
-#: rhodecode/lib/helpers.py:580
+#: rhodecode/lib/helpers.py:598
 #, python-format
 msgid "Deleted branch: %s"
 msgstr "削除されたブランチ: %s"
 
-#: rhodecode/lib/helpers.py:583
+#: rhodecode/lib/helpers.py:601
 #, python-format
 msgid "Created tag: %s"
 msgstr "作成したタグ: %s"
 
-#: rhodecode/lib/helpers.py:596
+#: rhodecode/lib/helpers.py:614
 msgid "Changeset not found"
 msgstr "リビジョンが見つかりません"
 
-#: rhodecode/lib/helpers.py:646
+#: rhodecode/lib/helpers.py:664
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "%s から %s までのすべてのチェンジセットを表示"
 
-#: rhodecode/lib/helpers.py:652
+#: rhodecode/lib/helpers.py:670
 msgid "compare view"
-msgstr "比較の表示"
-
-#: rhodecode/lib/helpers.py:672
+msgstr "比較ビュー"
+
+#: rhodecode/lib/helpers.py:690
 msgid "and"
 msgstr "と"
 
-#: rhodecode/lib/helpers.py:673
+#: rhodecode/lib/helpers.py:691
 #, python-format
 msgid "%s more"
 msgstr "%s 以上"
 
-#: rhodecode/lib/helpers.py:674
-#: rhodecode/templates/changelog/changelog.html:53
+#: rhodecode/lib/helpers.py:692
+#: rhodecode/templates/changelog/changelog.html:58
 msgid "revisions"
 msgstr "リビジョン"
 
-#: rhodecode/lib/helpers.py:698
+#: rhodecode/lib/helpers.py:716
 #, python-format
 msgid "fork name %s"
 msgstr "フォーク名 %s"
 
-#: rhodecode/lib/helpers.py:715
-#: rhodecode/templates/pullrequests/pullrequest_show.html:8
+#: rhodecode/lib/helpers.py:733
+#: rhodecode/templates/pullrequests/pullrequest_show.html:11
 #, python-format
 msgid "Pull request #%s"
 msgstr "プルリクエスト #%s"
 
-#: rhodecode/lib/helpers.py:725
+#: rhodecode/lib/helpers.py:743
 msgid "[deleted] repository"
 msgstr "リポジトリを[削除]"
 
-#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739
+#: rhodecode/lib/helpers.py:745 rhodecode/lib/helpers.py:757
 msgid "[created] repository"
 msgstr "リポジトリを[作成]"
 
-#: rhodecode/lib/helpers.py:729
+#: rhodecode/lib/helpers.py:747
 msgid "[created] repository as fork"
 msgstr "フォークしてリポジトリを[作成]"
 
-#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741
+#: rhodecode/lib/helpers.py:749 rhodecode/lib/helpers.py:759
 msgid "[forked] repository"
 msgstr "リポジトリを[フォーク]"
 
-#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743
+#: rhodecode/lib/helpers.py:751 rhodecode/lib/helpers.py:761
 msgid "[updated] repository"
 msgstr "リポジトリを[更新]"
 
-#: rhodecode/lib/helpers.py:735
+#: rhodecode/lib/helpers.py:753
 msgid "[downloaded] archive from repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:737
+msgstr "リポジトリからアーカイブを[ダウンロード]"
+
+#: rhodecode/lib/helpers.py:755
 msgid "[delete] repository"
 msgstr "リポジトリを[削除]"
 
-#: rhodecode/lib/helpers.py:745
+#: rhodecode/lib/helpers.py:763
 msgid "[created] user"
 msgstr "ユーザーを[作成]"
 
-#: rhodecode/lib/helpers.py:747
+#: rhodecode/lib/helpers.py:765
 msgid "[updated] user"
 msgstr "ユーザーを[更新]"
 
-#: rhodecode/lib/helpers.py:749
+#: rhodecode/lib/helpers.py:767
 msgid "[created] user group"
 msgstr "ユーザーグループを[作成]"
 
-#: rhodecode/lib/helpers.py:751
+#: rhodecode/lib/helpers.py:769
 msgid "[updated] user group"
 msgstr "ユーザーグループを[更新]"
 
-#: rhodecode/lib/helpers.py:753
+#: rhodecode/lib/helpers.py:771
 msgid "[commented] on revision in repository"
 msgstr "リポジトリのリビジョンに[コメント]"
 
-#: rhodecode/lib/helpers.py:755
+#: rhodecode/lib/helpers.py:773
 msgid "[commented] on pull request for"
 msgstr "プルリクエストに[コメント]"
 
-#: rhodecode/lib/helpers.py:757
+#: rhodecode/lib/helpers.py:775
 msgid "[closed] pull request for"
 msgstr "プルリクエストを[クローズ]"
 
-#: rhodecode/lib/helpers.py:759
+#: rhodecode/lib/helpers.py:777
 msgid "[pushed] into"
 msgstr "[プッシュ]"
 
-#: rhodecode/lib/helpers.py:761
+#: rhodecode/lib/helpers.py:779
 msgid "[committed via RhodeCode] into repository"
 msgstr "リポジトリに[RhodeCode経由でコミット]"
 
-#: rhodecode/lib/helpers.py:763
+#: rhodecode/lib/helpers.py:781
 msgid "[pulled from remote] into repository"
 msgstr "リポジトリに[リモートからプル]"
 
-#: rhodecode/lib/helpers.py:765
+#: rhodecode/lib/helpers.py:783
 msgid "[pulled] from"
 msgstr "[プル]"
 
-#: rhodecode/lib/helpers.py:767
+#: rhodecode/lib/helpers.py:785
 msgid "[started following] repository"
 msgstr "リポジトリの[フォローを開始]"
 
-#: rhodecode/lib/helpers.py:769
+#: rhodecode/lib/helpers.py:787
 msgid "[stopped following] repository"
 msgstr "リポジトリの[フォローを停止]"
 
-#: rhodecode/lib/helpers.py:1088
+#: rhodecode/lib/helpers.py:1102
 #, python-format
 msgid " and %s more"
 msgstr " と %s 以上"
 
-#: rhodecode/lib/helpers.py:1092
+#: rhodecode/lib/helpers.py:1106
 msgid "No Files"
 msgstr "ファイルなし"
 
-#: rhodecode/lib/helpers.py:1158
+#: rhodecode/lib/helpers.py:1172
 msgid "new file"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:1161
+msgstr "新しいファイル"
+
+#: rhodecode/lib/helpers.py:1175
 msgid "mod"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:1164
+msgstr "変更"
+
+#: rhodecode/lib/helpers.py:1178
 msgid "del"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:1167
+msgstr "削除"
+
+#: rhodecode/lib/helpers.py:1181
 msgid "rename"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:1172
+msgstr "リネーム"
+
+#: rhodecode/lib/helpers.py:1186
 msgid "chmod"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:1404
+msgstr "chmod"
+
+#: rhodecode/lib/helpers.py:1418
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from the"
 " filesystem please run the application again in order to rescan repositories"
 msgstr "%s リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。"
 
-#: rhodecode/lib/unionrepo.py:193
-msgid "cannot create new union repository"
-msgstr "新しいユニオンリポジトリは作成できません"
-
-#: rhodecode/lib/utils2.py:410
+#: rhodecode/lib/utils2.py:413
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d 年"
 
-#: rhodecode/lib/utils2.py:411
+#: rhodecode/lib/utils2.py:414
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d ヶ月"
 
-#: rhodecode/lib/utils2.py:412
+#: rhodecode/lib/utils2.py:415
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 
-#: rhodecode/lib/utils2.py:413
+#: rhodecode/lib/utils2.py:416
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 時間"
 
-#: rhodecode/lib/utils2.py:414
+#: rhodecode/lib/utils2.py:417
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 
-#: rhodecode/lib/utils2.py:415
+#: rhodecode/lib/utils2.py:418
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 
-#: rhodecode/lib/utils2.py:431
+#: rhodecode/lib/utils2.py:434
 #, python-format
 msgid "in %s"
-msgstr ""
-
-#: rhodecode/lib/utils2.py:433
+msgstr "%s 以内"
+
+#: rhodecode/lib/utils2.py:436
 #, python-format
 msgid "%s ago"
 msgstr "%s 前"
 
-#: rhodecode/lib/utils2.py:435
+#: rhodecode/lib/utils2.py:438
 #, python-format
 msgid "in %s and %s"
-msgstr ""
-
-#: rhodecode/lib/utils2.py:438
+msgstr "%s と %s の間"
+
+#: rhodecode/lib/utils2.py:441
 #, python-format
 msgid "%s and %s ago"
 msgstr "%s と %s 前"
 
-#: rhodecode/lib/utils2.py:441
+#: rhodecode/lib/utils2.py:444
 msgid "just now"
-msgstr "ちょうどいま"
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
+msgstr "たったいま"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1454
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1511
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1572
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1622
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1649 rhodecode/model/db.py:1659
 msgid "Repository no access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
+msgstr "リポジトリへのアクセス権限無し"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1455
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1573
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1623
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1650 rhodecode/model/db.py:1660
 msgid "Repository read access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
+msgstr "リポジトリに読込権限でアクセス"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1456
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1574
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1651 rhodecode/model/db.py:1661
 msgid "Repository write access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
+msgstr "リポジトリに書込権限でアクセス"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1167
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1457
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1515
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1575
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1652 rhodecode/model/db.py:1662
 msgid "Repository admin access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
+msgstr "リポジトリに管理権限でアクセス"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308
 msgid "Repositories Group no access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
+msgstr "リポジトリグループへのアクセス権限なし"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309
 msgid "Repositories Group read access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
+msgstr "リポジトリグループに読込権限でアクセス"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310
 msgid "Repositories Group write access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
+msgstr "リポジトリグループに書込権限でアクセス"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311
 msgid "Repositories Group admin access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
+msgstr "リポジトリグループに管理権限でアクセス"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1452
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1509
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1510
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1570
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1620
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1647 rhodecode/model/db.py:1657
 msgid "RhodeCode Administrator"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
+msgstr "RhodeCode 管理者"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1475
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1532
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1554
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1593
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1670 rhodecode/model/db.py:1680
 msgid "Repository creation disabled"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
+msgstr "リポジトリの作成を有効にする"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1476
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1555
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1594
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1671 rhodecode/model/db.py:1681
 msgid "Repository creation enabled"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
+msgstr "リポジトリの作成を有効にする"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1478
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1557
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1596
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1648
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1675 rhodecode/model/db.py:1685
 msgid "Repository forking disabled"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
+msgstr "リポジトリのフォークを無効にする"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1479
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1537
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1558
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1597
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1649
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1676 rhodecode/model/db.py:1686
 msgid "Repository forking enabled"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
+msgstr "リポジトリのフォークを有効にする"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1403
 msgid "Register disabled"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
+msgstr "新規登録を無効にする"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1180
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1404
 msgid "Register new user with RhodeCode with manual activation"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
+msgstr "Rhodecodeに登録した新しいユーザーを手動でアクティベートする"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1183
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1407
 msgid "Register new user with RhodeCode with auto activation"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643
+msgstr "Rhodecodeに登録した新しいユーザーを自動でアクティベートする"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1651
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1980
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2040
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2062
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2101
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2154
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2200 rhodecode/model/db.py:2210
 msgid "Not Reviewed"
 msgstr "未レビュー"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1652
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1981
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2063
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2102
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2155
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2201 rhodecode/model/db.py:2211
 msgid "Approved"
 msgstr "承認"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1653
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1982
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2064
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2103
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2156
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2202 rhodecode/model/db.py:2212
 msgid "Rejected"
 msgstr "却下"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1654
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1983
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2044
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2065
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2104
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2157
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2203 rhodecode/model/db.py:2213
 msgid "Under Review"
 msgstr "レビュー中"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1300
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1357
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1358
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1379
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1471
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1498 rhodecode/model/db.py:1508
 msgid "top level"
-msgstr ""
+msgstr "top level"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1459
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1516
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1577
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1654 rhodecode/model/db.py:1664
 msgid "Repository group no access"
-msgstr ""
+msgstr "リポジトリグループへのアクセス権限なし"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1460
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1578
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1628
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1655 rhodecode/model/db.py:1665
 msgid "Repository group read access"
-msgstr ""
+msgstr "リポジトリグループに読込権限でアクセス"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1461
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1579
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1629
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1656 rhodecode/model/db.py:1666
 msgid "Repository group write access"
-msgstr ""
+msgstr "リポジトリグループに書込権限でアクセス"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1462
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1520
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1580
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1630
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1657 rhodecode/model/db.py:1667
 msgid "Repository group admin access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423
+msgstr "リポジトリグループに管理権限でアクセス"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1464
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1521
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1582
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1632
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1659 rhodecode/model/db.py:1669
 msgid "User group no access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424
+msgstr "ユーザーグループへのアクセス権限なし"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1465
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1583
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1633
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1660 rhodecode/model/db.py:1670
 msgid "User group read access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425
+msgstr "ユーザーグループに読込権限でアクセス"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1466
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1545
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1584
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1634
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1661 rhodecode/model/db.py:1671
 msgid "User group write access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426
+msgstr "ユーザーグループに書込権限でアクセス"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1467
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1525
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1546
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1585
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1635
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1662 rhodecode/model/db.py:1672
 msgid "User group admin access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428
+msgstr "ユーザーグループに管理権限でアクセス"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1469
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1526
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1548
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1587
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1637
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1664 rhodecode/model/db.py:1674
 msgid "Repository Group creation disabled"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429
+msgstr "リポジトリグループの作成を無効にする"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1470
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1528
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1549
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1588
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1638
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1665 rhodecode/model/db.py:1675
 msgid "Repository Group creation enabled"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431
+msgstr "リポジトリグループの作成を有効にする"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1472
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1529
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1551
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1590
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1640
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1667 rhodecode/model/db.py:1677
 msgid "User Group creation disabled"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432
+msgstr "ユーザーグループの作成を無効にする"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1473
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1552
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1591
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1641
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1668 rhodecode/model/db.py:1678
 msgid "User Group creation enabled"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440
+msgstr "ユーザーグループの作成を有効にする"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1481
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1560
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1599
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1651
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1678 rhodecode/model/db.py:1688
 msgid "Registration disabled"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441
+msgstr "新規登録を無効にする"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1482
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1561
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1600
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1652
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1679 rhodecode/model/db.py:1689
 msgid "User Registration with manual account activation"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442
+msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1483
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1562
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1601
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1653
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1680 rhodecode/model/db.py:1690
 msgid "User Registration with automatic account activation"
-msgstr ""
+msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする"
+
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1672 rhodecode/model/db.py:1682
+msgid ""
+"Repository creation enabled with write permission to a repository group"
+msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です"
+
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1673 rhodecode/model/db.py:1683
+msgid ""
+"Repository creation disabled with write permission to a repository group"
+msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です"
 
 #: rhodecode/model/comment.py:75
 #, python-format
 msgid "on line %s"
-msgstr ""
+msgstr "%s 行目"
 
 #: rhodecode/model/comment.py:220
 msgid "[Mention]"
 msgstr "[Mention]"
 
-#: rhodecode/model/forms.py:43
+#: rhodecode/model/forms.py:57
 msgid "Please enter a login"
 msgstr "ログイン名を入力してください"
 
-#: rhodecode/model/forms.py:44
+#: rhodecode/model/forms.py:58
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr "%(min)i 文字以上必要です"
 
-#: rhodecode/model/forms.py:52
+#: rhodecode/model/forms.py:66
 msgid "Please enter a password"
 msgstr "パスワードを入力してください"
 
-#: rhodecode/model/forms.py:53
+#: rhodecode/model/forms.py:67
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr "%(min)i 文字以上必要です"
 
-#: rhodecode/model/notification.py:228
+#: rhodecode/model/forms.py:156
+msgid "Name must not contain only digits"
+msgstr "数字だけの名前は使えません"
+
+#: rhodecode/model/notification.py:229
 #, python-format
 msgid "%(user)s commented on changeset at %(when)s"
-msgstr "%(user)s がコミットにコメント %(when)s"
-
-#: rhodecode/model/notification.py:229
+msgstr "%(user)s がチェンジセットにコメント %(when)s"
+
+#: rhodecode/model/notification.py:230
 #, python-format
 msgid "%(user)s sent message at %(when)s"
 msgstr "%(user)s がメッセージを送信 %(when)s"
 
-#: rhodecode/model/notification.py:230
+#: rhodecode/model/notification.py:231
 #, python-format
 msgid "%(user)s mentioned you at %(when)s"
-msgstr "%(user)s があなたにメンション %(when)s"
-
-#: rhodecode/model/notification.py:231
+msgstr "%(user)s がにあなたにメンション %(when)s"
+
+#: rhodecode/model/notification.py:232
 #, python-format
 msgid "%(user)s registered in RhodeCode at %(when)s"
 msgstr "%(user)s がRhodeCodeに登録 %(when)s"
 
-#: rhodecode/model/notification.py:232
+#: rhodecode/model/notification.py:233
 #, python-format
 msgid "%(user)s opened new pull request at %(when)s"
 msgstr "%(user)s が新しいプルリクエストを作成 %(when)s"
 
-#: rhodecode/model/notification.py:233
+#: rhodecode/model/notification.py:234
 #, python-format
 msgid "%(user)s commented on pull request at %(when)s"
 msgstr "%(user)s がプルリクエストにコメント %(when)s"
 
-#: rhodecode/model/pull_request.py:98
+#: rhodecode/model/pull_request.py:105
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
-msgstr "%(user)s がプリリクエスト #%(pr_id)s のレビューを求めています %(pr_title)s"
-
-#: rhodecode/model/scm.py:674
+msgstr "%(user)s がプリリクエスト #%(pr_id)s: %(pr_title)s のレビューを求めています"
+
+#: rhodecode/model/scm.py:808
 msgid "latest tip"
 msgstr "最新のtip"
 
-#: rhodecode/model/user.py:232
+#: rhodecode/model/user.py:196
 msgid "New user registration"
 msgstr "新規ユーザー登録"
 
-#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
+#: rhodecode/model/user.py:220 rhodecode/model/user.py:245
 msgid "You can't Edit this user since it's crucial for entire application"
-msgstr "アプリケーション全体にとって重要なユーザなため、編集出来ません"
-
-#: rhodecode/model/user.py:303
+msgstr "このユーザーを編集できません。このユーザーはアプリケーションにとって必要不可欠です。"
+
+#: rhodecode/model/user.py:268
 msgid "You can't remove this user since it's crucial for entire application"
-msgstr "アプリケーション全体にとって重要なユーザなため、削除できません"
-
-#: rhodecode/model/user.py:309
+msgstr "このユーザーを削除できません。このユーザーはアプリケーションにとって必要不可欠です。"
+
+#: rhodecode/model/user.py:274
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch owners "
 "or remove those repositories. %s"
-msgstr ""
-
-#: rhodecode/model/user.py:334
+msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください。 %s"
+
+#: rhodecode/model/user.py:302
 msgid "Password reset link"
 msgstr "パスワードリセットのリンク"
 
-#: rhodecode/model/user.py:366
+#: rhodecode/model/user.py:331
 msgid "Your new password"
 msgstr "新しいパスワード"
 
-#: rhodecode/model/user.py:367
+#: rhodecode/model/user.py:332
 #, python-format
 msgid "Your new RhodeCode password:%s"
 msgstr "新しいRhodeCodeパスワード:%s"
 
-#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39
+#: rhodecode/model/validators.py:82 rhodecode/model/validators.py:83
 msgid "Value cannot be an empty list"
-msgstr "空のリストには出来ません"
-
-#: rhodecode/model/validators.py:85
+msgstr "空のリストにはできません"
+
+#: rhodecode/model/validators.py:120
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "ユーザー名 \"%(username)s\" はすでに使われています"
 
-#: rhodecode/model/validators.py:87
+#: rhodecode/model/validators.py:122
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr "ユーザー名 \"%(username)s\" は許可されていません"
 
-#: rhodecode/model/validators.py:89
+#: rhodecode/model/validators.py:124
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or "
 "dashes and must begin with alphanumeric character or underscore"
-msgstr ""
-
-#: rhodecode/model/validators.py:117
+msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットまたはアンダースコア(_)から始まる必要があります"
+
+#: rhodecode/model/validators.py:151
+msgid "The input is not valid"
+msgstr "入力が正しくありません"
+
+#: rhodecode/model/validators.py:158
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr "ユーザー名 %(username)s は不正です"
 
-#: rhodecode/model/validators.py:136
+#: rhodecode/model/validators.py:177
 msgid "Invalid user group name"
 msgstr "不正なユーザーグループ名です"
 
-#: rhodecode/model/validators.py:137
+#: rhodecode/model/validators.py:178
 #, python-format
 msgid "User group \"%(usergroup)s\" already exists"
 msgstr "ユーザーグループ \"%(usergroup)s\" はすでに存在します"
 
-#: rhodecode/model/validators.py:139
+#: rhodecode/model/validators.py:180
 msgid ""
 "user group name may only contain alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります "
 
-#: rhodecode/model/validators.py:177
+#: rhodecode/model/validators.py:218
 msgid "Cannot assign this group as parent"
 msgstr "このグループは親にできません"
 
-#: rhodecode/model/validators.py:178
+#: rhodecode/model/validators.py:219
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "グループ \"%(group_name)s\" はすでに存在します"
 
-#: rhodecode/model/validators.py:180
+#: rhodecode/model/validators.py:221
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "グループ名 \"%(group_name)s\" を持つリポジトリはすでに存在します"
 
-#: rhodecode/model/validators.py:238
+#: rhodecode/model/validators.py:279
 msgid "Invalid characters (non-ascii) in password"
 msgstr "パスワードに利用出来ない文字列(non-ascii)です"
 
-#: rhodecode/model/validators.py:253
+#: rhodecode/model/validators.py:294
+msgid "Invalid old password"
+msgstr ""
+
+#: rhodecode/model/validators.py:310
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: rhodecode/model/validators.py:270
+#: rhodecode/model/validators.py:327
 msgid "invalid password"
 msgstr "不正なパスワードです"
 
-#: rhodecode/model/validators.py:271
+#: rhodecode/model/validators.py:328
 msgid "invalid user name"
 msgstr "不正なユーザー名です"
 
-#: rhodecode/model/validators.py:272
+#: rhodecode/model/validators.py:329
 msgid "Your account is disabled"
 msgstr "アカウントは無効です"
 
-#: rhodecode/model/validators.py:316
+#: rhodecode/model/validators.py:373
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr "リポジトリ名 %(repo)s は許可されていません"
 
-#: rhodecode/model/validators.py:318
+#: rhodecode/model/validators.py:375
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "リポジトリ %(repo)s はすでに存在します"
 
-#: rhodecode/model/validators.py:319
+#: rhodecode/model/validators.py:376
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "リポジトリ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します"
 
-#: rhodecode/model/validators.py:321
+#: rhodecode/model/validators.py:378
 #, python-format
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr "リポジトリグループ名 \"%(repo)s\" はすでに存在します"
 
-#: rhodecode/model/validators.py:438
+#: rhodecode/model/validators.py:493
 msgid "invalid clone url"
 msgstr "無効なクローンURIです"
 
-#: rhodecode/model/validators.py:439
+#: rhodecode/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr "無効なクローンURIです。有効な http(s)/svn+http(s) のURIを指定してください"
 
-#: rhodecode/model/validators.py:464
+#: rhodecode/model/validators.py:519
 msgid "Fork have to be the same type as parent"
-msgstr "フォークは親と同じタイプの必要があります"
-
-#: rhodecode/model/validators.py:479
+msgstr "フォークは親と同じ種別の必要があります"
+
+#: rhodecode/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
-msgstr "このグループでリポジトリを作成する権限がありません"
-
-#: rhodecode/model/validators.py:481
+msgstr "このグループにリポジトリを作成する権限がありません"
+
+#: rhodecode/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr "ルートにリポジトリを作成する権限がありません"
 
-#: rhodecode/model/validators.py:518
+#: rhodecode/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
 msgstr "この場所にグループを作成する権限がありません"
 
-#: rhodecode/model/validators.py:559
+#: rhodecode/model/validators.py:626
 msgid "This username or user group name is not valid"
 msgstr "ユーザー名かユーザーグループが不正です"
 
-#: rhodecode/model/validators.py:652
+#: rhodecode/model/validators.py:719
 msgid "This is not a valid path"
 msgstr "不正なパスです"
 
-#: rhodecode/model/validators.py:667
+#: rhodecode/model/validators.py:734
 msgid "This e-mail address is already taken"
 msgstr "このメールアドレスはすでに取得されています"
 
-#: rhodecode/model/validators.py:687
+#: rhodecode/model/validators.py:754
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "メールアドレス \"%(email)s\" は存在しません"
 
-#: rhodecode/model/validators.py:724
+#: rhodecode/model/validators.py:791
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name of "
 "the attribute that is equivalent to \"username\""
 msgstr "LDAPのこのCNに対するログイン属性は必須です。 - これは \"ユーザー名\" と同じです"
 
-#: rhodecode/model/validators.py:737
+#: rhodecode/model/validators.py:804
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr "リビジョン %(revs)s はすでにプルリクエストの一部かステータスが設定されています"
 
-#: rhodecode/model/validators.py:769
+#: rhodecode/model/validators.py:836
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr "有効なIPv4かIPv6のアドレスを入力してください"
 
-#: rhodecode/model/validators.py:770
+#: rhodecode/model/validators.py:837
 #, python-format
 msgid ""
 "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
-msgstr ""
-
-#: rhodecode/model/validators.py:803
+msgstr "ネットワークサイズ (bits) は0-32の範囲にする必要があります ( %(bits)r は不正です)"
+
+#: rhodecode/model/validators.py:870
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr "キー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)、数字しか使えません。"
 
-#: rhodecode/model/validators.py:817
+#: rhodecode/model/validators.py:884
 msgid "Filename cannot be inside a directory"
-msgstr ""
+msgstr "ファイル名はディレクトリ内にすることはできません"
+
+#: rhodecode/model/validators.py:900
+#, python-format
+msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
+msgstr "%(loaded)s プラグインと %(next_to_load)s プラグインで同じ名前が使われています"
 
 #: rhodecode/templates/index.html:5
 msgid "Dashboard"
 msgstr "ダッシュボード"
 
 #: rhodecode/templates/index_base.html:6
-#: rhodecode/templates/repo_switcher_list.html:4
-#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/users/user_edit_my_account.html:31
-#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/bookmarks/bookmarks.html:9
-#: rhodecode/templates/branches/branches.html:9
-#: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:46
-#: rhodecode/templates/journal/journal.html:47
-#: rhodecode/templates/tags/tags.html:9
+#: rhodecode/templates/admin/my_account/my_account_repos.html:3
+#: rhodecode/templates/admin/my_account/my_account_watched.html:3
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:12
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:12
+#: rhodecode/templates/admin/users/users.html:12
+#: rhodecode/templates/bookmarks/bookmarks.html:12
+#: rhodecode/templates/branches/branches.html:12
+#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:50
+#: rhodecode/templates/tags/tags.html:12
 msgid "quick filter..."
 msgstr "クイックフィルタ..."
 
 #: rhodecode/templates/index_base.html:6
-#: rhodecode/templates/admin/repos/repos.html:9
+#: rhodecode/templates/admin/repos/repos.html:12
 msgid "repositories"
 msgstr "リポジトリ"
 
-#: rhodecode/templates/index_base.html:13
-#: rhodecode/templates/index_base.html:18
-#: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repos.html:22
-msgid "Add repository"
+#: rhodecode/templates/index_base.html:20
+#: rhodecode/templates/index_base.html:25
+#: rhodecode/templates/admin/repos/repo_add.html:22
+#: rhodecode/templates/admin/repos/repos.html:25
+msgid "Add Repository"
 msgstr "リポジトリを追加"
 
-#: rhodecode/templates/index_base.html:15
-#: rhodecode/templates/index_base.html:20
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31
-msgid "Add group"
-msgstr "グループを追加"
-
+#: rhodecode/templates/index_base.html:22
 #: rhodecode/templates/index_base.html:27
-msgid "Edit group"
-msgstr "グループを編集"
-
-#: rhodecode/templates/index_base.html:27
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:16
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:29
+msgid "Add Repository Group"
+msgstr "リポジトリグループを追加"
+
+#: rhodecode/templates/index_base.html:32
 msgid "You have admin right to this group, and can edit it"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:40
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43
-#: rhodecode/templates/admin/users_groups/users_group_add.html:32
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:33
-#: rhodecode/templates/admin/users_groups/users_groups.html:37
-msgid "Group name"
+msgstr "管理者権限をもっているため編集できます"
+
+#: rhodecode/templates/index_base.html:32
+msgid "Edit Repository Group"
+msgstr "リポジトリグループを編集"
+
+#: rhodecode/templates/index_base.html:45
+msgid "Group Name"
 msgstr "グループ名"
 
-#: rhodecode/templates/index_base.html:41
-#: rhodecode/templates/index_base.html:123
-#: rhodecode/templates/admin/repos/repo_add_base.html:56
-#: rhodecode/templates/admin/repos/repo_edit.html:68
-#: rhodecode/templates/admin/repos/repos.html:75
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44
-#: rhodecode/templates/email_templates/changeset_comment.html:9
+#: rhodecode/templates/index_base.html:46
+#: rhodecode/templates/index_base.html:128
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:64
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:45
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:17
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:32
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:72
+#: rhodecode/templates/admin/repos/repos.html:51
+#: rhodecode/templates/admin/user_groups/user_group_add.html:43
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:51
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:64
+#: rhodecode/templates/email_templates/changeset_comment.html:16
 #: rhodecode/templates/email_templates/pull_request.html:9
-#: rhodecode/templates/forks/fork.html:56
-#: rhodecode/templates/pullrequests/pullrequest.html:43
-#: rhodecode/templates/pullrequests/pullrequest_show.html:81
-#: rhodecode/templates/summary/summary.html:106
+#: rhodecode/templates/forks/fork.html:41
+#: rhodecode/templates/pullrequests/pullrequest.html:40
+#: rhodecode/templates/pullrequests/pullrequest_show.html:86
+#: rhodecode/templates/summary/summary.html:88
 msgid "Description"
 msgstr "説明"
 
-#: rhodecode/templates/index_base.html:51
-#: rhodecode/templates/admin/permissions/permissions.html:55
-#: rhodecode/templates/admin/repos/repo_add_base.html:29
-#: rhodecode/templates/admin/repos/repo_edit.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57
-#: rhodecode/templates/forks/fork.html:47
-msgid "Repository group"
-msgstr "リポジトリグループ"
-
-#: rhodecode/templates/index_base.html:121
+#: rhodecode/templates/index_base.html:126
+#: rhodecode/templates/admin/my_account/my_account_repos.html:46
+#: rhodecode/templates/admin/my_account/my_account_watched.html:46
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:50
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
-#: rhodecode/templates/admin/repos/repo_edit.html:32
-#: rhodecode/templates/admin/repos/repos.html:73
-#: rhodecode/templates/admin/users/user_edit_my_account.html:172
-#: rhodecode/templates/base/perms_summary.html:37
-#: rhodecode/templates/bookmarks/bookmarks.html:48
-#: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:47
-#: rhodecode/templates/branches/branches_data.html:6
-#: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:193
-#: rhodecode/templates/journal/journal.html:283
-#: rhodecode/templates/summary/summary.html:55
-#: rhodecode/templates/summary/summary.html:124
-#: rhodecode/templates/tags/tags.html:48
-#: rhodecode/templates/tags/tags_data.html:6
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:7
+#: rhodecode/templates/admin/repos/repos.html:50
+#: rhodecode/templates/admin/user_groups/user_groups.html:50
+#: rhodecode/templates/base/perms_summary.html:53
+#: rhodecode/templates/bookmarks/bookmarks.html:51
+#: rhodecode/templates/bookmarks/bookmarks_data.html:7
+#: rhodecode/templates/branches/branches.html:50
+#: rhodecode/templates/branches/branches_data.html:7
+#: rhodecode/templates/files/files_browser.html:41
+#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/journal/journal.html:288
+#: rhodecode/templates/tags/tags.html:51
+#: rhodecode/templates/tags/tags_data.html:7
 msgid "Name"
 msgstr "名前"
 
-#: rhodecode/templates/index_base.html:124
+#: rhodecode/templates/index_base.html:129
 msgid "Last Change"
 msgstr "最後の変更点"
 
-#: rhodecode/templates/index_base.html:126
-#: rhodecode/templates/admin/repos/repos.html:76
-#: rhodecode/templates/admin/users/user_edit_my_account.html:174
-#: rhodecode/templates/journal/journal.html:195
-#: rhodecode/templates/journal/journal.html:285
+#: rhodecode/templates/index_base.html:131
+#: rhodecode/templates/admin/my_account/my_account_repos.html:48
+#: rhodecode/templates/admin/my_account/my_account_watched.html:48
+#: rhodecode/templates/admin/repos/repos.html:52
+#: rhodecode/templates/journal/journal.html:199
+#: rhodecode/templates/journal/journal.html:290
 msgid "Tip"
 msgstr "Tip"
 
-#: rhodecode/templates/index_base.html:128
-#: rhodecode/templates/admin/repos/repo_edit.html:114
-#: rhodecode/templates/admin/repos/repos.html:78
+#: rhodecode/templates/index_base.html:133
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:10
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:53
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:60
+#: rhodecode/templates/admin/repos/repos.html:53
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:8
+#: rhodecode/templates/admin/user_groups/user_groups.html:54
+#: rhodecode/templates/summary/summary.html:141
 msgid "Owner"
 msgstr "所有者"
 
-#: rhodecode/templates/index_base.html:136
-#: rhodecode/templates/admin/repos/repos.html:86
-#: rhodecode/templates/admin/users/user_edit_my_account.html:183
-#: rhodecode/templates/admin/users/users.html:107
-#: rhodecode/templates/bookmarks/bookmarks.html:74
-#: rhodecode/templates/branches/branches.html:73
-#: rhodecode/templates/journal/journal.html:204
-#: rhodecode/templates/journal/journal.html:294
-#: rhodecode/templates/tags/tags.html:74
+#: rhodecode/templates/index_base.html:141
+#: rhodecode/templates/admin/my_account/my_account_repos.html:57
+#: rhodecode/templates/admin/my_account/my_account_watched.html:57
+#: rhodecode/templates/base/root.html:69
+#: rhodecode/templates/bookmarks/bookmarks.html:81
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:208
+#: rhodecode/templates/journal/journal.html:299
+#: rhodecode/templates/tags/tags.html:81
 msgid "Click to sort ascending"
 msgstr "昇順で並び換え"
 
-#: rhodecode/templates/index_base.html:137
-#: rhodecode/templates/admin/repos/repos.html:87
-#: rhodecode/templates/admin/users/user_edit_my_account.html:184
-#: rhodecode/templates/admin/users/users.html:108
-#: rhodecode/templates/bookmarks/bookmarks.html:75
-#: rhodecode/templates/branches/branches.html:74
-#: rhodecode/templates/journal/journal.html:205
-#: rhodecode/templates/journal/journal.html:295
-#: rhodecode/templates/tags/tags.html:75
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/admin/my_account/my_account_repos.html:58
+#: rhodecode/templates/admin/my_account/my_account_watched.html:58
+#: rhodecode/templates/base/root.html:70
+#: rhodecode/templates/bookmarks/bookmarks.html:82
+#: rhodecode/templates/branches/branches.html:81
+#: rhodecode/templates/journal/journal.html:209
+#: rhodecode/templates/journal/journal.html:300
+#: rhodecode/templates/tags/tags.html:82
 msgid "Click to sort descending"
 msgstr "降順で並び替え"
 
-#: rhodecode/templates/index_base.html:138
+#: rhodecode/templates/index_base.html:143
 msgid "No repositories found."
 msgstr "リポジトリが見つかりません"
 
-#: rhodecode/templates/index_base.html:139
-#: rhodecode/templates/admin/repos/repos.html:89
-#: rhodecode/templates/admin/users/user_edit_my_account.html:186
-#: rhodecode/templates/admin/users/users.html:110
-#: rhodecode/templates/bookmarks/bookmarks.html:77
-#: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:207
-#: rhodecode/templates/journal/journal.html:297
-#: rhodecode/templates/tags/tags.html:77
+#: rhodecode/templates/index_base.html:144
+#: rhodecode/templates/admin/my_account/my_account_repos.html:60
+#: rhodecode/templates/admin/my_account/my_account_watched.html:60
+#: rhodecode/templates/base/root.html:72
+#: rhodecode/templates/bookmarks/bookmarks.html:84
+#: rhodecode/templates/branches/branches.html:83
+#: rhodecode/templates/journal/journal.html:211
+#: rhodecode/templates/journal/journal.html:302
+#: rhodecode/templates/tags/tags.html:84
 msgid "Data error."
 msgstr "データエラー"
 
-#: rhodecode/templates/index_base.html:140
-#: rhodecode/templates/admin/repos/repos.html:90
-#: rhodecode/templates/admin/users/user_edit_my_account.html:58
-#: rhodecode/templates/admin/users/user_edit_my_account.html:187
-#: rhodecode/templates/admin/users/users.html:111
-#: rhodecode/templates/bookmarks/bookmarks.html:78
-#: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:208
-#: rhodecode/templates/journal/journal.html:298
-#: rhodecode/templates/tags/tags.html:78
+#: rhodecode/templates/index_base.html:145
+#: rhodecode/templates/admin/my_account/my_account_repos.html:61
+#: rhodecode/templates/admin/my_account/my_account_watched.html:61
+#: rhodecode/templates/base/base.html:148
+#: rhodecode/templates/base/root.html:73
+#: rhodecode/templates/bookmarks/bookmarks.html:85
+#: rhodecode/templates/branches/branches.html:84
+#: rhodecode/templates/journal/journal.html:212
+#: rhodecode/templates/journal/journal.html:303
+#: rhodecode/templates/tags/tags.html:85
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239
+#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:32
+#: rhodecode/templates/base/base.html:267
 msgid "Log In"
 msgstr "ログイン"
 
-#: rhodecode/templates/login.html:21
+#: rhodecode/templates/login.html:30
 #, python-format
 msgid "Log In to %s"
 msgstr "%s へログイン"
 
-#: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
+#: rhodecode/templates/login.html:43 rhodecode/templates/register.html:40
 #: rhodecode/templates/admin/admin_log.html:5
-#: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:57
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31
-#: rhodecode/templates/admin/users/users.html:77
-#: rhodecode/templates/base/base.html:215
-#: rhodecode/templates/summary/summary.html:123
+#: rhodecode/templates/admin/my_account/my_account_profile.html:30
+#: rhodecode/templates/admin/users/user_add.html:35
+#: rhodecode/templates/admin/users/user_edit_profile.html:33
+#: rhodecode/templates/admin/users/users.html:53
+#: rhodecode/templates/base/base.html:243
 msgid "Username"
 msgstr "ユーザー名"
 
-#: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
-#: rhodecode/templates/admin/ldap/ldap.html:46
-#: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:224
+#: rhodecode/templates/login.html:52 rhodecode/templates/register.html:49
+#: rhodecode/templates/admin/my_account/my_account.html:39
+#: rhodecode/templates/admin/users/user_add.html:44
+#: rhodecode/templates/base/base.html:252
 msgid "Password"
 msgstr "パスワード"
 
-#: rhodecode/templates/login.html:50
+#: rhodecode/templates/login.html:62
 msgid "Remember me"
 msgstr "次回から自動的にサインイン"
 
-#: rhodecode/templates/login.html:54
+#: rhodecode/templates/login.html:66
 msgid "Sign In"
 msgstr "サインイン"
 
-#: rhodecode/templates/login.html:60
+#: rhodecode/templates/login.html:72
 msgid "Forgot your password ?"
-msgstr "パスワードを忘れた場合はこちら"
-
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235
+msgstr "パスワードを忘れた?"
+
+#: rhodecode/templates/login.html:75 rhodecode/templates/base/base.html:263
 msgid "Don't have an account ?"
-msgstr "アカウントを持っていない場合はこちら"
+msgstr "アカウントを持っていない?"
 
 #: rhodecode/templates/password_reset.html:5
 msgid "Password Reset"
 msgstr "パスワードリセット"
 
-#: rhodecode/templates/password_reset.html:11
-msgid "Reset your password to"
-msgstr "パスワードリセット"
-
-#: rhodecode/templates/password_reset.html:21
-msgid "Email address"
-msgstr "メールアドレス"
-
-#: rhodecode/templates/password_reset.html:30
-msgid "Reset my password"
-msgstr "パスワードをリセットする"
+#: rhodecode/templates/password_reset.html:29
+#, python-format
+msgid "Reset your Password to %s"
+msgstr "パスワードを %s にリセットします"
 
 #: rhodecode/templates/password_reset.html:31
+msgid "Reset your Password"
+msgstr "パスワードをリセット"
+
+#: rhodecode/templates/password_reset.html:42
+msgid "Email Address"
+msgstr "メールアドレス"
+
+#: rhodecode/templates/password_reset.html:52
+#: rhodecode/templates/register.html:95
+msgid "Captcha"
+msgstr "キャプチャ"
+
+#: rhodecode/templates/password_reset.html:63
+msgid "Send password reset email"
+msgstr "パスワードリセットのメールを送信"
+
+#: rhodecode/templates/password_reset.html:64
 msgid "Password reset link will be send to matching email address"
 msgstr "該当するメールアドレスにパスワードリセットのリンクを送信します"
 
-#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74
+#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:30
+#: rhodecode/templates/register.html:106
 msgid "Sign Up"
 msgstr "サインアップ"
 
-#: rhodecode/templates/register.html:11
-msgid "Sign Up to"
-msgstr "サインアップ"
-
-#: rhodecode/templates/register.html:38
+#: rhodecode/templates/register.html:28
+#, python-format
+msgid "Sign Up to %s"
+msgstr "%s へサインアップ"
+
+#: rhodecode/templates/register.html:58
 msgid "Re-enter password"
 msgstr "パスワード再入力"
 
-#: rhodecode/templates/register.html:47
-#: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
+#: rhodecode/templates/register.html:67
+#: rhodecode/templates/admin/my_account/my_account_profile.html:41
+#: rhodecode/templates/admin/users/user_add.html:62
+#: rhodecode/templates/admin/users/user_edit_profile.html:87
 msgid "First Name"
 msgstr "名前"
 
-#: rhodecode/templates/register.html:56
-#: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:106
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
+#: rhodecode/templates/register.html:76
+#: rhodecode/templates/admin/my_account/my_account_profile.html:50
+#: rhodecode/templates/admin/users/user_add.html:71
+#: rhodecode/templates/admin/users/user_edit_profile.html:96
 msgid "Last Name"
 msgstr "名字"
 
-#: rhodecode/templates/register.html:65
-#: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:115
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/summary/summary.html:125
+#: rhodecode/templates/register.html:85
+#: rhodecode/templates/admin/my_account/my_account_profile.html:59
+#: rhodecode/templates/admin/settings/settings.html:44
+#: rhodecode/templates/admin/users/user_add.html:80
+#: rhodecode/templates/admin/users/user_edit_profile.html:42
 msgid "Email"
 msgstr "メールアドレス"
 
-#: rhodecode/templates/register.html:76
+#: rhodecode/templates/register.html:108
 msgid "Your account will be activated right after registration"
-msgstr "アカウントは登録後にアクティブになります"
-
-#: rhodecode/templates/register.html:78
+msgstr "アカウントは登録後すぐに利用できます"
+
+#: rhodecode/templates/register.html:110
 msgid "Your account must wait for activation by administrator"
-msgstr "アカウントは管理者のアクティベーションを待つ必要があります"
-
-#: rhodecode/templates/repo_switcher_list.html:10
-#: rhodecode/templates/admin/defaults/defaults.html:44
-#: rhodecode/templates/admin/repos/repo_add_base.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:78
-#: rhodecode/templates/data_table/_dt_elements.html:61
-#: rhodecode/templates/summary/summary.html:77
-msgid "Private repository"
-msgstr "非公開リポジトリ"
-
-#: rhodecode/templates/repo_switcher_list.html:12
-#: rhodecode/templates/data_table/_dt_elements.html:63
-#: rhodecode/templates/summary/summary.html:79
-msgid "Public repository"
-msgstr "公開リポジトリ"
+msgstr "アカウントは管理者のアクティベートを待つ必要があります"
 
 #: rhodecode/templates/switch_to_list.html:10
-#: rhodecode/templates/branches/branches_data.html:57
+#: rhodecode/templates/branches/branches_data.html:67
 msgid "There are no branches yet"
 msgstr "まだブランチがありません"
 
-#: rhodecode/templates/switch_to_list.html:22
-#: rhodecode/templates/tags/tags_data.html:38
+#: rhodecode/templates/switch_to_list.html:16
+msgid "Closed Branches"
+msgstr "閉鎖済みブランチ"
+
+#: rhodecode/templates/switch_to_list.html:32
+#: rhodecode/templates/tags/tags_data.html:44
 msgid "There are no tags yet"
 msgstr "まだタグがありません"
 
-#: rhodecode/templates/switch_to_list.html:35
-#: rhodecode/templates/bookmarks/bookmarks_data.html:37
+#: rhodecode/templates/switch_to_list.html:45
+#: rhodecode/templates/bookmarks/bookmarks_data.html:43
 msgid "There are no bookmarks yet"
 msgstr "まだブックマークがありません"
 
 #: rhodecode/templates/admin/admin.html:5
-#: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/base/base.html:73
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/base/base.html:69
 msgid "Admin journal"
 msgstr "管理者ジャーナル"
 
-#: rhodecode/templates/admin/admin.html:10
+#: rhodecode/templates/admin/admin.html:13
 msgid "journal filter..."
 msgstr "ジャーナルフィルタ..."
 
-#: rhodecode/templates/admin/admin.html:12
-#: rhodecode/templates/journal/journal.html:11
+#: rhodecode/templates/admin/admin.html:15
+#: rhodecode/templates/journal/journal.html:14
 msgid "filter"
 msgstr "フィルタ"
 
-#: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/journal/journal.html:15
 #, python-format
 msgid "%s entry"
 msgid_plural "%s entries"
-msgstr[0] "%s エントリ"
+msgstr[0] "%s 個のエントリ"
 
 #: rhodecode/templates/admin/admin_log.html:6
-#: rhodecode/templates/admin/repos/repos.html:79
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
-#: rhodecode/templates/admin/users/user_edit_my_account.html:176
-#: rhodecode/templates/admin/users/users.html:87
-#: rhodecode/templates/admin/users_groups/users_groups.html:40
-#: rhodecode/templates/journal/journal.html:197
-#: rhodecode/templates/journal/journal.html:287
+#: rhodecode/templates/admin/my_account/my_account_repos.html:50
+#: rhodecode/templates/admin/my_account/my_account_watched.html:50
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:54
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:8
+#: rhodecode/templates/admin/repos/repos.html:55
+#: rhodecode/templates/admin/user_groups/user_groups.html:55
+#: rhodecode/templates/admin/users/users.html:60
+#: rhodecode/templates/journal/journal.html:201
+#: rhodecode/templates/journal/journal.html:292
 msgid "Action"
 msgstr "アクション"
 
 #: rhodecode/templates/admin/admin_log.html:7
-#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/permissions/permissions_globals.html:18
 msgid "Repository"
 msgstr "リポジトリ"
 
 #: rhodecode/templates/admin/admin_log.html:8
-#: rhodecode/templates/bookmarks/bookmarks.html:49
-#: rhodecode/templates/bookmarks/bookmarks_data.html:7
-#: rhodecode/templates/branches/branches.html:48
-#: rhodecode/templates/branches/branches_data.html:7
-#: rhodecode/templates/tags/tags.html:49
-#: rhodecode/templates/tags/tags_data.html:7
+#: rhodecode/templates/bookmarks/bookmarks.html:53
+#: rhodecode/templates/bookmarks/bookmarks_data.html:9
+#: rhodecode/templates/branches/branches.html:52
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/tags/tags.html:53
+#: rhodecode/templates/tags/tags_data.html:9
 msgid "Date"
 msgstr "日時"
 
@@ -1929,309 +2301,598 @@
 msgid "No actions yet"
 msgstr "まだアクションがありません"
 
+#: rhodecode/templates/admin/auth/auth_settings.html:5
+msgid "Authentication Settings"
+msgstr "認証設定"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:14
+#: rhodecode/templates/base/base.html:75
+msgid "Authentication"
+msgstr "認証"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:31
+msgid "Authentication Plugins"
+msgstr "認証プラグイン"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:34
+msgid "Enabled Plugins"
+msgstr "有効なプラグイン"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:36
+msgid ""
+"Comma separated list of plugins. Order of plugins is also order in which "
+"RhodeCode will try to authenticate user"
+msgstr "カンマ区切りのプラグインの一覧です。プラグインの並び順はRhodeCodeがユーザー認証を試す順番でもあります。"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:37
+msgid "Available built-in plugins"
+msgstr "有効な組み込みプラグイン"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:65
+msgid "enabled"
+msgstr "有効"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:66
+msgid "disabled"
+msgstr "無効"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:51
+#: rhodecode/templates/admin/defaults/defaults.html:87
+#: rhodecode/templates/admin/my_account/my_account_password.html:33
+#: rhodecode/templates/admin/my_account/my_account_profile.html:68
+#: rhodecode/templates/admin/permissions/permissions_globals.html:108
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:72
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:114
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:101
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:134
+#: rhodecode/templates/admin/settings/settings_hooks.html:53
+#: rhodecode/templates/admin/user_groups/user_group_add.html:60
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:104
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:67
+#: rhodecode/templates/admin/users/user_add.html:99
+#: rhodecode/templates/admin/users/user_edit_profile.html:122
+#: rhodecode/templates/base/default_perms_box.html:64
+msgid "Save"
+msgstr "保存"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:57
+msgid "Plugin"
+msgstr "プラグイン"
+
 #: rhodecode/templates/admin/defaults/defaults.html:5
-#: rhodecode/templates/admin/defaults/defaults.html:25
+#: rhodecode/templates/admin/defaults/defaults.html:28
 msgid "Repositories defaults"
 msgstr "リポジトリのデフォルト設定"
 
-#: rhodecode/templates/admin/defaults/defaults.html:11
-#: rhodecode/templates/base/base.html:80
+#: rhodecode/templates/admin/defaults/defaults.html:14
+#: rhodecode/templates/base/base.html:76
 msgid "Defaults"
 msgstr "デフォルト設定"
 
-#: rhodecode/templates/admin/defaults/defaults.html:35
-#: rhodecode/templates/admin/repos/repo_add_base.html:38
+#: rhodecode/templates/admin/defaults/defaults.html:38
+#: rhodecode/templates/admin/repos/repo_add_base.html:59
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:7
 msgid "Type"
-msgstr "リポジトリのタイプ"
-
-#: rhodecode/templates/admin/defaults/defaults.html:48
-#: rhodecode/templates/admin/repos/repo_add_base.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:82
-#: rhodecode/templates/forks/fork.html:69
+msgstr "リポジトリの種別"
+
+#: rhodecode/templates/admin/defaults/defaults.html:47
+#: rhodecode/templates/admin/repos/repo_add_base.html:77
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:82
+#: rhodecode/templates/data_table/_dt_elements.html:70
+msgid "Private repository"
+msgstr "非公開リポジトリ"
+
+#: rhodecode/templates/admin/defaults/defaults.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:81
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:86
+#: rhodecode/templates/forks/fork.html:75
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
 msgstr "非公開リポジトリはコラボレーターとして明示的に追加された人でないと見つけられません"
 
-#: rhodecode/templates/admin/defaults/defaults.html:55
-#: rhodecode/templates/admin/repos/repo_edit.html:87
+#: rhodecode/templates/admin/defaults/defaults.html:58
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:91
 msgid "Enable statistics"
 msgstr "統計を有効にする"
 
-#: rhodecode/templates/admin/defaults/defaults.html:59
-#: rhodecode/templates/admin/repos/repo_edit.html:91
+#: rhodecode/templates/admin/defaults/defaults.html:62
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:95
 msgid "Enable statistics window on summary page."
 msgstr "概要ページの統計ウィンドウを有効にします"
 
-#: rhodecode/templates/admin/defaults/defaults.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:96
+#: rhodecode/templates/admin/defaults/defaults.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:100
 msgid "Enable downloads"
 msgstr "ダウンロードを有効にする"
 
-#: rhodecode/templates/admin/defaults/defaults.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:100
+#: rhodecode/templates/admin/defaults/defaults.html:72
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:104
 msgid "Enable download menu on summary page."
 msgstr "概要ページのダウンロードメニューを有効にします"
 
-#: rhodecode/templates/admin/defaults/defaults.html:75
-#: rhodecode/templates/admin/repos/repo_edit.html:105
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64
+#: rhodecode/templates/admin/defaults/defaults.html:78
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:34
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:109
 msgid "Enable locking"
 msgstr "ロックを有効にする"
 
-#: rhodecode/templates/admin/defaults/defaults.html:79
-#: rhodecode/templates/admin/repos/repo_edit.html:109
+#: rhodecode/templates/admin/defaults/defaults.html:82
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:113
 msgid "Enable lock-by-pulling on repository."
 msgstr "リポジトリのpullのロックを有効にします"
 
-#: rhodecode/templates/admin/defaults/defaults.html:84
-#: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/permissions/permissions.html:122
-#: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos/repo_edit.html:166
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96
-#: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_add.html:94
-#: rhodecode/templates/admin/users/user_edit.html:140
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88
-#: rhodecode/templates/admin/users_groups/users_group_add.html:49
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:143
-#: rhodecode/templates/base/default_perms_box.html:53
-msgid "Save"
-msgstr "保存"
-
-#: rhodecode/templates/admin/gists/index.html:5
-#: rhodecode/templates/base/base.html:299
-msgid "Gists"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:10
+#: rhodecode/templates/admin/gists/edit.html:5
+#: rhodecode/templates/admin/gists/edit.html:22
+msgid "Edit Gist"
+msgstr "Gistを編集"
+
+#: rhodecode/templates/admin/gists/edit.html:40
+#, python-format
+msgid ""
+"Gist was update since you started editing. Copy your changes and click "
+"%(here)s to reload new version."
+msgstr "編集開始後にGistが更新されています。あなたの変更箇所をコピーしておき、 %(here)s をクリックして新しいバージョンを読み込みなおしてください。"
+
+#: rhodecode/templates/admin/gists/edit.html:59
+#: rhodecode/templates/admin/gists/new.html:43
+msgid "Gist description ..."
+msgstr "Gist の説明..."
+
+#: rhodecode/templates/admin/gists/edit.html:61
+#: rhodecode/templates/admin/gists/new.html:45
+msgid "Gist lifetime"
+msgstr "Gist 有効期間"
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/edit.html:67
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/index.html:62
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/gists/show.html:52
+msgid "Expires"
+msgstr "失効"
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+msgid "never"
+msgstr "無し"
+
+#: rhodecode/templates/admin/gists/edit.html:80
+#: rhodecode/templates/admin/gists/new.html:52
+#: rhodecode/templates/files/files_add.html:59
+#: rhodecode/templates/files/files_edit.html:64
+msgid "plain"
+msgstr "plain"
+
+#: rhodecode/templates/admin/gists/edit.html:147
+msgid "Update Gist"
+msgstr "Gistを更新"
+
+#: rhodecode/templates/admin/gists/edit.html:148
+#: rhodecode/templates/changeset/changeset_file_comment.html:89
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: rhodecode/templates/admin/gists/index.html:6
+#: rhodecode/templates/admin/gists/index.html:19
 #, python-format
 msgid "Private Gists for user %s"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:12
+msgstr "ユーザー %s の非公開 Gists"
+
+#: rhodecode/templates/admin/gists/index.html:8
+#: rhodecode/templates/admin/gists/index.html:21
 #, python-format
 msgid "Public Gists for user %s"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:14
+msgstr "ユーザー %s の公開 Gists"
+
+#: rhodecode/templates/admin/gists/index.html:10
+#: rhodecode/templates/admin/gists/index.html:23
 msgid "Public Gists"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:31
-#: rhodecode/templates/admin/gists/show.html:24
-#: rhodecode/templates/base/base.html:302
-msgid "Create new gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:48
+msgstr "公開 Gists"
+
+#: rhodecode/templates/admin/gists/index.html:40
+#: rhodecode/templates/admin/gists/show.html:28
+msgid "Create New Gist"
+msgstr "新しい Gist を作成"
+
+#: rhodecode/templates/admin/gists/index.html:57
+#: rhodecode/templates/data_table/_dt_elements.html:143
 msgid "Created"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:51
-#: rhodecode/templates/admin/gists/index.html:53
-#: rhodecode/templates/admin/gists/show.html:43
-#: rhodecode/templates/admin/gists/show.html:45
-msgid "Expires"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:51
-#: rhodecode/templates/admin/gists/show.html:43
-msgid "never"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:68
+msgstr "作成日"
+
+#: rhodecode/templates/admin/gists/index.html:77
 msgid "There are no gists yet"
-msgstr ""
+msgstr "まだgistがありません"
 
 #: rhodecode/templates/admin/gists/new.html:5
-#: rhodecode/templates/admin/gists/new.html:16
-msgid "New gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:37
-msgid "Gist description ..."
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:52
-msgid "Create private gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:53
-msgid "Create public gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:54
-#: rhodecode/templates/admin/permissions/permissions.html:123
-#: rhodecode/templates/admin/permissions/permissions.html:185
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos/repo_edit.html:167
-#: rhodecode/templates/admin/repos/repo_edit.html:381
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97
-#: rhodecode/templates/admin/settings/settings.html:115
-#: rhodecode/templates/admin/settings/settings.html:196
-#: rhodecode/templates/admin/settings/settings.html:288
-#: rhodecode/templates/admin/users/user_edit.html:141
-#: rhodecode/templates/admin/users/user_edit.html:198
-#: rhodecode/templates/admin/users/user_edit.html:246
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:144
-#: rhodecode/templates/base/default_perms_box.html:54
-#: rhodecode/templates/files/files_add.html:80
-#: rhodecode/templates/files/files_edit.html:66
-#: rhodecode/templates/pullrequests/pullrequest.html:86
+#: rhodecode/templates/admin/gists/new.html:22
+msgid "New Gist"
+msgstr "Gistを新規作成"
+
+#: rhodecode/templates/admin/gists/new.html:51
+msgid "name this file..."
+msgstr "ファイルに名前をつける..."
+
+#: rhodecode/templates/admin/gists/new.html:60
+msgid "Create Private Gist"
+msgstr "非公開 Gist を作成"
+
+#: rhodecode/templates/admin/gists/new.html:61
+msgid "Create Public Gist"
+msgstr "公開 Gist を作成"
+
+#: rhodecode/templates/admin/gists/new.html:62
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:70
+#: rhodecode/templates/admin/my_account/my_account_emails.html:46
+#: rhodecode/templates/admin/my_account/my_account_password.html:34
+#: rhodecode/templates/admin/my_account/my_account_profile.html:69
+#: rhodecode/templates/admin/permissions/permissions_globals.html:109
+#: rhodecode/templates/admin/permissions/permissions_ips.html:41
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:115
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:43
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:59
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:102
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:135
+#: rhodecode/templates/admin/settings/settings_global.html:56
+#: rhodecode/templates/admin/settings/settings_license.html:43
+#: rhodecode/templates/admin/settings/settings_vcs.html:81
+#: rhodecode/templates/admin/settings/settings_visual.html:116
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:105
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:70
+#: rhodecode/templates/admin/users/user_edit_emails.html:46
+#: rhodecode/templates/admin/users/user_edit_ips.html:50
+#: rhodecode/templates/admin/users/user_edit_profile.html:123
+#: rhodecode/templates/base/default_perms_box.html:65
+#: rhodecode/templates/files/files_add.html:70
+#: rhodecode/templates/files/files_delete.html:58
+#: rhodecode/templates/files/files_edit.html:73
+#: rhodecode/templates/pullrequests/pullrequest.html:83
 msgid "Reset"
 msgstr "リセット"
 
 #: rhodecode/templates/admin/gists/show.html:5
-msgid "gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:9
+#: rhodecode/templates/admin/gists/show.html:12
 msgid "Gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:36
-msgid "Public gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:38
-msgid "Private gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:54
-#: rhodecode/templates/admin/repos/repo_edit.html:299
-#: rhodecode/templates/changeset/changeset_file_comment.html:40
+msgstr "Gist"
+
+#: rhodecode/templates/admin/gists/show.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:4
+#: rhodecode/templates/email_templates/pull_request.html:4
+#: rhodecode/templates/email_templates/pull_request_comment.html:4
+msgid "URL"
+msgstr "URL"
+
+#: rhodecode/templates/admin/gists/show.html:40
+msgid "Public Gist"
+msgstr "公開 Gist"
+
+#: rhodecode/templates/admin/gists/show.html:42
+msgid "Private Gist"
+msgstr "非公開 Gist"
+
+#: rhodecode/templates/admin/gists/show.html:59
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:80
+#: rhodecode/templates/changeset/changeset_file_comment.html:48
+#: rhodecode/templates/files/files_source.html:39
+#: rhodecode/templates/files/files_source.html:42
+#: rhodecode/templates/files/files_source.html:45
 msgid "Delete"
 msgstr "削除"
 
-#: rhodecode/templates/admin/gists/show.html:54
-msgid "Confirm to delete this gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:63
-#: rhodecode/templates/admin/gists/show.html:84
-#: rhodecode/templates/files/files_edit.html:48
-#: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:55
-msgid "Show as raw"
-msgstr "元のファイルを表示"
-
-#: rhodecode/templates/admin/gists/show.html:71
+#: rhodecode/templates/admin/gists/show.html:59
+msgid "Confirm to delete this Gist"
+msgstr "このGistを削除してもよろしいですか？"
+
+#: rhodecode/templates/admin/gists/show.html:66
+#: rhodecode/templates/changeset/changeset_file_comment.html:81
+#: rhodecode/templates/changeset/changeset_file_comment.html:190
+#: rhodecode/templates/data_table/_dt_elements.html:167
+#: rhodecode/templates/data_table/_dt_elements.html:183
+#: rhodecode/templates/files/files_source.html:41
+#: rhodecode/templates/files/files_source.html:44
+msgid "Edit"
+msgstr "編集"
+
+#: rhodecode/templates/admin/gists/show.html:68
+#: rhodecode/templates/files/files_edit.html:54
+#: rhodecode/templates/files/files_source.html:34
+msgid "Show as Raw"
+msgstr "Raw形式で表示"
+
+#: rhodecode/templates/admin/gists/show.html:76
 msgid "created"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:5
-msgid "LDAP administration"
-msgstr "LDAP管理"
-
-#: rhodecode/templates/admin/ldap/ldap.html:11
-#: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:79
-msgid "LDAP"
-msgstr "LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:28
-msgid "Connection settings"
-msgstr "接続設定"
-
-#: rhodecode/templates/admin/ldap/ldap.html:30
-msgid "Enable LDAP"
-msgstr "LDAPを有効にする"
-
-#: rhodecode/templates/admin/ldap/ldap.html:34
-msgid "Host"
-msgstr "ホスト"
-
-#: rhodecode/templates/admin/ldap/ldap.html:38
-msgid "Port"
-msgstr "ポート"
-
-#: rhodecode/templates/admin/ldap/ldap.html:42
-msgid "Account"
+msgstr "作成日"
+
+#: rhodecode/templates/admin/gists/show.html:89
+#: rhodecode/templates/files/files_source.html:71
+msgid "Show as raw"
+msgstr "Raw形式で表示"
+
+#: rhodecode/templates/admin/my_account/my_account.html:5
+#: rhodecode/templates/base/base.html:282
+msgid "My account"
+msgstr "アカウント"
+
+#: rhodecode/templates/admin/my_account/my_account.html:12
+msgid "My Account"
 msgstr "アカウント"
 
-#: rhodecode/templates/admin/ldap/ldap.html:50
-msgid "Connection security"
-msgstr "接続のセキュリティ"
-
-#: rhodecode/templates/admin/ldap/ldap.html:54
-msgid "Certificate Checks"
-msgstr "証明書チェック"
-
-#: rhodecode/templates/admin/ldap/ldap.html:57
-msgid "Search settings"
-msgstr "検索設定"
-
-#: rhodecode/templates/admin/ldap/ldap.html:59
-msgid "Base DN"
-msgstr "Base DN"
-
-#: rhodecode/templates/admin/ldap/ldap.html:63
-msgid "LDAP Filter"
-msgstr "LDAPフィルター"
-
-#: rhodecode/templates/admin/ldap/ldap.html:67
-msgid "LDAP Search Scope"
-msgstr "LDAP検索範囲"
-
-#: rhodecode/templates/admin/ldap/ldap.html:70
-msgid "Attribute mappings"
-msgstr "属性マッピング"
-
-#: rhodecode/templates/admin/ldap/ldap.html:72
-msgid "Login Attribute"
-msgstr "ログイン属性"
-
-#: rhodecode/templates/admin/ldap/ldap.html:76
-msgid "First Name Attribute"
-msgstr "名前(First Name)属性"
-
-#: rhodecode/templates/admin/ldap/ldap.html:80
-msgid "Last Name Attribute"
-msgstr "名字(Last Name)属性"
-
-#: rhodecode/templates/admin/ldap/ldap.html:84
-msgid "E-mail Attribute"
-msgstr "メールアドレス属性"
+#: rhodecode/templates/admin/my_account/my_account.html:38
+#: rhodecode/templates/admin/users/user_edit.html:42
+msgid "Profile"
+msgstr "プロフィール"
+
+#: rhodecode/templates/admin/my_account/my_account.html:40
+#: rhodecode/templates/admin/users/user_edit.html:43
+msgid "API keys"
+msgstr "APIキー"
+
+#: rhodecode/templates/admin/my_account/my_account.html:41
+msgid "My Emails"
+msgstr "メールアドレス"
+
+#: rhodecode/templates/admin/my_account/my_account.html:42
+msgid "My Repositories"
+msgstr "リポジトリ"
+
+#: rhodecode/templates/admin/my_account/my_account.html:43
+#: rhodecode/templates/journal/journal.html:54
+msgid "Watched"
+msgstr "ウォッチ中"
+
+#: rhodecode/templates/admin/my_account/my_account.html:44
+msgid "Pull requests"
+msgstr "プルリクエスト"
+
+#: rhodecode/templates/admin/my_account/my_account.html:45
+msgid "My permissions"
+msgstr "権限"
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:6
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:6
+msgid "Built-in"
+msgstr "ビルトイン"
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:32
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:32
+msgid "expires"
+msgstr "失効"
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:14
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:14
+#, python-format
+msgid "Confirm to reset this api key: %s"
+msgstr "このAPIキーをリセットしてもよろしいですか？: %s"
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:15
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:15
+msgid "reset"
+msgstr "リセット"
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:30
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:30
+msgid "expired"
+msgstr "失効済み"
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:40
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:40
+#, python-format
+msgid "Confirm to remove this api key: %s"
+msgstr "このAPIキーを削除してもよろしいですか？: %s"
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:42
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:42
+msgid "remove"
+msgstr "削除"
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:49
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:49
+msgid "No additional api keys specified"
+msgstr "API キーが指定されていません"
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:61
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:61
+msgid "New api key"
+msgstr "新しいAPIキー"
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:69
+#: rhodecode/templates/admin/my_account/my_account_emails.html:45
+#: rhodecode/templates/admin/permissions/permissions_ips.html:40
+#: rhodecode/templates/admin/repos/repo_add_base.html:85
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:58
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:69
+#: rhodecode/templates/admin/users/user_edit_emails.html:45
+#: rhodecode/templates/admin/users/user_edit_ips.html:49
+msgid "Add"
+msgstr "追加"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:7
+#: rhodecode/templates/admin/users/user_edit_emails.html:7
+msgid "Primary"
+msgstr "プライマリ"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:19
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:24
+#: rhodecode/templates/admin/permissions/permissions_ips.html:14
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:18
+#: rhodecode/templates/admin/settings/settings_hooks.html:36
+#: rhodecode/templates/admin/users/user_edit_emails.html:19
+#: rhodecode/templates/admin/users/user_edit_ips.html:22
+#: rhodecode/templates/data_table/_dt_elements.html:131
+#: rhodecode/templates/data_table/_dt_elements.html:159
+#: rhodecode/templates/data_table/_dt_elements.html:175
+#: rhodecode/templates/data_table/_dt_elements.html:191
+msgid "delete"
+msgstr "削除"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:20
+#: rhodecode/templates/admin/users/user_edit_emails.html:20
+#, python-format
+msgid "Confirm to delete this email: %s"
+msgstr "このメールアドレスを削除してもよろしいですか？ : %s"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:26
+#: rhodecode/templates/admin/users/user_edit_emails.html:26
+msgid "No additional emails specified"
+msgstr "追加のメールアドレスはありません"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:38
+#: rhodecode/templates/admin/users/user_edit_emails.html:38
+msgid "New email address"
+msgstr "新しいメールアドレス"
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:1
+msgid "Change your account password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:7
+msgid "Current password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:16
+#: rhodecode/templates/admin/users/user_edit_profile.html:69
+msgid "New password"
+msgstr "新しいパスワード"
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:25
+msgid "Confirm new password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:9
+msgid "Change your avatar at"
+msgstr "アバターを変更できます : "
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:10
+#: rhodecode/templates/admin/users/user_edit_profile.html:9
+msgid "Using"
+msgstr "メールアドレス:"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:11
+msgid "Avatars are disabled"
+msgstr "アバターは無効です"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:13
+msgid "Missing email, please update your user email address."
+msgstr "メールアドレスがありません。更新してください。"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:14
+#: rhodecode/templates/admin/users/user_edit_profile.html:15
+msgid "current IP"
+msgstr "現在の IP"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:26
+msgid ""
+"Your user is in an external Source of Record; some details cannot be managed"
+" here"
+msgstr "ユーザーは外部の Source of Record  に属しているため、ここでは詳細を管理できません"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:2
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:4
+msgid "Show closed pull requests"
+msgstr "クローズしたプルリクエストを表示"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:6
+msgid "Opened by me"
+msgstr "あなたが作成したプルリクエスト"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:15
+#, python-format
+msgid "Pull request #%s opened on %s"
+msgstr "プルリクエスト #%s %s に作成"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:17
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:47
+#: rhodecode/templates/pullrequests/pullrequest_data.html:11
+#: rhodecode/templates/pullrequests/pullrequest_show.html:30
+#: rhodecode/templates/pullrequests/pullrequest_show.html:45
+msgid "Closed"
+msgstr "クローズ"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:25
+msgid "Confirm to delete this pull request"
+msgstr "このプルリクエストを削除してもよろしいですか？"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:32
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:53
+msgid "Nothing here yet"
+msgstr "まだありません"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:36
+msgid "I participate in"
+msgstr "あなたがレビュアーとして参加しているプルリクエスト"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:44
+#: rhodecode/templates/pullrequests/pullrequest_data.html:8
+#, python-format
+msgid "Pull request #%s opened by %s on %s"
+msgstr "プルリクエスト #%s %s によって %s に作成"
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:1
+msgid "Repositories you are owner of"
+msgstr "あなたが所有者のリポジトリ"
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:59
+#: rhodecode/templates/admin/my_account/my_account_watched.html:59
+#: rhodecode/templates/base/root.html:71
+#: rhodecode/templates/bookmarks/bookmarks.html:83
+#: rhodecode/templates/branches/branches.html:82
+#: rhodecode/templates/journal/journal.html:210
+#: rhodecode/templates/journal/journal.html:301
+#: rhodecode/templates/tags/tags.html:83
+msgid "No records found."
+msgstr "レコードが見つかりません"
+
+#: rhodecode/templates/admin/my_account/my_account_watched.html:1
+msgid "Repositories you are watching"
+msgstr "あなたがウォッチしているリポジトリ"
 
 #: rhodecode/templates/admin/notifications/notifications.html:5
-#: rhodecode/templates/admin/notifications/notifications.html:9
+#: rhodecode/templates/admin/notifications/notifications.html:12
 msgid "My Notifications"
 msgstr "通知"
 
-#: rhodecode/templates/admin/notifications/notifications.html:29
+#: rhodecode/templates/admin/notifications/notifications.html:32
 msgid "All"
 msgstr "すべて"
 
-#: rhodecode/templates/admin/notifications/notifications.html:30
+#: rhodecode/templates/admin/notifications/notifications.html:33
 msgid "Comments"
 msgstr "コメント"
 
-#: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
-msgid "Pull requests"
+#: rhodecode/templates/admin/notifications/notifications.html:34
+#: rhodecode/templates/base/base.html:193
+msgid "Pull Requests"
 msgstr "プルリクエスト"
 
-#: rhodecode/templates/admin/notifications/notifications.html:35
+#: rhodecode/templates/admin/notifications/notifications.html:38
 msgid "Mark all read"
 msgstr "すべて既読にする"
 
-#: rhodecode/templates/admin/notifications/notifications_data.html:39
+#: rhodecode/templates/admin/notifications/notifications_data.html:40
 msgid "No notifications here yet"
-msgstr "通知はまだありません"
+msgstr "まだ通知がありません"
 
 #: rhodecode/templates/admin/notifications/show_notification.html:5
-#: rhodecode/templates/admin/notifications/show_notification.html:11
+#: rhodecode/templates/admin/notifications/show_notification.html:14
 msgid "Show notification"
 msgstr "通知を表示"
 
-#: rhodecode/templates/admin/notifications/show_notification.html:9
-#: rhodecode/templates/base/base.html:253
+#: rhodecode/templates/admin/notifications/show_notification.html:12
+#: rhodecode/templates/base/base.html:281
 msgid "Notifications"
 msgstr "通知"
 
@@ -2239,1440 +2900,1789 @@
 msgid "Permissions administration"
 msgstr "権限管理"
 
-#: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:151
-#: rhodecode/templates/admin/repos/repo_edit.html:158
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88
-#: rhodecode/templates/admin/users/user_edit.html:150
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:129
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/base/base.html:78
+#: rhodecode/templates/admin/permissions/permissions.html:14
+#: rhodecode/templates/admin/permissions/permissions.html:37
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:55
+#: rhodecode/templates/admin/repos/repo_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:45
+#: rhodecode/templates/base/base.html:74
 msgid "Permissions"
 msgstr "権限設定"
 
-#: rhodecode/templates/admin/permissions/permissions.html:24
-msgid "Default permissions"
-msgstr "デフォルトの権限"
-
-#: rhodecode/templates/admin/permissions/permissions.html:31
+#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/settings/settings.html:42
+msgid "Global"
+msgstr "全般"
+
+#: rhodecode/templates/admin/permissions/permissions.html:42
+msgid "IP whitelist"
+msgstr "IPアドレスのホワイトリスト"
+
+#: rhodecode/templates/admin/permissions/permissions.html:43
+msgid "Overview"
+msgstr "概要"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:7
 msgid "Anonymous access"
 msgstr "匿名アクセス"
 
-#: rhodecode/templates/admin/permissions/permissions.html:49
+#: rhodecode/templates/admin/permissions/permissions_globals.html:13
+#, python-format
+msgid ""
+"Allow access to RhodeCode without need to log in. Anonymous users use %s "
+"user permissions"
+msgstr "ログインしなくても RhodeCode にアクセスできるようにします。匿名ユーザーは %s ユーザーパーミッションを使います"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:26
 msgid ""
 "All default permissions on each repository will be reset to chosen "
 "permission, note that all custom default permission on repositories will be "
 "lost"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:50
-#: rhodecode/templates/admin/permissions/permissions.html:63
-#: rhodecode/templates/admin/permissions/permissions.html:77
+msgstr "選択したパーミッションで、各リポジトリのデフォルトパーミッションをリセットします。各リポジトリの既存のカスタムデフォルトパーミッション設定は無くなるので注意してください"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:27
+#: rhodecode/templates/admin/permissions/permissions_globals.html:40
+#: rhodecode/templates/admin/permissions/permissions_globals.html:54
 msgid "Overwrite existing settings"
 msgstr "現在の設定を上書きする"
 
-#: rhodecode/templates/admin/permissions/permissions.html:62
+#: rhodecode/templates/admin/permissions/permissions_globals.html:32
+#: rhodecode/templates/admin/repos/repo_add_base.html:41
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:42
+#: rhodecode/templates/data_table/_dt_elements.html:204
+#: rhodecode/templates/forks/fork.html:51
+msgid "Repository group"
+msgstr "リポジトリグループ"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:39
 msgid ""
 "All default permissions on each repository group will be reset to chosen "
 "permission, note that all custom default permission on repository groups "
 "will be lost"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:69
+msgstr "選択したパーミッションで、各リポジトリグループのデフォルトパーミッションをリセットします。各リポジトリグループの既存のカスタムデフォルトパーミッション設定は無くなるので注意してください"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:46
+#: rhodecode/templates/data_table/_dt_elements.html:211
 msgid "User group"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:76
+msgstr "ユーザーグループ"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:53
 msgid ""
 "All default permissions on each user group will be reset to chosen "
 "permission, note that all custom default permission on repository groups "
 "will be lost"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:83
+msgstr "選択したパーミッションで、各ユーザーグループのデフォルトパーミッションをリセットします。各ユーザーグループの既存のカスタムデフォルトパーミッション設定は無くなるので注意してください"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:60
 msgid "Repository creation"
 msgstr "リポジトリ作成"
 
-#: rhodecode/templates/admin/permissions/permissions.html:91
+#: rhodecode/templates/admin/permissions/permissions_globals.html:68
+msgid "Repository creation with group write access"
+msgstr "グループ書き込み権限でのリポジトリ作成"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:72
+msgid ""
+"Write permission to repository groups allows creating repositories inside "
+"that group"
+msgstr "リポジトリグループに書き込みパーミッションを付与すると、グループ内にリポジトリを作成できるようになります"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:77
 msgid "User group creation"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:99
+msgstr "ユーザーグループ作成"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:85
 msgid "Repository forking"
-msgstr "リポジトリフォーク"
-
-#: rhodecode/templates/admin/permissions/permissions.html:107
+msgstr "リポジトリのフォーク"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:93
 msgid "Registration"
-msgstr "登録"
-
-#: rhodecode/templates/admin/permissions/permissions.html:115
+msgstr "新規登録"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:101
 msgid "External auth account activation"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:133
-msgid "Default User Permissions"
-msgstr "デフォルトのユーザー権限"
-
-#: rhodecode/templates/admin/permissions/permissions.html:144
-#: rhodecode/templates/admin/users/user_edit.html:207
-msgid "Allowed IP addresses"
-msgstr "許可するIPアドレス"
-
-#: rhodecode/templates/admin/permissions/permissions.html:158
-#: rhodecode/templates/admin/repos/repo_edit.html:340
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
-#: rhodecode/templates/admin/users/user_edit.html:175
-#: rhodecode/templates/admin/users/user_edit.html:220
-#: rhodecode/templates/admin/users_groups/users_groups.html:54
-#: rhodecode/templates/data_table/_dt_elements.html:122
-#: rhodecode/templates/data_table/_dt_elements.html:136
-msgid "delete"
-msgstr "削除"
-
-#: rhodecode/templates/admin/permissions/permissions.html:159
-#: rhodecode/templates/admin/users/user_edit.html:221
+msgstr "外部認証アカウントのアクティベート"
+
+#: rhodecode/templates/admin/permissions/permissions_ips.html:1
+msgid "Default ip whitelist for all users"
+msgstr "全てのユーザーに設定されるデフォルトのIPアドレスのホワイトリスト"
+
+#: rhodecode/templates/admin/permissions/permissions_ips.html:15
+#: rhodecode/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
-msgstr "このIPアドレスを削除してよろしいですか: %s"
-
-#: rhodecode/templates/admin/permissions/permissions.html:165
-#: rhodecode/templates/admin/users/user_edit.html:227
+msgstr "このIPアドレスを削除してもよろしいですか？ : %s"
+
+#: rhodecode/templates/admin/permissions/permissions_ips.html:21
+#: rhodecode/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed"
 msgstr "すべてのIPアドレスが許可されています"
 
-#: rhodecode/templates/admin/permissions/permissions.html:176
-#: rhodecode/templates/admin/users/user_edit.html:238
+#: rhodecode/templates/admin/permissions/permissions_ips.html:32
+#: rhodecode/templates/admin/users/user_edit_ips.html:42
 msgid "New ip address"
 msgstr "新しいIPアドレス"
 
-#: rhodecode/templates/admin/permissions/permissions.html:184
-#: rhodecode/templates/admin/repos/repo_add_base.html:73
-#: rhodecode/templates/admin/repos/repo_edit.html:380
-#: rhodecode/templates/admin/users/user_edit.html:197
-#: rhodecode/templates/admin/users/user_edit.html:245
-msgid "Add"
-msgstr "追加"
-
-#: rhodecode/templates/admin/repos/repo_add.html:12
-#: rhodecode/templates/admin/repos/repo_add.html:16
-#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88
-#: rhodecode/templates/base/base.html:116
-#: rhodecode/templates/base/base.html:275
-msgid "Repositories"
-msgstr "リポジトリ"
-
-#: rhodecode/templates/admin/repos/repo_add.html:19
+#: rhodecode/templates/admin/permissions/permissions_perms.html:1
+msgid "Default user permissions overview"
+msgstr "デフォルトのユーザー権限の概要"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:5
+msgid "Add repository group"
+msgstr "リポジトリグループを追加"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:14
+#: rhodecode/templates/base/base.html:71 rhodecode/templates/base/base.html:90
+msgid "Repository groups"
+msgstr "リポジトリグループ"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:36
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:8
+#: rhodecode/templates/admin/user_groups/user_group_add.html:35
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:7
+msgid "Group name"
+msgstr "グループ名"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:54
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:26
+msgid "Group parent"
+msgstr "親グループ"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:63
+#: rhodecode/templates/admin/repos/repo_add_base.html:50
+msgid "Copy parent group permissions"
+msgstr "親グループのパーミッションをコピー"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:67
+#: rhodecode/templates/admin/repos/repo_add_base.html:54
+msgid "Copy permission set from parent repository group."
+msgstr "親のリポジトリグループにセットされているパーミッションをコピーします。"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:5
+#, python-format
+msgid "%s Repository group settings"
+msgstr "%s リポジトリグループ 設定"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:105
+msgid "Repository Groups"
+msgstr "リポジトリグループ"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:24
+msgid "Add Child Group"
+msgstr "子グループを追加"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:53
+#: rhodecode/templates/admin/repos/repo_edit.html:15
+#: rhodecode/templates/admin/repos/repo_edit.html:43
+#: rhodecode/templates/admin/settings/settings.html:14
+#: rhodecode/templates/admin/settings/settings.html:36
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:42
+#: rhodecode/templates/base/base.html:77
+#: rhodecode/templates/base/base.html:159
+msgid "Settings"
+msgstr "設定"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:54
+#: rhodecode/templates/admin/repos/repo_edit.html:49
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:43
+#: rhodecode/templates/admin/users/user_edit.html:44
+msgid "Advanced"
+msgstr "高度な設定"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:1
+#, python-format
+msgid "Repository Group: %s"
+msgstr "リポジトリグループ: %s"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:6
+msgid "Top level repositories"
+msgstr "トップレベルリポジトリ数"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:7
+msgid "Total repositories"
+msgstr "リポジトリ総数"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:8
+msgid "Children groups"
+msgstr "子グループ数"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_advanced.html:8
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+msgid "Created on"
+msgstr "作成日"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:192
+#, python-format
+msgid "Confirm to delete this group: %s with %s repository"
+msgid_plural "Confirm to delete this group: %s with %s repositories"
+msgstr[0] "このグループを削除してもよろしいですか？ : %s %s 個のリポジトリ"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:25
+msgid "Delete this repository group"
+msgstr "このリポジトリグループを削除"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:7
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:8
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:7
+#: rhodecode/templates/base/perms_summary.html:14
+msgid "none"
+msgstr "なし"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:8
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:8
+#: rhodecode/templates/base/perms_summary.html:15
+msgid "read"
+msgstr "読込"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:9
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:10
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:9
+#: rhodecode/templates/base/perms_summary.html:16
+msgid "write"
+msgstr "書込"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:10
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:10
+#: rhodecode/templates/base/perms_summary.html:17
+msgid "admin"
+msgstr "管理"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:11
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:12
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:11
+msgid "user/user group"
+msgstr "ユーザー/ユーザーグループ"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:28
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:45
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:24
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:37
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:28
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:45
+msgid "default"
+msgstr "default"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:34
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:71
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:43
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:68
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:34
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:71
+msgid "revoke"
+msgstr "取消"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:47
+msgid "delegated admin"
+msgstr "代理 admin"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:97
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:94
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:97
 msgid "Add new"
 msgstr "新規追加"
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:96
-#: rhodecode/templates/summary/summary.html:97
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:103
+msgid "apply to children"
+msgstr "子要素にも適用"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:107
+msgid "Both"
+msgstr "両方"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:108
+msgid ""
+"Set or revoke permission to all children of that group, including non-"
+"private repositories and other groups if selected."
+msgstr "このグループに属する全ての子要素のパーミッションを設定または無効化します。選択されていれば、非公開でないリポジトリや他のリポジトリも対象に含みます。"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:38
+msgid ""
+"Enable lock-by-pulling on group. This option will be applied to all other "
+"groups and repositories inside"
+msgstr "グループのpullのロックを有効にします。このオプションはグループに含まれる全てのグループとリポジトリに適用されます。"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:4
+#, python-format
+msgid "%s Repository group dashboard"
+msgstr "%s リポジトリグループダッシュボード"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:12
+msgid "Home"
+msgstr "ホーム"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:16
+msgid "with"
+msgstr "と"
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:5
+msgid "Repository groups administration"
+msgstr "リポジトリグループ管理"
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+msgid "repository groups"
+msgstr "リポジトリグループ"
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:52
+msgid "Number of toplevel repositories"
+msgstr "トップレベルリポジトリ数"
+
+#: rhodecode/templates/admin/repos/repo_add.html:5
+msgid "Add repository"
+msgstr "リポジトリを追加"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:14
+msgid "Import existing repository ?"
+msgstr "既存のリポジトリを import しますか？"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:23
+#: rhodecode/templates/summary/summary.html:32
 msgid "Clone from"
 msgstr "クローン元"
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:24
-#: rhodecode/templates/admin/repos/repo_edit.html:45
+#: rhodecode/templates/admin/repos/repo_add_base.html:27
 msgid "Optional http[s] url from which repository should be cloned."
 msgstr "オプション：クローンするリポジトリのHTTP[S]のURLを指定します"
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:33
-#: rhodecode/templates/forks/fork.html:51
-msgid "Optionaly select a group to put this repository into."
-msgstr "オプション：このリポジトリが属するグループを選択します"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:42
-msgid "Type of repository to create."
-msgstr "作成するリポジトリのタイプを指定します"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:47
-#: rhodecode/templates/admin/repos/repo_edit.html:59
-#: rhodecode/templates/forks/fork.html:38
-msgid "Landing revision"
-msgstr "ランディングリビジョン"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:51
-#: rhodecode/templates/admin/repos/repo_edit.html:63
-#: rhodecode/templates/forks/fork.html:42
-msgid "Default revision for files page, downloads, whoosh and readme"
-msgstr "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定します"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:60
-#: rhodecode/templates/admin/repos/repo_edit.html:72
-#: rhodecode/templates/forks/fork.html:60
+#: rhodecode/templates/admin/repos/repo_add_base.html:36
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:76
+#: rhodecode/templates/forks/fork.html:45
 msgid ""
 "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。"
 
+#: rhodecode/templates/admin/repos/repo_add_base.html:45
+#: rhodecode/templates/forks/fork.html:55
+msgid "Optionaly select a group to put this repository into."
+msgstr "オプション：このリポジトリが属するグループを選択します"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:63
+msgid "Type of repository to create."
+msgstr "作成するリポジトリの種別を指定します"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:51
+#: rhodecode/templates/forks/fork.html:61
+msgid "Landing revision"
+msgstr "ランディングリビジョン"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:72
+msgid ""
+"Default revision for files page, downloads, full text search index and "
+"readme generation"
+msgstr "ファイルページ、ダウンロード、全文検索インデックス、READMEなどの生成に使うデフォルトのリビジョン"
+
+#: rhodecode/templates/admin/repos/repo_creating.html:9
+#, python-format
+msgid "%s Creating repository"
+msgstr "%s Creating repository"
+
+#: rhodecode/templates/admin/repos/repo_creating.html:16
+msgid "Creating repository"
+msgstr "リポジトリを作成中"
+
+#: rhodecode/templates/admin/repos/repo_creating.html:30
+#, python-format
+msgid ""
+"Repository \"%(repo_name)s\" is beeing created, you will be redirected when "
+"this process is finished.repo_name"
+msgstr "リポジトリ \"%(repo_name)s\" を作成中です。処理を完了したらリダイレクトします。"
+
+#: rhodecode/templates/admin/repos/repo_creating.html:42
+msgid ""
+"We're sorry but error occured during this operation. Please check your "
+"RhodeCode server logs, or contact administrator."
+msgstr "恐れいります。操作中にエラーが発生しました。 RhodeCode サーバのログをチェックするか、管理者に問い合わせてください。"
+
 #: rhodecode/templates/admin/repos/repo_edit.html:8
-msgid "Edit repository"
-msgstr "リポジトリを編集"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:12
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:11
-#: rhodecode/templates/base/base.html:81
-#: rhodecode/templates/base/base.html:134
-#: rhodecode/templates/summary/summary.html:212
-msgid "Settings"
-msgstr "設定"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:36
-msgid "Non-changeable id"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:41
-msgid "Clone uri"
-msgstr "クローンURI"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:54
-msgid "Optional select a group to put this repository into."
-msgstr "オプション: このリポジトリを配置するグループを選択します"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:119
-msgid "Change owner of this repository."
-msgstr "リポジトリの所有者を変更"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:177
-msgid "Advanced settings"
-msgstr "高度な設定"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:180
-msgid "Statistics"
-msgstr "統計"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Reset current statistics"
-msgstr "現在の統計情報をリセットする"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Confirm to remove current statistics"
-msgstr "現在の統計情報をリセットしてもよろしいですか？"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:187
-msgid "Fetched to rev"
-msgstr "収集するリビジョン"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:188
-msgid "Stats gathered"
-msgstr "収集した統計情報"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:196
+#, python-format
+msgid "%s repository settings"
+msgstr "%s リポジトリ設定"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:52
+msgid "Extra fields"
+msgstr "拡張フィールド"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:55
+msgid "Caches"
+msgstr "キャッシュ"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:58
 msgid "Remote"
 msgstr "リモート"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:200
-msgid "Pull changes from remote location"
-msgstr "リモートから変更を取り込む"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:200
-msgid "Confirm to pull changes from remote side"
-msgstr "リモートから変更を取り込んでもよろしいですか？"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:211
-msgid "Cache"
-msgstr "キャッシュ"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:215
-msgid "Invalidate repository cache"
-msgstr "リポジトリのキャッシュを無効化"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:215
-msgid "Confirm to invalidate repository cache"
-msgstr "リポジトリのキャッシュを無効化してもよろしいですか？"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:218
-msgid ""
-"Manually invalidate cache for this repository. On first access repository "
-"will be cached again"
-msgstr "このリポジトリのキャッシュを手動で無効化します。リポジトリへの初回アクセス時に再びキャッシュされます。"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:223
-msgid "List of cached values"
-msgstr "キャッシュしている値の一覧"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:226
-msgid "Prefix"
-msgstr "プレフィックス"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:227
-msgid "Key"
-msgstr "キー"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:228
-#: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:124
-#: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/admin/users_groups/users_group_add.html:41
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-#: rhodecode/templates/admin/users_groups/users_groups.html:39
-msgid "Active"
-msgstr "アクティブ"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:243
-#: rhodecode/templates/base/base.html:292
-#: rhodecode/templates/base/base.html:293
-msgid "Public journal"
-msgstr "公開ジャーナル"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:249
+#: rhodecode/templates/admin/repos/repo_edit.html:61
+#: rhodecode/templates/summary/statistics.html:11
+#: rhodecode/templates/summary/summary.html:178
+#: rhodecode/templates/summary/summary.html:179
+msgid "Statistics"
+msgstr "統計"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:1
+#: rhodecode/templates/summary/summary.html:25
+msgid "Fork of"
+msgstr "フォーク元"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:6
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:5
+msgid "Set"
+msgstr "保存"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:10
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:9
+msgid "Manually set this repository as a fork of another from the list"
+msgstr "このリポジトリをリスト中の他のリポジトリのフォークとして、手動で設定します"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:24
+msgid "Public journal visibility"
+msgstr "公開ジャーナルでの可視性"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:32
 msgid "Remove from public journal"
 msgstr "公開ジャーナルから削除する"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:251
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:37
 msgid "Add to public journal"
-msgstr "公開ジャーナルに追加する"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:256
+msgstr "公開ジャーナルへ追加"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:43
 msgid ""
 "All actions made on this repository will be accessible to everyone in public"
 " journal"
 msgstr "公開ジャーナルでは、このリポジトリに対して行った操作のすべてが公開されます"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:263
-msgid "Locking"
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:49
+msgid "Change locking"
 msgstr "ロック"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:268
-msgid "Unlock locked repo"
-msgstr "リポジトリのアンロック"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:56
 msgid "Confirm to unlock repository"
-msgstr "このリポジトリのロックを外しますか？"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:271
-msgid "Lock repo"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:271
+msgstr "このリポジトリのロックを解除しますか？"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:58
+msgid "Unlock repository"
+msgstr "リポジトリのロックを解除"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:64
 msgid "Confirm to lock repository"
 msgstr "このリポジトリをロックしますか？"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:272
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:66
+msgid "Lock repository"
+msgstr "リポジトリをロック"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:68
 msgid "Repository is not locked"
 msgstr "リポジトリはロックされていません"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:277
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
-"Force locking on repository. Works only when anonymous access is disabled"
-msgstr "リポジトリを強制ロックします。匿名アクセスが無効になっている場合のみ動作します。"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:284
-msgid "Set as fork of"
-msgstr "フォーク元の設定"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:289
-msgid "Set"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:293
-msgid "Manually set this repository as a fork of another from the list"
-msgstr "このリポジトリをリスト中の他のリポジトリのフォークとして、手動で設定します"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:308
-msgid "Remove this repository"
+"Force locking on repository. Works only when anonymous access is disabled. "
+"Trigering a pull locks repository by user who pulled, only the same user can"
+" unlock by doing a push"
+msgstr "リポジトリのロックを強制します。匿名アクセスが無効のときしか使えません。ユーザーがリポジトリをプルすると、そのユーザーでリポジトリをロックし、同じユーザーがプッシュするまでアンロックしません。"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:83
+#: rhodecode/templates/data_table/_dt_elements.html:132
+#, python-format
+msgid "Confirm to delete this repository: %s"
+msgstr "このリポジトリを削除してもよろしいですか？ : %s"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:85
+msgid "Delete this repository"
 msgstr "このリポジトリを削除"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:308
-msgid "Confirm to delete this repository"
-msgstr "このリポジトリを削除しますか？"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:310
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:88
 #, python-format
 msgid "this repository has %s fork"
 msgid_plural "this repository has %s forks"
 msgstr[0] "%s 個のフォークがあります"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:311
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:89
 msgid "Detach forks"
 msgstr "フォークの切り離し"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:312
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:90
 msgid "Delete forks"
 msgstr "フォークも削除"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:315
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be unaccesible "
 "for RhodeCode and VCS systems. If you need to fully delete it from file "
 "system please do it manually"
 msgstr "このリポジトリはRhodeCodeとVCSシステムからアクセス出来ないようにするために特別な方法でリネームされます。\n完全な削除が必要な場合はファイルシステムから手動で削除してください"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:329
-msgid "Extra fields"
-msgstr "拡張フィールド"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:341
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Invalidate repository cache"
+msgstr "リポジトリのキャッシュを無効化"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Confirm to invalidate repository cache"
+msgstr "リポジトリのキャッシュを無効化してもよろしいですか？"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:7
+msgid ""
+"Manually invalidate cache for this repository. On first access repository "
+"will be cached again"
+msgstr "このリポジトリのキャッシュを手動で無効化します。リポジトリへの初回アクセス時に再びキャッシュされます。"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:12
+msgid "List of cached values"
+msgstr "キャッシュしている値の一覧"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:15
+msgid "Prefix"
+msgstr "プレフィックス"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:16
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:6
+msgid "Key"
+msgstr "キー"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:17
+#: rhodecode/templates/admin/user_groups/user_group_add.html:52
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:24
+#: rhodecode/templates/admin/user_groups/user_groups.html:53
+#: rhodecode/templates/admin/users/user_add.html:91
+#: rhodecode/templates/admin/users/user_edit_profile.html:105
+#: rhodecode/templates/admin/users/users.html:57
+msgid "Active"
+msgstr "アクティブ"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:5
+msgid "Label"
+msgstr "ラベル"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:19
 #, python-format
 msgid "Confirm to delete this field: %s"
-msgstr "このフィールドを削除してよろしいですか: %s"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:355
+msgstr "このフィールドを削除してもよろしいですか？ : %s"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:33
 msgid "New field key"
 msgstr "新しいフィールドのキー"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:363
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:41
 msgid "New field label"
 msgstr "新しいフィールドのラベル"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:366
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:44
 msgid "Enter short label"
 msgstr "ラベルを入力してください"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:372
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:50
 msgid "New field description"
 msgstr "新しいフィールドの説明"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:375
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:53
 msgid "Enter description of a field"
 msgstr "フィールドの説明を入力してください"
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:3
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3
-msgid "none"
-msgstr "なし"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:4
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4
-msgid "read"
-msgstr "読込"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:5
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5
-msgid "write"
-msgstr "書込"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:6
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6
-msgid "admin"
-msgstr "管理"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:7
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7
-msgid "member"
-msgstr "メンバー"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:16
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:66
+msgid "Extra fields are disabled"
+msgstr "拡張フィールドは無効化されています"
+
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:21
 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:20
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35
-msgid "default"
-msgstr "default"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:33
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:58
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:55
-msgid "revoke"
-msgstr "取消"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:83
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81
-msgid "Add another member"
-msgstr "別のメンバーを追加"
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:3
+msgid "Remote url"
+msgstr "リモート URL"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+msgid "Pull changes from remote location"
+msgstr "リモートから変更を取り込む"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+msgid "Confirm to pull changes from remote side"
+msgstr "リモートから変更を取り込んでもよろしいですか？"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:14
+msgid "This repository does not have any remote url set"
+msgstr "このリポジトリにリモート URLは設定されていません"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "Non-changeable id"
+msgstr "変更不能ID"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "what is that ?"
+msgstr "これは何？"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:13
+msgid "URL by id"
+msgstr "id を使ってURLを表現"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:14
+msgid ""
+"In case this repository is renamed or moved into another group the repository url changes.\n"
+"                               Using above url guarantees that this repository will allways be accessible under such url.\n"
+"                               Usefull for CI systems, or any other cases that you need to hardcode the url into 3rd party service."
+msgstr "通常、リポジトリの名前を変更したり、別のグループに移動すると、リポジトリのURLが変わります。\n上のURLを使えば、常にリポジトリにアクセスできます。\nこの機能は、CIを使っている場合や、3rd pirtyのサービス向けにURLをハードコードしたいときに便利です。"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:21
+msgid "Clone uri"
+msgstr "クローンURI"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:27
+#: rhodecode/templates/base/perms_summary.html:43
+#: rhodecode/templates/base/perms_summary.html:79
+#: rhodecode/templates/base/perms_summary.html:81
+#: rhodecode/templates/data_table/_dt_elements.html:124
+#: rhodecode/templates/data_table/_dt_elements.html:125
+#: rhodecode/templates/data_table/_dt_elements.html:152
+#: rhodecode/templates/data_table/_dt_elements.html:153
+#: rhodecode/templates/data_table/_dt_elements.html:169
+#: rhodecode/templates/data_table/_dt_elements.html:185
+msgid "edit"
+msgstr "編集"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:30
+msgid "new value"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:37
+msgid "http[s] url used for doing remote pulls."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:46
+msgid "Optional select a group to put this repository into."
+msgstr "オプション：このリポジトリが属するグループを選択します"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:55
+#: rhodecode/templates/forks/fork.html:65
+msgid "Default revision for files page, downloads, whoosh and readme"
+msgstr "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定します"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:65
+msgid "Change owner of this repository."
+msgstr "リポジトリの所有者を変更"
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:6
+msgid "Processed commits"
+msgstr "処理済みコミット数"
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:7
+msgid "Processed progress"
+msgstr "処理状況"
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Reset statistics"
+msgstr "統計情報をリセット"
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Confirm to remove current statistics"
+msgstr "現在の統計情報をリセットしてもよろしいですか？"
 
 #: rhodecode/templates/admin/repos/repos.html:5
 msgid "Repositories administration"
 msgstr "リポジトリ管理"
 
-#: rhodecode/templates/admin/repos/repos.html:88
-#: rhodecode/templates/admin/users/user_edit_my_account.html:185
-#: rhodecode/templates/admin/users/users.html:109
-#: rhodecode/templates/bookmarks/bookmarks.html:76
-#: rhodecode/templates/branches/branches.html:75
-#: rhodecode/templates/journal/journal.html:206
-#: rhodecode/templates/journal/journal.html:296
-#: rhodecode/templates/tags/tags.html:76
-msgid "No records found."
-msgstr "レコードが見つかりません"
-
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
-msgid "apply to children"
-msgstr "子リポジトリにも適用"
-
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88
-msgid ""
-"Set or revoke permission to all children of that group, including non-"
-"private repositories and other groups"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
-#, python-format
-msgid "%s Group Dashboard"
-msgstr "%s グループダッシュボード"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:9
-msgid "Home"
-msgstr "ホーム"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:13
-msgid "with"
-msgstr "と"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
-msgid "Add repository group"
-msgstr "リポジトリグループを追加"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16
-#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91
-msgid "Repository groups"
-msgstr "リポジトリグループ"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13
-msgid "Add new repository group"
-msgstr "新しいリポジトリグループを追加"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56
-msgid "Group parent"
-msgstr "親グループ"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59
-msgid "save"
-msgstr "保存"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
-msgid "Edit repository group"
-msgstr "リポジトリグループを編集"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13
-#, python-format
-msgid "Edit repository group %s"
-msgstr "リポジトリグループを編集 %s"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27
-msgid "Add child group"
-msgstr "子グループを追加"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68
-msgid ""
-"Enable lock-by-pulling on group. This option will be applied to all other "
-"groups and repositories inside"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
-msgid "Repository groups administration"
-msgstr "リポジトリグループ管理"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45
-msgid "Number of toplevel repositories"
-msgstr "トップレベルリポジトリの数"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64
-#: rhodecode/templates/admin/users_groups/users_groups.html:48
-#: rhodecode/templates/changeset/changeset_file_comment.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:171
-msgid "Edit"
-msgstr "編集"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65
-#: rhodecode/templates/admin/users_groups/users_groups.html:49
-#: rhodecode/templates/base/perms_summary.html:29
-#: rhodecode/templates/base/perms_summary.html:60
-#: rhodecode/templates/base/perms_summary.html:62
-#: rhodecode/templates/data_table/_dt_elements.html:116
-#: rhodecode/templates/data_table/_dt_elements.html:117
-#: rhodecode/templates/data_table/_dt_elements.html:130
-#: rhodecode/templates/data_table/_dt_elements.html:131
-msgid "edit"
-msgstr "編集"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
-#, python-format
-msgid "Confirm to delete this group: %s with %s repository"
-msgid_plural "Confirm to delete this group: %s with %s repositories"
-msgstr[0] "このグループを削除してもよろしいですか？: %s %s リポジトリ"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78
-msgid "There are no repository groups yet"
-msgstr "まだリポジトリグループがありません"
-
-#: rhodecode/templates/admin/settings/hooks.html:5
+#: rhodecode/templates/admin/repos/repos.html:54
+msgid "State"
+msgstr "状態"
+
 #: rhodecode/templates/admin/settings/settings.html:5
 msgid "Settings administration"
 msgstr "設定管理"
 
-#: rhodecode/templates/admin/settings/hooks.html:24
-msgid "Built in hooks - read only"
-msgstr "組み込みフック - 読み込み専用"
-
-#: rhodecode/templates/admin/settings/hooks.html:40
-msgid "Custom hooks"
-msgstr "カスタムフック"
-
-#: rhodecode/templates/admin/settings/hooks.html:56
-msgid "remove"
-msgstr "削除"
-
-#: rhodecode/templates/admin/settings/hooks.html:88
-msgid "Failed to remove hook"
-msgstr "フックの削除に失敗しました"
-
-#: rhodecode/templates/admin/settings/settings.html:26
-msgid "Remap and rescan repositories"
-msgstr "リポジトリの再マッピングと再スキャン"
-
-#: rhodecode/templates/admin/settings/settings.html:34
-msgid "Rescan option"
-msgstr "再スキャンオプション"
-
 #: rhodecode/templates/admin/settings/settings.html:40
-msgid ""
-"In case a repository was deleted from filesystem and there are leftovers in "
-"the database check this option to scan obsolete data in database and remove "
-"it."
-msgstr ""
+msgid "VCS"
+msgstr "VCS"
 
 #: rhodecode/templates/admin/settings/settings.html:41
-msgid "Destroy old data"
-msgstr "古いデータを削除する"
+msgid "Remap and rescan"
+msgstr "再マップと再スキャン"
 
 #: rhodecode/templates/admin/settings/settings.html:43
-msgid ""
-"Rescan repositories location for new repositories. Also deletes obsolete if "
-"`destroy` flag is checked "
-msgstr ""
+msgid "Visual"
+msgstr "表示"
+
+#: rhodecode/templates/admin/settings/settings.html:45
+#: rhodecode/templates/admin/settings/settings_vcs.html:19
+msgid "Hooks"
+msgstr "フック"
+
+#: rhodecode/templates/admin/settings/settings.html:46
+msgid "Full text search"
+msgstr "全文検索"
+
+#: rhodecode/templates/admin/settings/settings.html:47
+msgid "System Info"
+msgstr "システム情報"
 
 #: rhodecode/templates/admin/settings/settings.html:48
-msgid "Rescan repositories"
-msgstr "リポジトリを再チェック"
-
-#: rhodecode/templates/admin/settings/settings.html:54
-msgid "Whoosh indexing"
-msgstr "Whooshインデックス"
-
-#: rhodecode/templates/admin/settings/settings.html:62
-msgid "Index build option"
-msgstr "インデックス作成時の設定"
-
-#: rhodecode/templates/admin/settings/settings.html:67
-msgid "Build from scratch"
-msgstr "一度削除してから再度インデックスを作成"
-
-#: rhodecode/templates/admin/settings/settings.html:73
-msgid "Reindex"
-msgstr "再インデックス"
-
-#: rhodecode/templates/admin/settings/settings.html:79
-msgid "Global application settings"
-msgstr "アプリケーション全体の設定"
-
-#: rhodecode/templates/admin/settings/settings.html:88
+msgid "License"
+msgstr "ライセンス"
+
+#: rhodecode/templates/admin/settings/settings_email.html:4
+msgid "Email prefix"
+msgstr "メールアドレスプレフィックス"
+
+#: rhodecode/templates/admin/settings/settings_email.html:5
+msgid "RhodeCode email from"
+msgstr "RhodeCode メールのFrom"
+
+#: rhodecode/templates/admin/settings/settings_email.html:6
+msgid "Error email from"
+msgstr "エラーメールのFrom"
+
+#: rhodecode/templates/admin/settings/settings_email.html:7
+msgid "Error email recipients"
+msgstr "エラーメールの宛先"
+
+#: rhodecode/templates/admin/settings/settings_email.html:9
+msgid "SMTP server"
+msgstr "SMTP サーバー"
+
+#: rhodecode/templates/admin/settings/settings_email.html:10
+msgid "SMTP username"
+msgstr "SMTP ユーザー名"
+
+#: rhodecode/templates/admin/settings/settings_email.html:11
+msgid "SMTP password"
+msgstr "SMTP パスワード"
+
+#: rhodecode/templates/admin/settings/settings_email.html:12
+msgid "SMTP port"
+msgstr "SMTP ポート"
+
+#: rhodecode/templates/admin/settings/settings_email.html:14
+msgid "SMTP use TLS"
+msgstr "SMTP TLSの使用"
+
+#: rhodecode/templates/admin/settings/settings_email.html:15
+msgid "SMTP use SSL"
+msgstr "SMTP SSLの使用"
+
+#: rhodecode/templates/admin/settings/settings_email.html:16
+msgid "SMTP auth"
+msgstr "SMTP 認証"
+
+#: rhodecode/templates/admin/settings/settings_email.html:31
+msgid "Send test email to"
+msgstr "テストメールの送信"
+
+#: rhodecode/templates/admin/settings/settings_email.html:39
+msgid "Send"
+msgstr "送信"
+
+#: rhodecode/templates/admin/settings/settings_global.html:8
 msgid "Site branding"
 msgstr "サイト名"
 
-#: rhodecode/templates/admin/settings/settings.html:97
+#: rhodecode/templates/admin/settings/settings_global.html:12
+msgid "Set a custom title for your RhodeCode Service."
+msgstr "このRhodeCodeサービスのカスタムタイトルを設定します。"
+
+#: rhodecode/templates/admin/settings/settings_global.html:18
 msgid "HTTP authentication realm"
 msgstr "HTTP認証レルム"
 
-#: rhodecode/templates/admin/settings/settings.html:106
+#: rhodecode/templates/admin/settings/settings_global.html:27
 msgid "Google Analytics code"
 msgstr "Google Analyticsコード"
 
-#: rhodecode/templates/admin/settings/settings.html:114
-#: rhodecode/templates/admin/settings/settings.html:195
-#: rhodecode/templates/admin/settings/settings.html:287
+#: rhodecode/templates/admin/settings/settings_global.html:36
+msgid "ReCaptcha public key"
+msgstr "ReCaptcha 公開鍵"
+
+#: rhodecode/templates/admin/settings/settings_global.html:40
+msgid "Public key for reCaptcha system."
+msgstr "reCaptchaの公開鍵。"
+
+#: rhodecode/templates/admin/settings/settings_global.html:46
+msgid "ReCaptcha private key"
+msgstr "ReCaptcha 秘密鍵"
+
+#: rhodecode/templates/admin/settings/settings_global.html:50
+msgid ""
+"Private key for reCaptcha system. Setting this value will enable captcha on "
+"registration"
+msgstr "reCaptchaの秘密鍵。この値が設定されると登録時のキャプチャが有効になります。"
+
+#: rhodecode/templates/admin/settings/settings_global.html:55
+#: rhodecode/templates/admin/settings/settings_license.html:42
+#: rhodecode/templates/admin/settings/settings_vcs.html:80
+#: rhodecode/templates/admin/settings/settings_visual.html:115
 msgid "Save settings"
 msgstr "設定を保存"
 
-#: rhodecode/templates/admin/settings/settings.html:121
-msgid "Visualisation settings"
-msgstr "表示の設定"
-
-#: rhodecode/templates/admin/settings/settings.html:129
-msgid "General"
-msgstr "一般"
-
-#: rhodecode/templates/admin/settings/settings.html:134
-msgid "Use repository extra fields"
-msgstr "リポジトリの拡張フィールドを使用"
-
-#: rhodecode/templates/admin/settings/settings.html:136
-msgid "Allows storing additional customized fields per repository."
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:139
-msgid "Show RhodeCode version"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:141
-msgid "Shows or hides displayed version of RhodeCode in the footer"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:146
-msgid "Dashboard items"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:150
+#: rhodecode/templates/admin/settings/settings_hooks.html:1
+msgid "Built in Mercurial hooks - read only"
+msgstr "組み込みのMercurialフック - 編集不可"
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:15
+msgid ""
+"Hooks can be used to trigger actions on certain events such as push / pull. "
+"They can trigger Python functions or external applications."
+msgstr "フックを使うと、リポジトリへのプッシュやプルといった特定のイベントに合わせて、何らかのアクションを実行できます。フック機能では、Pythonの関数を呼び出したり、外部アプリケーションを起動したりできます。"
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:19
+msgid "Custom hooks"
+msgstr "カスタムフック"
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:69
+msgid "Failed to remove hook"
+msgstr "フックの削除に失敗しました"
+
+#: rhodecode/templates/admin/settings/settings_license.html:2
+msgid "Currently you're using a free license, which is limited to 20 users."
+msgstr "20ユーザーまで利用可能な無料ライセンスを使用しています。"
+
+#: rhodecode/templates/admin/settings/settings_license.html:9
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "RhodeCode version"
+msgstr "RhodeCode バージョン"
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "License token"
+msgstr "ライセンストークン"
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "No license token"
+msgstr "設定されていません"
+
+#: rhodecode/templates/admin/settings/settings_license.html:13
+msgid "License issued to"
+msgstr "ライセンス発行先"
+
+#: rhodecode/templates/admin/settings/settings_license.html:14
+msgid "License issued on"
+msgstr "ライセンス発行日"
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "License users limit"
+msgstr "ライセンスユーザー制限"
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "unlimited"
+msgstr "制限なし"
+
+#: rhodecode/templates/admin/settings/settings_license.html:16
+msgid "License expires on"
+msgstr "ライセンス有効期限"
+
+#: rhodecode/templates/admin/settings/settings_license.html:33
+msgid "License key"
+msgstr "ライセンスキー"
+
+#: rhodecode/templates/admin/settings/settings_license.html:37
+msgid "Paste your RhodeCode license key into that textarea."
+msgstr "RhodeCode ライセンスキーをテキストエリアにペーストしてください。"
+
+#: rhodecode/templates/admin/settings/settings_license.html:52
+msgid ""
+"Please enter following lines (if yet not present) into [app:main] section of"
+" your .ini file. The token below is autogenerated."
+msgstr "以下の行を .ini ファイルの [app:main] セクションに (まだなければ) 入力してください。以下のトークンは、自動生成されています。"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:6
+msgid "Rescan option"
+msgstr "再スキャンオプション"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:11
+msgid "Destroy old data"
+msgstr "古いデータを削除する"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:13
 msgid ""
-"Number of items displayed in lightweight dashboard before pagination is "
-"shown."
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:155
-msgid "Icons"
-msgstr "アイコン"
-
-#: rhodecode/templates/admin/settings/settings.html:160
-msgid "Show public repo icon on repositories"
-msgstr "公開リポジトリのアイコンを表示"
-
-#: rhodecode/templates/admin/settings/settings.html:164
-msgid "Show private repo icon on repositories"
-msgstr "非公開リポジトリのアイコンを表示"
-
-#: rhodecode/templates/admin/settings/settings.html:166
-msgid "Show public/private icons next to repositories names"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:172
-msgid "Meta-Tagging"
-msgstr "メタタグ"
-
-#: rhodecode/templates/admin/settings/settings.html:177
-msgid "Stylify recognised metatags:"
-msgstr "次のメタタグを変換する"
-
-#: rhodecode/templates/admin/settings/settings.html:204
-msgid "VCS settings"
-msgstr "VCSの設定"
-
-#: rhodecode/templates/admin/settings/settings.html:213
+"In case a repository was deleted from filesystem and it still exists in the "
+"database check this option to scan obsolete data in database and remove it."
+msgstr "リポジトリがファイルシステム上からなくなったのに、データベース上には残っている場合、このオプションを選んで、データベースから古いデータベースを検出し、削除してください。"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:17
+msgid "Invalidate cache for all repositories"
+msgstr "すべてのリポジトリのキャッシュを無効化する"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:19
+msgid ""
+"Each cache data for repositories will be cleaned with this option selected. "
+"Use this to reload data and clear cache keys."
+msgstr "このオプションを選ぶと、各リポジトリのキャッシュデータを抹消します。データのリロードやキャッシュキーの消去が必要なときに使ってください。"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:23
+msgid "Install GIT hooks"
+msgstr "GITフックをインストール"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:25
+msgid ""
+"Verify if RhodeCodes GIT hooks are installed for each repository. Current "
+"hooks will be updated to latest version"
+msgstr "各リポジトリに RhodeCodes の GIT フックがインストールされているか確認してください。現在のフックは最新版に更新されます"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:32
+msgid "Rescan Repositories"
+msgstr "リポジトリを再スキャン"
+
+#: rhodecode/templates/admin/settings/settings_search.html:7
+msgid "Index build option"
+msgstr "インデックス作成時の設定"
+
+#: rhodecode/templates/admin/settings/settings_search.html:12
+msgid "Build from scratch"
+msgstr "一度削除してから再度インデックスを作成"
+
+#: rhodecode/templates/admin/settings/settings_search.html:15
+msgid ""
+"This option completely reindex all the files within RhodeCode for proper "
+"fulltext search capabilities."
+msgstr "このオプションを使うと、全文検索の機能が正しく発揮されるよう、 RhodeCode 中の全てのファイルのインデックスを再生成します。"
+
+#: rhodecode/templates/admin/settings/settings_search.html:21
+msgid "Reindex"
+msgstr "再インデックス"
+
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "check for updates"
+msgstr "更新を確認"
+
+#: rhodecode/templates/admin/settings/settings_system.html:5
+msgid "Python version"
+msgstr "Python バージョン"
+
+#: rhodecode/templates/admin/settings/settings_system.html:6
+msgid "Platform"
+msgstr "プラットフォーム"
+
+#: rhodecode/templates/admin/settings/settings_system.html:7
+msgid "GIT version"
+msgstr "GIT バージョン"
+
+#: rhodecode/templates/admin/settings/settings_system.html:8
+msgid "GIT path"
+msgstr "GIT パス"
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Upgrade info endpoint"
+msgstr "更新情報のエンドポイント"
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Note: please make sure this server can access this url"
+msgstr "ノート: サーバーがこのURLにアクセスできることを確認して下さい"
+
+#: rhodecode/templates/admin/settings/settings_system.html:14
+msgid "Checking for updates..."
+msgstr "更新を確認中..."
+
+#: rhodecode/templates/admin/settings/settings_system.html:22
+msgid "Python packages"
+msgstr "Python パッケージ"
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr "Web"
 
-#: rhodecode/templates/admin/settings/settings.html:218
+#: rhodecode/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr "VCSの操作にSSLを必須とする"
 
-#: rhodecode/templates/admin/settings/settings.html:220
+#: rhodecode/templates/admin/settings/settings_vcs.html:13
 msgid ""
-"RhodeCode will require SSL for pushing or pulling. If SSL is missing it will"
-" return HTTP Error 406: Not Acceptable"
-msgstr "RhodeCodeはPushとPullにSSLを要求します。もしSSLでない場合、HTTP Error 406: Not Acceptalbeを返します"
-
-#: rhodecode/templates/admin/settings/settings.html:226
-msgid "Hooks"
-msgstr "フック"
-
-#: rhodecode/templates/admin/settings/settings.html:231
-msgid "Update repository after push (hg update)"
-msgstr "プッシュ後にリポジトリをを更新する (hg update)"
-
-#: rhodecode/templates/admin/settings/settings.html:235
+"Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
+"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+msgstr "プッシュ、プル時にSSLを要求します。SSLでない場合はHTTP Error 406: Not Acceptableを返します。"
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr "プッシュ後にリポジトリのサイズを表示する"
 
-#: rhodecode/templates/admin/settings/settings.html:239
+#: rhodecode/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr "ユーザーのプッシュコマンドを記録する"
 
-#: rhodecode/templates/admin/settings/settings.html:243
+#: rhodecode/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
 msgstr "ユーザーのプルコマンドを記録する"
 
-#: rhodecode/templates/admin/settings/settings.html:247
-msgid "Advanced setup"
-msgstr "高度な設定"
-
-#: rhodecode/templates/admin/settings/settings.html:252
+#: rhodecode/templates/admin/settings/settings_vcs.html:36
+msgid "Update repository after push (hg update)"
+msgstr "プッシュ後にリポジトリを更新する (hg update)"
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:42
 msgid "Mercurial Extensions"
 msgstr "Mercurialエクステンション"
 
-#: rhodecode/templates/admin/settings/settings.html:257
+#: rhodecode/templates/admin/settings/settings_vcs.html:47
 msgid "Enable largefiles extension"
-msgstr "largefilesエクステンションを有効化"
-
-#: rhodecode/templates/admin/settings/settings.html:261
+msgstr "largefilesエクステンションを有効にする"
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:51
 msgid "Enable hgsubversion extension"
-msgstr "hgsubversionエクステンションを有効化"
-
-#: rhodecode/templates/admin/settings/settings.html:263
+msgstr "hgsubversionエクステンションを有効にする"
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:53
 msgid ""
-"Requires hgsubversion library installed. Allows cloning from svn remote "
-"locations"
-msgstr "hgsubversion のインストールが必要です。リモートロケーションのsvnからクローン出来るようになります"
-
-#: rhodecode/templates/admin/settings/settings.html:274
+"Requires hgsubversion library to be installed. Allows cloning remote SVN "
+"repositories and migrates them to Mercurial type."
+msgstr "hgsubversion ライブラリのインストールが必要です。リモートのSVNリポジトリをクローンしてMercurialリポジトリに変換するすることが可能です。"
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:64
 msgid "Repositories location"
 msgstr "リポジトリロケーション"
 
-#: rhodecode/templates/admin/settings/settings.html:279
+#: rhodecode/templates/admin/settings/settings_vcs.html:69
 msgid ""
 "Click to unlock. You must restart RhodeCode in order to make this setting "
 "take effect."
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:280
-#: rhodecode/templates/base/base.html:143
-msgid "Unlock"
-msgstr "アンロック"
-
-#: rhodecode/templates/admin/settings/settings.html:282
+msgstr "アンロックする。この設定を有効にするためにはRhodeCodeの再起動が必要です。"
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:72
+msgid ""
+"Filesystem location where repositories should be stored. After changing this"
+" value a restart and rescan of the repository folder are required."
+msgstr "リポジトリを保存するファイルシステムのロケーション。この値を変更した場合、サーバーの再起動とリポジトリフォルダの再スキャンが必要です。"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:8
+msgid "General"
+msgstr "一般"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:13
+msgid "Use repository extra fields"
+msgstr "リポジトリの拡張フィールドを使用する"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:15
+msgid "Allows storing additional customized fields per repository."
+msgstr "追加のカスタムフィールドをリポジトリ毎に保存することを許可します。"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:18
+msgid "Show RhodeCode version"
+msgstr "Rhodecodeのバージョンを表示する"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:20
+msgid "Shows or hides a version number of RhodeCode displayed in the footer."
+msgstr "フッターに表示されるRhodeCodeのバージョン番号の表示、非表示を設定します。"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:24
+msgid "Use Gravatars in RhodeCode"
+msgstr "Gravatorsを利用する"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:30
+msgid ""
+"Gravatar url allows you to use other avatar server application.\n"
+"                                                        Following variables of the URL will be replaced accordingly.\n"
+"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {email}     user email,\n"
+"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
+"                                                        {size}      size of the image that is expected from the server application,\n"
+"                                                        {netloc}    network location/server host of running RhodeCode server"
+msgstr "Gravatar URL を設定すると、外部のアバターサーバーアプリケーションを使用します。\n必要に応じて、 URL に以下の変数を使ってください。\n{scheme} RhodeCode サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n{email} ユーザーのメールアドレス\n{md5email} ユーザーのメールアドレスの md5 ハッシュ値 (gravatar.com で使っています)\n{size} サーバーアプリケーションに要求する画像のサイズ\n{netloc} RhodeCode サーバーのアドレスまたはホスト名"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:42
+msgid ""
+"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
+"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {user}   current user username,\n"
+"                                                        {netloc} network location/server host of running RhodeCode server,\n"
+"                                                        {repo}   full repository name,\n"
+"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
+msgstr "クローン URL のスキーマは、 '{scheme}://{user}@{netloc}/{repo}' のような形式にします。使える変数は下記の通りです:\n                                                        {scheme} RhodeCode サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n                                                        {user}   ユーザーのユーザー名\n                                                        {netloc} RhodeCode サーバーのアドレスまたはホスト名\n                                                        {repo}   リポジトリの完全な名前\n                                                        {repoid} リポジトリの ID。 clone-by-id に使います。"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:54
+msgid "Dashboard items"
+msgstr "ダッシュボードの項目"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:58
+msgid ""
+"Number of items displayed in the main page dashboard before pagination is "
+"shown."
+msgstr "メインページダッシュボードで1ページに表示する要素数。"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:64
+msgid "Admin pages items"
+msgstr "管理ページの項目"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:68
 msgid ""
-"Location where repositories are stored. After changing this value a restart,"
-" and rescan is required"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:303
-msgid "Test Email"
-msgstr "テストメール"
-
-#: rhodecode/templates/admin/settings/settings.html:311
-msgid "Email to"
-msgstr "送信先"
-
-#: rhodecode/templates/admin/settings/settings.html:319
-msgid "Send"
-msgstr "送る"
-
-#: rhodecode/templates/admin/settings/settings.html:325
-msgid "System Info and Packages"
-msgstr "システム情報とパッケージ"
-
-#: rhodecode/templates/admin/settings/settings.html:328
-#: rhodecode/templates/changelog/changelog.html:51
-msgid "Show"
-msgstr "表示"
+"Number of items displayed in the admin pages grids before pagination is "
+"shown."
+msgstr "管理ページで、ページ分割しないでグリッドに表示する項目の数"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:74
+msgid "Icons"
+msgstr "アイコン"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:79
+msgid "Show public repo icon on repositories"
+msgstr "公開リポジトリのアイコンを表示する"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:83
+msgid "Show private repo icon on repositories"
+msgstr "非公開リポジトリのアイコンを表示する"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:85
+msgid "Show public/private icons next to repositories names."
+msgstr "リポジトリ名の横に公開/非公開アイコンを表示します。"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:91
+msgid "Meta-Tagging"
+msgstr "メタタグ"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:96
+msgid "Stylify recognised meta tags:"
+msgstr "次のメタタグを変換する"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:110
+msgid ""
+"Parses meta tags from repository description field and turns them into "
+"colored tags."
+msgstr "リポジトリの説明のメタタグを解析して色つきのタグに変換します。"
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:5
+msgid "Add user group"
+msgstr "ユーザーグループを追加"
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:13
+#: rhodecode/templates/base/base.html:73 rhodecode/templates/base/base.html:93
+msgid "User groups"
+msgstr "ユーザーグループ"
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:28
+msgid "Add User Group"
+msgstr "ユーザーグループを追加"
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:19
+msgid "Short, optional description for this user group."
+msgstr "このユーザーグループの簡潔な説明を書いてください"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:5
+#, python-format
+msgid "%s user group settings"
+msgstr "%s ユーザーグループ設定"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:14
+msgid "User Groups"
+msgstr "ユーザーグループ"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:44
+#: rhodecode/templates/admin/users/user_edit.html:45
+msgid "Default permissions"
+msgstr "デフォルトの権限"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:6
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:32
+#: rhodecode/templates/admin/user_groups/user_groups.html:52
+msgid "Members"
+msgstr "メンバー"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:1
+#, python-format
+msgid "User Group: %s"
+msgstr "ユーサーグループ: %s"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:19
+#: rhodecode/templates/data_table/_dt_elements.html:176
+#, python-format
+msgid "Confirm to delete this user group: %s"
+msgstr "このユーザーグループを削除してもよろしいですか？: %s"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:21
+msgid "Delete this user group"
+msgstr "このユーザーグループを削除"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_members.html:15
+msgid "No members yet"
+msgstr "まだメンバーがいません"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:40
+msgid "Chosen group members"
+msgstr "グループメンバーを選ぶ"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:43
+msgid "Remove all elements"
+msgstr "全ての要素を削除"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:53
+msgid "Available members"
+msgstr "有効なメンバー"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:56
+msgid "Add all elements"
+msgstr "全ての要素を追加"
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:5
+msgid "User groups administration"
+msgstr "ユーザーグループ管理"
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+msgid "user groups"
+msgstr "ユーザーグループ"
 
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr "ユーザーを追加"
 
-#: rhodecode/templates/admin/users/user_add.html:10
-#: rhodecode/templates/admin/users/user_edit.html:11
-#: rhodecode/templates/base/base.html:76
+#: rhodecode/templates/admin/users/user_add.html:13
+#: rhodecode/templates/admin/users/user_edit.html:14
+#: rhodecode/templates/base/base.html:72
 msgid "Users"
 msgstr "ユーザー"
 
-#: rhodecode/templates/admin/users/user_add.html:12
-#: rhodecode/templates/admin/users/users.html:23
-msgid "Add new user"
-msgstr "新しいユーザーを追加"
-
-#: rhodecode/templates/admin/users/user_add.html:50
+#: rhodecode/templates/admin/users/user_add.html:15
+#: rhodecode/templates/admin/users/users.html:27
+msgid "Add User"
+msgstr "ユーザーを追加"
+
+#: rhodecode/templates/admin/users/user_add.html:53
 msgid "Password confirmation"
 msgstr "パスワード再入力"
 
 #: rhodecode/templates/admin/users/user_edit.html:5
-msgid "Edit user"
-msgstr "ユーザーを編集"
-
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#, python-format
-msgid "Edit %s"
-msgstr "編集 %s"
-
-#: rhodecode/templates/admin/users/user_edit.html:34
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:10
-msgid "Change your avatar at"
-msgstr "アイコンを変えられます : "
-
-#: rhodecode/templates/admin/users/user_edit.html:35
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:11
-msgid "Using"
-msgstr "メールアドレス:"
-
-#: rhodecode/templates/admin/users/user_edit.html:43
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:20
-msgid "API key"
-msgstr "APIキー"
-
-#: rhodecode/templates/admin/users/user_edit.html:50
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25
-msgid "Current IP"
-msgstr "現在のIP"
-
-#: rhodecode/templates/admin/users/user_edit.html:70
-msgid "LDAP DN"
-msgstr "LDAP DN"
-
-#: rhodecode/templates/admin/users/user_edit.html:79
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
-msgid "New password"
-msgstr "新しいパスワード"
-
-#: rhodecode/templates/admin/users/user_edit.html:88
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
+#, python-format
+msgid "%s user settings"
+msgstr "%s ユーザー設定"
+
+#: rhodecode/templates/admin/users/user_edit.html:46
+msgid "Emails"
+msgstr "メールアドレス"
+
+#: rhodecode/templates/admin/users/user_edit.html:47
+msgid "Ip whitelist"
+msgstr "IPアドレスのホワイトリスト"
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:1
+#, python-format
+msgid "User: %s"
+msgstr "ユーザー: %s"
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_profile.html:51
+msgid "Source of Record"
+msgstr "アカウントのソース"
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:9
+msgid "Last Login"
+msgstr "最終ログイン日時"
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:10
+msgid "Member of User groups"
+msgstr "グループのメンバー数"
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:160
+#, python-format
+msgid "Confirm to delete this user: %s"
+msgstr "このユーザーを削除してもよろしいですか？ : %s"
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:23
+msgid "Delete this user"
+msgstr "このユーザーを削除"
+
+#: rhodecode/templates/admin/users/user_edit_ips.html:8
+#, python-format
+msgid "Inherited from %s"
+msgstr "%s から継承"
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:8
+msgid "Change avatar at"
+msgstr "アバターを変更:"
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:12
+msgid "Missing email, please update this user email address."
+msgstr "メールアドレスがありません。このユーザーのメールアドレスを更新してください。"
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:27
+#, python-format
+msgid ""
+"This user is in an external Source of Record (%s); some details cannot be "
+"managed here."
+msgstr "このユーザーは外部の Source of Record (%s) に属しています。ここでは詳細を管理できません。"
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:60
+msgid "Name in Source of Record"
+msgstr "アカウントのソースでの名前"
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr "新しいパスワード 再入力"
 
-#: rhodecode/templates/admin/users/user_edit.html:163
-msgid "Email addresses"
-msgstr "メールアドレス"
-
-#: rhodecode/templates/admin/users/user_edit.html:176
-#, python-format
-msgid "Confirm to delete this email: %s"
-msgstr "このメールを削除してよろしいですか: %s"
-
-#: rhodecode/templates/admin/users/user_edit.html:190
-msgid "New email address"
-msgstr "新しいメールアドレス"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:254
-msgid "My account"
-msgstr "アカウント"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:9
-msgid "My Account"
-msgstr "アカウント"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:35
-msgid "My permissions"
-msgstr "権限"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:54
-msgid "My repos"
-msgstr "リポジトリ"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:41
-msgid "My pull requests"
-msgstr "プルリクエスト"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4
-msgid "Show closed pull requests"
-msgstr "クローズしたプルリクエストを表示"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6
-msgid "Opened by me"
-msgstr "自分が作成"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
-#, python-format
-msgid "Pull request #%s opened on %s"
-msgstr "プルリクエスト #%s %s に作成"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45
-#: rhodecode/templates/pullrequests/pullrequest_data.html:11
-#: rhodecode/templates/pullrequests/pullrequest_show.html:27
-#: rhodecode/templates/pullrequests/pullrequest_show.html:42
-msgid "Closed"
-msgstr "クローズ"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23
-msgid "Confirm to delete this pull request"
-msgstr "このプルリクエストを削除しますか？"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51
-msgid "Nothing here yet"
-msgstr "まだありません"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34
-msgid "I participate in"
-msgstr "レビュアーとして参加"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42
-#: rhodecode/templates/pullrequests/pullrequest_data.html:8
-#, python-format
-msgid "Pull request #%s opened by %s on %s"
-msgstr "プルリクエスト #%s %s によって %s に作成"
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "ユーザー管理"
 
-#: rhodecode/templates/admin/users/users.html:9
+#: rhodecode/templates/admin/users/users.html:13
 msgid "users"
 msgstr "ユーザー"
 
-#: rhodecode/templates/admin/users/users.html:80
+#: rhodecode/templates/admin/users/users.html:54
 msgid "Firstname"
 msgstr "名前"
 
-#: rhodecode/templates/admin/users/users.html:81
+#: rhodecode/templates/admin/users/users.html:55
 msgid "Lastname"
 msgstr "名字"
 
-#: rhodecode/templates/admin/users/users.html:82
+#: rhodecode/templates/admin/users/users.html:56
 msgid "Last login"
 msgstr "最終ログイン日時"
 
-#: rhodecode/templates/admin/users_groups/users_group_add.html:5
-msgid "Add user group"
-msgstr "ユーザーグループを追加"
-
-#: rhodecode/templates/admin/users_groups/users_group_add.html:10
-#: rhodecode/templates/admin/users_groups/users_groups.html:11
-#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94
-msgid "User groups"
-msgstr "ユーザーグループ"
-
-#: rhodecode/templates/admin/users_groups/users_group_add.html:12
-#: rhodecode/templates/admin/users_groups/users_groups.html:26
-msgid "Add new user group"
-msgstr "新しいユーザーグループを追加"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:5
-msgid "Edit user group"
-msgstr "ユーザーグループを編集"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:11
-msgid "UserGroups"
-msgstr "ユーザーグループ"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:50
-#: rhodecode/templates/admin/users_groups/users_groups.html:38
-msgid "Members"
-msgstr "メンバー"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:58
-msgid "Chosen group members"
-msgstr "グループメンバーを選ぶ"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:61
-msgid "Remove all elements"
-msgstr "全ての要素を削除"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:75
-msgid "Available members"
-msgstr "有効なメンバー"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:79
-msgid "Add all elements"
-msgstr "全ての要素を追加"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:109
-msgid "No members yet"
-msgstr "まだメンバーがいません"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:117
-msgid "Global Permissions"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:5
-msgid "User groups administration"
-msgstr "ユーザーグループ管理"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:55
-#, python-format
-msgid "Confirm to delete this user group: %s"
-msgstr "ユーザグループを削除しますか？: %s"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:62
-msgid "There are no user groups yet"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:42
+#: rhodecode/templates/admin/users/users.html:59
+msgid "Auth type"
+msgstr "認証タイプ"
+
+#: rhodecode/templates/base/base.html:37
 #, python-format
 msgid "Server instance: %s"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:52
-msgid "Report a bug"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:121
-#: rhodecode/templates/data_table/_dt_elements.html:9
+msgstr "サーバーインスタンス: %s"
+
+#: rhodecode/templates/base/base.html:46
+msgid "Support"
+msgstr "サポート"
+
+#: rhodecode/templates/base/base.html:131
+msgid "Create fork"
+msgstr "フォークを作成"
+
+#: rhodecode/templates/base/base.html:142
 #: rhodecode/templates/data_table/_dt_elements.html:11
-#: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/summary/summary.html:8
+#: rhodecode/templates/data_table/_dt_elements.html:15
+#: rhodecode/templates/summary/summary.html:11
 msgid "Summary"
 msgstr "要約"
 
-#: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/changelog/changelog.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:17
+#: rhodecode/templates/base/base.html:143
+#: rhodecode/templates/changelog/changelog.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
-#: rhodecode/templates/data_table/_dt_elements.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:23
 msgid "Changelog"
 msgstr "履歴"
 
-#: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/data_table/_dt_elements.html:25
+#: rhodecode/templates/base/base.html:144
 #: rhodecode/templates/data_table/_dt_elements.html:27
-#: rhodecode/templates/data_table/_dt_elements.html:29
-#: rhodecode/templates/files/files.html:12
+#: rhodecode/templates/data_table/_dt_elements.html:31
+#: rhodecode/templates/files/files.html:15
 msgid "Files"
 msgstr "ファイル"
 
-#: rhodecode/templates/base/base.html:125
+#: rhodecode/templates/base/base.html:146
 msgid "Switch To"
 msgstr "ブランチの切り替え"
 
-#: rhodecode/templates/base/base.html:127
-#: rhodecode/templates/base/base.html:279
-msgid "loading..."
-msgstr "読み込み中..."
-
-#: rhodecode/templates/base/base.html:131
+#: rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:155
 msgid "Options"
 msgstr "オプション"
 
-#: rhodecode/templates/base/base.html:137
+#: rhodecode/templates/base/base.html:163
 #: rhodecode/templates/forks/forks_data.html:21
 msgid "Compare fork"
 msgstr "フォークを比較"
 
-#: rhodecode/templates/base/base.html:139
-#: rhodecode/templates/base/base.html:312
-#: rhodecode/templates/search/search.html:14
-#: rhodecode/templates/search/search.html:54
+#: rhodecode/templates/base/base.html:165
+#: rhodecode/templates/bookmarks/bookmarks.html:58
+#: rhodecode/templates/bookmarks/bookmarks_data.html:13
+#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/branches/branches_data.html:13
+#: rhodecode/templates/tags/tags.html:58
+#: rhodecode/templates/tags/tags_data.html:13
+msgid "Compare"
+msgstr "比較"
+
+#: rhodecode/templates/base/base.html:167
+#: rhodecode/templates/base/base.html:334
+#: rhodecode/templates/search/search.html:17
+#: rhodecode/templates/search/search.html:57
 msgid "Search"
 msgstr "検索"
 
-#: rhodecode/templates/base/base.html:145
+#: rhodecode/templates/base/base.html:171
+msgid "Unlock"
+msgstr "アンロック"
+
+#: rhodecode/templates/base/base.html:173
 msgid "Lock"
 msgstr "ロック"
 
-#: rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:181
 msgid "Follow"
 msgstr "フォロー"
 
-#: rhodecode/templates/base/base.html:154
+#: rhodecode/templates/base/base.html:182
 msgid "Unfollow"
 msgstr "アンフォロー"
 
-#: rhodecode/templates/base/base.html:157
-#: rhodecode/templates/data_table/_dt_elements.html:33
+#: rhodecode/templates/base/base.html:185
 #: rhodecode/templates/data_table/_dt_elements.html:35
-#: rhodecode/templates/data_table/_dt_elements.html:37
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/forks/fork.html:9
+#: rhodecode/templates/data_table/_dt_elements.html:39
+#: rhodecode/templates/forks/fork.html:12
 msgid "Fork"
 msgstr "フォーク"
 
-#: rhodecode/templates/base/base.html:159
+#: rhodecode/templates/base/base.html:187
 msgid "Create Pull Request"
 msgstr "プルリクエストを作成"
 
-#: rhodecode/templates/base/base.html:165
-msgid "Show Pull Requests"
-msgstr "プルリクエストを表示"
-
-#: rhodecode/templates/base/base.html:165
-msgid "Pull Requests"
-msgstr "プルリクエスト"
-
-#: rhodecode/templates/base/base.html:202
+#: rhodecode/templates/base/base.html:193
+#, python-format
+msgid "Show Pull Requests for %s"
+msgstr "%s のプルリクエストを表示"
+
+#: rhodecode/templates/base/base.html:230
 msgid "Not logged in"
 msgstr "ログインしていません"
 
-#: rhodecode/templates/base/base.html:209
+#: rhodecode/templates/base/base.html:237
 msgid "Login to your account"
 msgstr "ログイン"
 
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/templates/base/base.html:260
 msgid "Forgot password ?"
-msgstr "パスワードを忘れた場合はこちら"
-
-#: rhodecode/templates/base/base.html:255
+msgstr "パスワードを忘れた?"
+
+#: rhodecode/templates/base/base.html:283
 msgid "Log Out"
 msgstr "ログアウト"
 
-#: rhodecode/templates/base/base.html:274
-msgid "Switch repository"
-msgstr "リポジトリの切り替え"
-
-#: rhodecode/templates/base/base.html:286
+#: rhodecode/templates/base/base.html:308
 msgid "Show recent activity"
 msgstr "最近の活動を表示"
 
-#: rhodecode/templates/base/base.html:287
+#: rhodecode/templates/base/base.html:309
 #: rhodecode/templates/journal/journal.html:4
 msgid "Journal"
 msgstr "ジャーナル"
 
-#: rhodecode/templates/base/base.html:298
+#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:315
+msgid "Public journal"
+msgstr "公開ジャーナル"
+
+#: rhodecode/templates/base/base.html:320
 msgid "Show public gists"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:303
+msgstr "公開 gists を表示"
+
+#: rhodecode/templates/base/base.html:321
+msgid "Gists"
+msgstr "Gists"
+
+#: rhodecode/templates/base/base.html:324
+msgid "Create new gist"
+msgstr "新しい gist を作成"
+
+#: rhodecode/templates/base/base.html:325
 msgid "All public gists"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:305
+msgstr "すべての公開 gists"
+
+#: rhodecode/templates/base/base.html:327
 msgid "My public gists"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:306
+msgstr "公開 gists"
+
+#: rhodecode/templates/base/base.html:328
 msgid "My private gists"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:311
+msgstr "非公開 gists"
+
+#: rhodecode/templates/base/base.html:333
 msgid "Search in repositories"
-msgstr "全てのリポジトリから検索"
+msgstr "リポジトリから検索"
+
+#: rhodecode/templates/base/base.html:394
+msgid "No matches found"
+msgstr "一致するものが見つかりません"
+
+#: rhodecode/templates/base/base.html:522
+msgid "Keyboard shortcuts"
+msgstr "キーボードショートカット"
+
+#: rhodecode/templates/base/base.html:531
+msgid "Site-wide shortcuts"
+msgstr "サイト全体"
 
 #: rhodecode/templates/base/default_perms_box.html:14
-msgid "Inherit default permissions"
-msgstr "デフォルトの権限を継承する"
-
-#: rhodecode/templates/base/default_perms_box.html:18
+msgid "Inherit from defaults"
+msgstr "デフォルト権限を継承"
+
+#: rhodecode/templates/base/default_perms_box.html:19
 #, python-format
 msgid ""
-"Select to inherit permissions from %s settings. With this selected below "
-"options does not apply."
-msgstr ""
-
-#: rhodecode/templates/base/default_perms_box.html:26
+"Select to inherit permissions from %s permissions settings, and default IP "
+"address whitelist."
+msgstr "Select to inherit permissions from %s permissions settings, and default IP address whitelist."
+
+#: rhodecode/templates/base/default_perms_box.html:28
 msgid "Create repositories"
 msgstr "リポジトリを作成する"
 
-#: rhodecode/templates/base/default_perms_box.html:30
+#: rhodecode/templates/base/default_perms_box.html:33
 msgid "Select this option to allow repository creation for this user"
-msgstr ""
-
-#: rhodecode/templates/base/default_perms_box.html:35
+msgstr "ユーザーにリポジトリ作成を許可する場合はこのオプションを選んでください"
+
+#: rhodecode/templates/base/default_perms_box.html:40
 msgid "Create user groups"
-msgstr ""
-
-#: rhodecode/templates/base/default_perms_box.html:39
+msgstr "ユーザーグループを作成"
+
+#: rhodecode/templates/base/default_perms_box.html:45
 msgid "Select this option to allow user group creation for this user"
-msgstr ""
-
-#: rhodecode/templates/base/default_perms_box.html:44
+msgstr "ユーザーにユーザーグループの作成を許可する場合はこのオプションを選んでください"
+
+#: rhodecode/templates/base/default_perms_box.html:52
 msgid "Fork repositories"
 msgstr "リポジトリをフォークする"
 
-#: rhodecode/templates/base/default_perms_box.html:48
+#: rhodecode/templates/base/default_perms_box.html:57
 msgid "Select this option to allow repository forking for this user"
+msgstr "ユーザーにリポジトリのフォークを許可する場合はこのオプションを選んでください"
+
+#: rhodecode/templates/base/perms_summary.html:13
+msgid "show"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:11
+#: rhodecode/templates/base/perms_summary.html:22
 msgid "No permissions defined yet"
 msgstr "まだ権限設定がありません"
 
-#: rhodecode/templates/base/perms_summary.html:19
-#: rhodecode/templates/base/perms_summary.html:38
+#: rhodecode/templates/base/perms_summary.html:30
+#: rhodecode/templates/base/perms_summary.html:54
 msgid "Permission"
 msgstr "権限"
 
-#: rhodecode/templates/base/perms_summary.html:20
-#: rhodecode/templates/base/perms_summary.html:39
+#: rhodecode/templates/base/perms_summary.html:32
+#: rhodecode/templates/base/perms_summary.html:56
 msgid "Edit Permission"
 msgstr "権限を編集"
 
-#: rhodecode/templates/base/root.html:44
+#: rhodecode/templates/base/perms_summary.html:90
+msgid "No permission defined"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:47
 msgid "Add another comment"
 msgstr "別のコメントを追加"
 
-#: rhodecode/templates/base/root.html:45
-#: rhodecode/templates/data_table/_dt_elements.html:147
+#: rhodecode/templates/base/root.html:48
+#: rhodecode/templates/data_table/_dt_elements.html:216
 msgid "Stop following this repository"
 msgstr "このリポジトリのフォローをやめる"
 
-#: rhodecode/templates/base/root.html:46
+#: rhodecode/templates/base/root.html:49
 msgid "Start following this repository"
 msgstr "このリポジトリのフォローする"
 
-#: rhodecode/templates/base/root.html:47
+#: rhodecode/templates/base/root.html:50
 msgid "Group"
 msgstr "グループ"
 
-#: rhodecode/templates/base/root.html:48
+#: rhodecode/templates/base/root.html:51
 msgid "members"
 msgstr "メンバー"
 
-#: rhodecode/templates/base/root.html:49
-#: rhodecode/templates/pullrequests/pullrequest.html:203
+#: rhodecode/templates/base/root.html:52
+#: rhodecode/templates/pullrequests/pullrequest.html:202
 msgid "Loading ..."
 msgstr "読み込み中..."
 
-#: rhodecode/templates/base/root.html:50
+#: rhodecode/templates/base/root.html:53
+msgid "loading ..."
+msgstr "読み込み中..."
+
+#: rhodecode/templates/base/root.html:54
 msgid "Search truncated"
 msgstr "検索結果は省略されています"
 
-#: rhodecode/templates/base/root.html:51
+#: rhodecode/templates/base/root.html:55
 msgid "No matching files"
 msgstr "マッチするファイルはありません"
 
-#: rhodecode/templates/base/root.html:52
-#: rhodecode/templates/changelog/changelog.html:45
+#: rhodecode/templates/base/root.html:56
+#: rhodecode/templates/changelog/changelog.html:51
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
 msgid "Open new pull request"
 msgstr "新しいプルリクエストを作成"
 
-#: rhodecode/templates/base/root.html:53
+#: rhodecode/templates/base/root.html:57
 msgid "Open new pull request for selected changesets"
 msgstr "選択したチェンジセットから新しいプルリクエストを作成"
 
-#: rhodecode/templates/base/root.html:54
+#: rhodecode/templates/base/root.html:58
 msgid "Show selected changesets __S -> __E"
 msgstr "選択した変更 __S -> __E を表示"
 
-#: rhodecode/templates/base/root.html:55
+#: rhodecode/templates/base/root.html:59
 msgid "Show selected changeset __S"
 msgstr "選択した変更 __S を表示"
 
-#: rhodecode/templates/base/root.html:56
+#: rhodecode/templates/base/root.html:60
 msgid "Selection link"
-msgstr ""
-
-#: rhodecode/templates/base/root.html:57
+msgstr "セレクション・リンク"
+
+#: rhodecode/templates/base/root.html:61
 #: rhodecode/templates/changeset/diff_block.html:8
 msgid "Collapse diff"
-msgstr "差分を折りたたむ"
-
-#: rhodecode/templates/base/root.html:58
+msgstr "差分をたたむ"
+
+#: rhodecode/templates/base/root.html:62
 msgid "Expand diff"
 msgstr "差分を表示"
 
-#: rhodecode/templates/base/root.html:59
+#: rhodecode/templates/base/root.html:63
 msgid "Failed to revoke permission"
-msgstr ""
+msgstr "権限の取消に失敗しました"
+
+#: rhodecode/templates/base/root.html:64
+msgid "confirm to revoke permission for {0}: {1} ?"
+msgstr "権限 {0}: {1} を取り消してもよろしいですか？"
+
+#: rhodecode/templates/base/root.html:68
+msgid "specify changeset"
+msgstr "チェンジセットを指定"
 
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr "%s ブックマーク"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:26
-msgid "Compare bookmarks"
-msgstr ""
-
-#: rhodecode/templates/bookmarks/bookmarks.html:51
-#: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:50
-#: rhodecode/templates/branches/branches_data.html:8
+#: rhodecode/templates/bookmarks/bookmarks.html:29
+msgid "Compare Bookmarks"
+msgstr "ブックマークを比較"
+
+#: rhodecode/templates/bookmarks/bookmarks.html:55
+#: rhodecode/templates/bookmarks/bookmarks_data.html:10
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:10
 #: rhodecode/templates/changelog/changelog_summary_data.html:8
-#: rhodecode/templates/tags/tags.html:51
-#: rhodecode/templates/tags/tags_data.html:8
+#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/tags/tags_data.html:10
 msgid "Author"
 msgstr "作成者"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:52
-#: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:51
-#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/bookmarks/bookmarks.html:56
+#: rhodecode/templates/bookmarks/bookmarks_data.html:12
+#: rhodecode/templates/branches/branches.html:55
+#: rhodecode/templates/branches/branches_data.html:12
 #: rhodecode/templates/changelog/changelog_summary_data.html:5
-#: rhodecode/templates/tags/tags.html:52
-#: rhodecode/templates/tags/tags_data.html:9
+#: rhodecode/templates/tags/tags.html:56
+#: rhodecode/templates/tags/tags_data.html:12
 msgid "Revision"
 msgstr "リビジョン"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:54
-#: rhodecode/templates/bookmarks/bookmarks_data.html:10
-#: rhodecode/templates/branches/branches.html:53
-#: rhodecode/templates/branches/branches_data.html:10
-#: rhodecode/templates/tags/tags.html:54
-#: rhodecode/templates/tags/tags_data.html:10
-msgid "Compare"
-msgstr "比較"
-
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
 msgstr "%s ブランチ"
 
-#: rhodecode/templates/branches/branches.html:26
-msgid "Compare branches"
-msgstr "ブランチの比較"
+#: rhodecode/templates/branches/branches.html:29
+msgid "Compare Branches"
+msgstr "ブランチを比較"
 
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr "%s チェンジログ"
 
-#: rhodecode/templates/changelog/changelog.html:19
+#: rhodecode/templates/changelog/changelog.html:21
 #, python-format
 msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
 msgstr[0] "%d / %d リビジョンを表示"
 
-#: rhodecode/templates/changelog/changelog.html:39
+#: rhodecode/templates/changelog/changelog.html:43
 msgid "Clear selection"
 msgstr "選択を解除"
 
-#: rhodecode/templates/changelog/changelog.html:42
+#: rhodecode/templates/changelog/changelog.html:47
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 msgstr "%s とフォークを比較"
 
-#: rhodecode/templates/changelog/changelog.html:42
-msgid "Compare fork with parent"
-msgstr "フォークを比較"
-
-#: rhodecode/templates/changelog/changelog.html:78
-#: rhodecode/templates/changelog/changelog_summary_data.html:28
-#, python-format
-msgid "Click to open associated pull request #%s"
-msgstr "関連するプルリクエストを開く #%s"
-
-#: rhodecode/templates/changelog/changelog.html:102
-#: rhodecode/templates/summary/summary.html:403
-msgid "Show more"
-msgstr "もっと表示"
-
-#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changelog/changelog.html:49
+#, python-format
+msgid "Compare fork with Parent(%s)"
+msgstr "フォーク元(%s)とフォークを比較"
+
+#: rhodecode/templates/changelog/changelog.html:56
+msgid "Show"
+msgstr "表示"
+
+#: rhodecode/templates/changelog/changelog.html:82
+#: rhodecode/templates/changelog/changelog_summary_data.html:19
+#, python-format
+msgid ""
+"Changeset status: %s\n"
+"Click to open associated pull request #%s"
+msgstr "チェンジセットステータス: %s\n関連するプルリクエスト #%s を開く"
+
+#: rhodecode/templates/changelog/changelog.html:86
+#: rhodecode/templates/compare/compare_cs.html:18
+#, python-format
+msgid "Changeset status: %s"
+msgstr "チェンジセットステータス: %s"
+
+#: rhodecode/templates/changelog/changelog.html:105
+#: rhodecode/templates/compare/compare_cs.html:36
+msgid "Expand commit message"
+msgstr "コミットメッセージを展開"
+
+#: rhodecode/templates/changelog/changelog.html:114
+msgid "Changeset has comments"
+msgstr "チェンジセットにコメントがあります"
+
+#: rhodecode/templates/changelog/changelog.html:124
 #: rhodecode/templates/changelog/changelog_summary_data.html:50
-#: rhodecode/templates/changeset/changeset.html:107
-#: rhodecode/templates/changeset/changeset_range.html:86
+#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset_range.html:93
 #, python-format
 msgid "Bookmark %s"
 msgstr "ブックマーク %s"
 
-#: rhodecode/templates/changelog/changelog.html:121
+#: rhodecode/templates/changelog/changelog.html:130
 #: rhodecode/templates/changelog/changelog_summary_data.html:56
-#: rhodecode/templates/changeset/changeset.html:113
-#: rhodecode/templates/changeset/changeset_range.html:92
+#: rhodecode/templates/changeset/changeset.html:100
+#: rhodecode/templates/changeset/changeset_range.html:99
 #, python-format
 msgid "Tag %s"
 msgstr "タグ %s"
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:135
 #: rhodecode/templates/changelog/changelog_summary_data.html:61
-#: rhodecode/templates/changeset/changeset.html:117
-#: rhodecode/templates/changeset/changeset_range.html:96
+#: rhodecode/templates/changeset/changeset.html:105
+#: rhodecode/templates/changeset/changeset_range.html:103
 #, python-format
 msgid "Branch %s"
 msgstr "ブランチ %s"
 
-#: rhodecode/templates/changelog/changelog.html:286
+#: rhodecode/templates/changelog/changelog.html:299
 msgid "There are no changes yet"
 msgstr "まだ変更がありません"
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:91
+#: rhodecode/templates/changeset/changeset.html:76
 msgid "Removed"
 msgstr "削除"
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:92
+#: rhodecode/templates/changeset/changeset.html:77
 msgid "Changed"
 msgstr "変更"
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset.html:78
 msgid "Added"
 msgstr "追加"
 
 #: rhodecode/templates/changelog/changelog_details.html:8
 #: rhodecode/templates/changelog/changelog_details.html:9
 #: rhodecode/templates/changelog/changelog_details.html:10
-#: rhodecode/templates/changeset/changeset.html:95
-#: rhodecode/templates/changeset/changeset.html:96
-#: rhodecode/templates/changeset/changeset.html:97
+#: rhodecode/templates/changeset/changeset.html:80
+#: rhodecode/templates/changeset/changeset.html:81
+#: rhodecode/templates/changeset/changeset.html:82
 #, python-format
 msgid "Affected %s files"
 msgstr "%s ファイルに影響"
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:6
-#: rhodecode/templates/files/files_add.html:75
-#: rhodecode/templates/files/files_edit.html:61
+#: rhodecode/templates/files/files_add.html:65
+#: rhodecode/templates/files/files_delete.html:53
 msgid "Commit message"
 msgstr "コミットメッセージ"
 
@@ -3682,16 +4692,15 @@
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:9
 msgid "Refs"
-msgstr ""
+msgstr "Refs"
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:86
 msgid "Add or upload files directly via RhodeCode"
 msgstr "RhodeCode経由で直接ファイルを追加またはアップロード"
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:89
-#: rhodecode/templates/files/files_add.html:38
-#: rhodecode/templates/files/files_browser.html:31
-msgid "Add new file"
+#: rhodecode/templates/files/files_ypjax.html:9
+msgid "Add New File"
 msgstr "新しいファイルを追加"
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:95
@@ -3707,178 +4716,200 @@
 msgid "%s Changeset"
 msgstr "%s チェンジセット"
 
-#: rhodecode/templates/changeset/changeset.html:39
-msgid "No parents"
-msgstr "親リビジョンはありません"
-
-#: rhodecode/templates/changeset/changeset.html:49
-msgid "No children"
-msgstr "子リビジョンはありません"
-
-#: rhodecode/templates/changeset/changeset.html:62
-#: rhodecode/templates/changeset/changeset_file_comment.html:20
-#: rhodecode/templates/changeset/changeset_range.html:44
+#: rhodecode/templates/changeset/changeset.html:37
+msgid "parent rev."
+msgstr "親リビジョン"
+
+#: rhodecode/templates/changeset/changeset.html:43
+msgid "child rev."
+msgstr "子リビジョン"
+
+#: rhodecode/templates/changeset/changeset.html:51
+#: rhodecode/templates/changeset/changeset_file_comment.html:41
+#: rhodecode/templates/changeset/changeset_range.html:51
 msgid "Changeset status"
-msgstr "リビジョンステータス"
+msgstr "チェンジセットステータス"
+
+#: rhodecode/templates/changeset/changeset.html:55
+#: rhodecode/templates/changeset/diff_block.html:27
+#: rhodecode/templates/files/diff_2way.html:52
+msgid "Raw diff"
+msgstr "diffとして差分を表示"
+
+#: rhodecode/templates/changeset/changeset.html:58
+msgid "Patch diff"
+msgstr "パッチとして差分を表示"
+
+#: rhodecode/templates/changeset/changeset.html:61
+#: rhodecode/templates/changeset/diff_block.html:30
+#: rhodecode/templates/files/diff_2way.html:55
+msgid "Download diff"
+msgstr "差分をダウンロード"
 
 #: rhodecode/templates/changeset/changeset.html:67
-#: rhodecode/templates/changeset/diff_block.html:22
-msgid "Raw diff"
-msgstr "diffとして差分を表示"
-
-#: rhodecode/templates/changeset/changeset.html:68
-msgid "Patch diff"
-msgstr "パッチとして差分を表示"
-
-#: rhodecode/templates/changeset/changeset.html:69
-#: rhodecode/templates/changeset/diff_block.html:23
-msgid "Download diff"
-msgstr "差分をダウンロード"
-
-#: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:103
+#: rhodecode/templates/changeset/changeset_file_comment.html:111
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
-msgstr[0] "%d コメント"
-
-#: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:103
+msgstr[0] "%d 個のコメント"
+
+#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:111
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
 msgstr[0] "(%d インライン)"
 
-#: rhodecode/templates/changeset/changeset.html:103
-#: rhodecode/templates/changeset/changeset_range.html:82
+#: rhodecode/templates/changeset/changeset.html:88
+#: rhodecode/templates/changeset/changeset_range.html:89
 msgid "merge"
 msgstr "マージ"
 
-#: rhodecode/templates/changeset/changeset.html:126
-#: rhodecode/templates/compare/compare_diff.html:40
-#: rhodecode/templates/pullrequests/pullrequest_show.html:113
+#: rhodecode/templates/changeset/changeset.html:124
+#: rhodecode/templates/compare/compare_diff.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:160
 #, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
 msgstr[0] "%s ファイルに影響"
 
-#: rhodecode/templates/changeset/changeset.html:128
-#: rhodecode/templates/compare/compare_diff.html:42
-#: rhodecode/templates/pullrequests/pullrequest_show.html:115
+#: rhodecode/templates/changeset/changeset.html:126
+#: rhodecode/templates/compare/compare_diff.html:59
+#: rhodecode/templates/pullrequests/pullrequest_show.html:162
 #, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
 msgstr[0] "%s ファイルに影響。 %s 個の追加と %s 個の削除"
 
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Showing a huge diff might take some time and resources"
 msgstr "巨大な差分の表示はすこし時間とリソースがかかる場合があります"
 
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Show full diff"
 msgstr "すべての差分を表示"
 
+#: rhodecode/templates/changeset/changeset.html:214
+#: rhodecode/templates/changeset/changeset.html:251
+msgid "no revisions"
+msgstr "リビジョンなし"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:23
+#, python-format
+msgid "Vote on pull request #%s"
+msgstr "プルリクエスト #%s に投票"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:25
+#, python-format
+msgid "Comment on pull request #%s"
+msgstr "プルリクエスト #%s にコメント"
+
 #: rhodecode/templates/changeset/changeset_file_comment.html:30
-#, python-format
-msgid "Status change on pull request #%s"
-msgstr "プルリクエスト #%s のステータスを変更"
+msgid "Status change on changeset"
+msgstr "チェンジセットのステータスを変更"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:32
-#, python-format
-msgid "Comment on pull request #%s"
-msgstr "プルリクエストにコメント #%s"
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:55
+msgid "Comment on changeset"
+msgstr "チェンジセットにコメント"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:63
 msgid "Submitting..."
-msgstr "サブミット中..."
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:58
+msgstr "送信中..."
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:66
 msgid "Commenting on line {1}."
 msgstr "{1} 行目にコメント"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:59
-#: rhodecode/templates/changeset/changeset_file_comment.html:145
+#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:153
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
 msgstr "コメントには %s 構文 ( %s サポートつき ) が利用出来ます"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:61
-#: rhodecode/templates/changeset/changeset_file_comment.html:147
+#: rhodecode/templates/changeset/changeset_file_comment.html:69
+#: rhodecode/templates/changeset/changeset_file_comment.html:155
 msgid ""
 "Use @username inside this text to send notification to this RhodeCode user"
-msgstr "テキスト内で @username を使うと、この RhodeCode のユーザーに通知を送信します"
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:65
-#: rhodecode/templates/changeset/changeset_file_comment.html:152
+msgstr "テキスト内で @username を使うと、その RhodeCode のユーザーに通知を送信します"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:73
+#: rhodecode/templates/changeset/changeset_file_comment.html:166
 msgid "Preview"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:72
-#: rhodecode/templates/changeset/changeset_file_comment.html:170
-msgid "Comment preview"
-msgstr ""
+msgstr "プレビュー"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:80
-#: rhodecode/templates/changeset/changeset_file_comment.html:177
-#: rhodecode/templates/email_templates/changeset_comment.html:16
+#: rhodecode/templates/changeset/changeset_file_comment.html:189
+msgid "Comment preview"
+msgstr "コメントのプレビュー"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:196
+#: rhodecode/templates/email_templates/changeset_comment.html:11
 #: rhodecode/templates/email_templates/pull_request_comment.html:16
 msgid "Comment"
 msgstr "コメント"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:81
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:96
 msgid "You need to be logged in to comment."
 msgstr "コメントするにはログインが必要です"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:96
 msgid "Login now"
 msgstr "今すぐログインする"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:92
+#: rhodecode/templates/changeset/changeset_file_comment.html:100
 msgid "Hide"
 msgstr "隠す"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:149
-msgid "Change status"
-msgstr "ステータスを変更する"
+#: rhodecode/templates/changeset/changeset_file_comment.html:159
+msgid "Vote for pull request status"
+msgstr "プルリクエストステータスの投票"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:161
+msgid "Change changeset status"
+msgstr "リビジョンステータスを変更"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:179
-msgid "Comment and close"
-msgstr "コメントしてクローズ"
+msgid "Close (when approved or rejected)"
+msgstr "クローズ(承認もしくは却下した場合)"
 
 #: rhodecode/templates/changeset/changeset_range.html:5
 #, python-format
 msgid "%s Changesets"
 msgstr "%s チェンジセット"
 
-#: rhodecode/templates/changeset/changeset_range.html:52
+#: rhodecode/templates/changeset/changeset_range.html:59
 msgid "Files affected"
 msgstr "影響のあるファイル"
 
 #: rhodecode/templates/changeset/diff_block.html:21
+#: rhodecode/templates/files/diff_2way.html:46
 msgid "Show full diff for this file"
 msgstr "このファイルのすべての差分を表示"
 
-#: rhodecode/templates/changeset/diff_block.html:29
+#: rhodecode/templates/changeset/diff_block.html:24
+#: rhodecode/templates/changeset/diff_block.html:68
+#: rhodecode/templates/files/diff_2way.html:49
+msgid "Show full side-by-side diff for this file"
+msgstr "このファイルの差分を並べて表示"
+
+#: rhodecode/templates/changeset/diff_block.html:38
 msgid "Show inline comments"
 msgstr "インラインコメントを表示"
 
-#: rhodecode/templates/changeset/diff_block.html:53
+#: rhodecode/templates/changeset/diff_block.html:62
 msgid "Show file at latest version in this repo"
 msgstr "このリポジトリの最新バージョンのファイルを表示"
 
-#: rhodecode/templates/changeset/diff_block.html:54
+#: rhodecode/templates/changeset/diff_block.html:64
 msgid "Show file at initial version in this repo"
 msgstr "このリポジトリの初期バージョンのファイルを表示"
 
@@ -3886,91 +4917,88 @@
 msgid "No changesets"
 msgstr "チェンジセットはありません"
 
-#: rhodecode/templates/compare/compare_cs.html:32
+#: rhodecode/templates/compare/compare_cs.html:8
 msgid "Ancestor"
 msgstr "祖先"
 
-#: rhodecode/templates/compare/compare_diff.html:5
+#: rhodecode/templates/compare/compare_diff.html:6
+#: rhodecode/templates/compare/compare_diff.html:8
 #, python-format
 msgid "%s Compare"
 msgstr "%s 比較"
 
-#: rhodecode/templates/compare/compare_diff.html:9
+#: rhodecode/templates/compare/compare_diff.html:16
 msgid "Compare revisions"
-msgstr "リビジョンの比較"
-
-#: rhodecode/templates/compare/compare_diff.html:33
-#: rhodecode/templates/pullrequests/pullrequest_show.html:106
+msgstr "リビジョンを比較"
+
+#: rhodecode/templates/compare/compare_diff.html:36
+msgid "Swap"
+msgstr "入れ替え"
+
+#: rhodecode/templates/compare/compare_diff.html:38
+msgid "Compare Revisions"
+msgstr "リビジョンを比較"
+
+#: rhodecode/templates/compare/compare_diff.html:45
+msgid "Compare revisions, branches, bookmarks or tags."
+msgstr "リビジョン、ブランチ、ブックマークもしくはタグの比較を行います。"
+
+#: rhodecode/templates/compare/compare_diff.html:50
+#: rhodecode/templates/pullrequests/pullrequest_show.html:153
 #, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
 msgstr[0] "%s コミットを表示"
 
-#: rhodecode/templates/compare/compare_diff.html:48
-#: rhodecode/templates/pullrequests/pullrequest_show.html:121
+#: rhodecode/templates/compare/compare_diff.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:168
 msgid "No files"
 msgstr "ファイルはありません"
 
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-msgid "confirm to show potentially huge diff"
-msgstr "巨大な差分の可能性がありますが表示しますか？"
-
-#: rhodecode/templates/data_table/_dt_elements.html:54
-#: rhodecode/templates/summary/summary.html:69
+#: rhodecode/templates/data_table/_dt_elements.html:63
 msgid "Mercurial repository"
 msgstr "Mercurialリポジトリ"
 
-#: rhodecode/templates/data_table/_dt_elements.html:56
-#: rhodecode/templates/summary/summary.html:72
+#: rhodecode/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr "Gitリポジトリ"
 
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#, python-format
-msgid "Fork of %s"
-msgstr "%s のフォーク"
-
-#: rhodecode/templates/data_table/_dt_elements.html:88
+#: rhodecode/templates/data_table/_dt_elements.html:72
+msgid "Public repository"
+msgstr "公開リポジトリ"
+
+#: rhodecode/templates/data_table/_dt_elements.html:82
+msgid "Repository creating in progress..."
+msgstr "リポジトリを作成しています..."
+
+#: rhodecode/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr "まだチェンジセットがありません"
 
-#: rhodecode/templates/data_table/_dt_elements.html:95
-#: rhodecode/templates/data_table/_dt_elements.html:97
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "%s の RSS フィードを購読"
 
-#: rhodecode/templates/data_table/_dt_elements.html:103
-#: rhodecode/templates/data_table/_dt_elements.html:105
+#: rhodecode/templates/data_table/_dt_elements.html:111
+#: rhodecode/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "%s の ATOM フィードを購読"
 
-#: rhodecode/templates/data_table/_dt_elements.html:122
-#, python-format
-msgid "Confirm to delete this repository: %s"
-msgstr "このリポジトリを削除しますか？ : %s"
-
-#: rhodecode/templates/data_table/_dt_elements.html:137
-#, python-format
-msgid "Confirm to delete this user: %s"
-msgstr "このユーザーを本当に削除してよろしいですか？: %s"
-
-#: rhodecode/templates/email_templates/changeset_comment.html:4
-#: rhodecode/templates/email_templates/pull_request.html:4
-#: rhodecode/templates/email_templates/pull_request_comment.html:4
-msgid "URL"
-msgstr ""
+#: rhodecode/templates/data_table/_dt_elements.html:141
+msgid "Creating"
+msgstr "作成中"
 
 #: rhodecode/templates/email_templates/changeset_comment.html:6
 #, python-format
 msgid "%s commented on a %s changeset."
-msgstr ""
-
-#: rhodecode/templates/email_templates/changeset_comment.html:14
+msgstr "%s が %s のチェンジセットにコメント"
+
+#: rhodecode/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
-msgstr ""
+msgstr "チェンジセットを次に変更"
 
 #: rhodecode/templates/email_templates/main.html:8
 msgid "This is a notification from RhodeCode."
@@ -3983,7 +5011,7 @@
 
 #: rhodecode/templates/email_templates/password_reset.html:5
 msgid "We received a request to create a new password for your account."
-msgstr "あなたのアカウントの新しいパスワードの生成リクエストを受け取りました。"
+msgstr "アカウントの新しいパスワードの生成リクエストを受け取りました。"
 
 #: rhodecode/templates/email_templates/password_reset.html:6
 msgid "You can generate it by clicking following URL"
@@ -3991,7 +5019,7 @@
 
 #: rhodecode/templates/email_templates/password_reset.html:10
 msgid "Please ignore this email if you did not request a new password ."
-msgstr ""
+msgstr "新しいパスワードを生成しない場合はこのメールを無視してください。"
 
 #: rhodecode/templates/email_templates/pull_request.html:6
 #, python-format
@@ -4000,100 +5028,108 @@
 msgstr "ユーザ %s がリポジトリ %s で新しいプルリクエストを作成しました。変更をレビューしてください。"
 
 #: rhodecode/templates/email_templates/pull_request.html:8
-#: rhodecode/templates/pullrequests/pullrequest.html:34
+#: rhodecode/templates/pullrequests/pullrequest.html:31
 #: rhodecode/templates/pullrequests/pullrequest_data.html:14
-#: rhodecode/templates/pullrequests/pullrequest_show.html:25
+#: rhodecode/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr "タイトル"
 
 #: rhodecode/templates/email_templates/pull_request_comment.html:6
 #, python-format
 msgid "%s commented on pull request \"%s\""
-msgstr ""
+msgstr "%s がプルリクエスト\"%s\" にコメントしました"
 
 #: rhodecode/templates/email_templates/pull_request_comment.html:10
 msgid "Pull request was closed with status"
-msgstr ""
+msgstr "プルリクエストを以下のステータスで閉じました："
 
 #: rhodecode/templates/email_templates/pull_request_comment.html:12
 msgid "Pull request changed status"
-msgstr ""
+msgstr "プルリクエストを以下のステータスに変更しました："
 
 #: rhodecode/templates/email_templates/registration.html:6
 msgid "View this user here"
 msgstr "このユーザを閲覧する"
 
-#: rhodecode/templates/errors/error_document.html:55
+#: rhodecode/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
-msgstr ""
+msgstr "%s へ %s 秒後にリダイレクトします"
+
+#: rhodecode/templates/files/diff_2way.html:15
+#, python-format
+msgid "%s File side-by-side diff"
+msgstr "%s ファイルの差分を並べて表示"
+
+#: rhodecode/templates/files/diff_2way.html:22
+#: rhodecode/templates/files/file_diff.html:11
+msgid "File diff"
+msgstr "ファイル差分"
+
+#: rhodecode/templates/files/diff_2way.html:58
+msgid "ignore white space"
+msgstr "空白を無視"
+
+#: rhodecode/templates/files/diff_2way.html:59
+msgid "turn on edit mode"
+msgstr "編集モード"
 
 #: rhodecode/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr "%s ファイル差分"
 
-#: rhodecode/templates/files/file_diff.html:8
-msgid "File diff"
-msgstr "ファイル差分"
-
 #: rhodecode/templates/files/files.html:4
-#: rhodecode/templates/files/files.html:76
+#: rhodecode/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr "%s ファイル"
 
-#: rhodecode/templates/files/files.html:30
-#: rhodecode/templates/files/files_add.html:31
-#: rhodecode/templates/files/files_edit.html:31
-msgid "Branch"
-msgstr "ブランチ"
-
 #: rhodecode/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr "%s ファイルを追加"
 
-#: rhodecode/templates/files/files_add.html:19
-msgid "Add file"
-msgstr "ファイルを追加"
-
-#: rhodecode/templates/files/files_add.html:43
-msgid "File Name"
-msgstr "ファイル名"
-
-#: rhodecode/templates/files/files_add.html:47
-#: rhodecode/templates/files/files_add.html:56
-msgid "or"
-msgstr "または"
-
-#: rhodecode/templates/files/files_add.html:47
-#: rhodecode/templates/files/files_add.html:52
-msgid "Upload file"
-msgstr "アップロード"
-
-#: rhodecode/templates/files/files_add.html:56
-msgid "Create new file"
-msgstr "新しいファイルを作成"
-
-#: rhodecode/templates/files/files_add.html:61
-#: rhodecode/templates/files/files_edit.html:37
+#: rhodecode/templates/files/files_add.html:25
+msgid "Add new file"
+msgstr "新しいファイルを追加"
+
+#: rhodecode/templates/files/files_add.html:45
+#: rhodecode/templates/files/files_edit.html:43
 #: rhodecode/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "場所"
 
-#: rhodecode/templates/files/files_add.html:65
-msgid "use / to separate directories"
-msgstr "ディレクトリの区切りには / を使います"
-
-#: rhodecode/templates/files/files_add.html:79
-#: rhodecode/templates/files/files_edit.html:65
+#: rhodecode/templates/files/files_add.html:47
+msgid "Enter filename..."
+msgstr "ファイル名..."
+
+#: rhodecode/templates/files/files_add.html:49
+#: rhodecode/templates/files/files_add.html:53
+msgid "or"
+msgstr "または"
+
+#: rhodecode/templates/files/files_add.html:49
+msgid "Upload File"
+msgstr "アップロードファイル"
+
+#: rhodecode/templates/files/files_add.html:53
+msgid "Create New File"
+msgstr "新しいファイルを作成"
+
+#: rhodecode/templates/files/files_add.html:58
+msgid "New file mode"
+msgstr "ファイルモード"
+
+#: rhodecode/templates/files/files_add.html:69
+#: rhodecode/templates/files/files_delete.html:57
+#: rhodecode/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr "変更をコミット"
 
 #: rhodecode/templates/files/files_browser.html:13
-msgid "View"
-msgstr "閲覧"
+msgid "revision"
+msgstr "リビジョン"
 
 #: rhodecode/templates/files/files_browser.html:14
 msgid "Previous revision"
@@ -4103,114 +5139,128 @@
 msgid "Next revision"
 msgstr "次のリビジョン"
 
-#: rhodecode/templates/files/files_browser.html:23
+#: rhodecode/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr "このブランチで追跡"
 
-#: rhodecode/templates/files/files_browser.html:27
-msgid "Search file list"
+#: rhodecode/templates/files/files_browser.html:25
+msgid "Search File List"
 msgstr "ファイル一覧を検索"
 
-#: rhodecode/templates/files/files_browser.html:35
+#: rhodecode/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr "ファイル一覧を読み込み中..."
 
-#: rhodecode/templates/files/files_browser.html:48
+#: rhodecode/templates/files/files_browser.html:42
 msgid "Size"
 msgstr "サイズ"
 
-#: rhodecode/templates/files/files_browser.html:49
+#: rhodecode/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr "Mimetype"
 
-#: rhodecode/templates/files/files_browser.html:50
+#: rhodecode/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr "最後のリビジョン"
 
-#: rhodecode/templates/files/files_browser.html:51
+#: rhodecode/templates/files/files_browser.html:45
 msgid "Last modified"
 msgstr "最終更新日"
 
-#: rhodecode/templates/files/files_browser.html:52
+#: rhodecode/templates/files/files_browser.html:46
 msgid "Last committer"
 msgstr "最後の作成者"
 
+#: rhodecode/templates/files/files_delete.html:4
+#, python-format
+msgid "%s Files Delete"
+msgstr "%s のファイルを削除"
+
+#: rhodecode/templates/files/files_delete.html:25
+#: rhodecode/templates/files/files_delete.html:45
+msgid "Delete file"
+msgstr "ファイルを削除"
+
 #: rhodecode/templates/files/files_edit.html:4
 #, python-format
-msgid "%s Files Edit"
-msgstr "%s ファイルを編集"
-
-#: rhodecode/templates/files/files_edit.html:19
+msgid "%s File Edit"
+msgstr "%s のファイルを編集"
+
+#: rhodecode/templates/files/files_edit.html:25
 msgid "Edit file"
 msgstr "ファイルを編集"
 
-#: rhodecode/templates/files/files_edit.html:47
-#: rhodecode/templates/files/files_source.html:23
-msgid "Show annotation"
+#: rhodecode/templates/files/files_edit.html:53
+#: rhodecode/templates/files/files_source.html:32
+msgid "Show Annotation"
 msgstr "アノテーションを表示"
 
-#: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:26
-msgid "Download as raw"
-msgstr "元のファイルをダウンロード"
-
-#: rhodecode/templates/files/files_edit.html:52
+#: rhodecode/templates/files/files_edit.html:55
+#: rhodecode/templates/files/files_source.html:35
+msgid "Download as Raw"
+msgstr "Raw形式でダウンロード"
+
+#: rhodecode/templates/files/files_edit.html:58
 msgid "Source"
 msgstr "ソース"
 
-#: rhodecode/templates/files/files_edit.html:57
+#: rhodecode/templates/files/files_edit.html:63
 msgid "Editing file"
 msgstr "ファイルを編集"
 
+#: rhodecode/templates/files/files_edit.html:68
+msgid "Commit Message"
+msgstr "コミットメッセージ"
+
 #: rhodecode/templates/files/files_history_box.html:2
-msgid "History"
-msgstr "変更履歴"
-
-#: rhodecode/templates/files/files_history_box.html:9
-msgid "Diff to revision"
-msgstr "このリビジョンの差分を見る"
-
-#: rhodecode/templates/files/files_history_box.html:10
-msgid "Show at revision"
-msgstr "このリビジョンを見る"
-
-#: rhodecode/templates/files/files_history_box.html:11
-msgid "Show full history"
-msgstr "すべての履歴を表示"
-
-#: rhodecode/templates/files/files_history_box.html:16
 #, python-format
 msgid "%s author"
 msgid_plural "%s authors"
-msgstr[0] "%s 作成者"
-
-#: rhodecode/templates/files/files_source.html:6
-msgid "Load file history"
-msgstr "ファイルの履歴を読み込む"
-
-#: rhodecode/templates/files/files_source.html:21
-msgid "Show source"
+msgstr[0] "%s 人の作成者"
+
+#: rhodecode/templates/files/files_source.html:7
+msgid "Diff to Revision"
+msgstr "このリビジョンとの差分"
+
+#: rhodecode/templates/files/files_source.html:8
+msgid "Show at Revision"
+msgstr "このリビジョンを表示"
+
+#: rhodecode/templates/files/files_source.html:10
+msgid "Show Full History"
+msgstr "全ての履歴を表示"
+
+#: rhodecode/templates/files/files_source.html:11
+msgid "Show Authors"
+msgstr "作成者を表示"
+
+#: rhodecode/templates/files/files_source.html:30
+msgid "Show Source"
 msgstr "ソースを表示"
 
-#: rhodecode/templates/files/files_source.html:29
-#, python-format
-msgid "Edit on branch:%s"
+#: rhodecode/templates/files/files_source.html:38
+#, python-format
+msgid "Edit on Branch:%s"
 msgstr "ブランチ:%s で編集"
 
-#: rhodecode/templates/files/files_source.html:31
-msgid "Edit on branch:?"
-msgstr "ブランチ:? で編集"
-
-#: rhodecode/templates/files/files_source.html:31
+#: rhodecode/templates/files/files_source.html:41
+msgid "Editing binary files not allowed"
+msgstr "バイナリファイルの編集は行えません"
+
+#: rhodecode/templates/files/files_source.html:44
 msgid "Editing files allowed only when on branch head revision"
 msgstr "ファイル編集はブランチのヘッドリビジョンでのみ許可されています"
 
-#: rhodecode/templates/files/files_source.html:46
+#: rhodecode/templates/files/files_source.html:45
+msgid "Deleting files allowed only when on branch head revision"
+msgstr "ファイルの削除はブランチのヘッドリビジョンでのみ行えます"
+
+#: rhodecode/templates/files/files_source.html:61
 #, python-format
 msgid "Binary file (%s)"
 msgstr "バイナリファイル (%s)"
 
-#: rhodecode/templates/files/files_source.html:55
+#: rhodecode/templates/files/files_source.html:71
 msgid "File is too big to display"
 msgstr "表示するには大きすぎるファイルです"
 
@@ -4218,11 +5268,11 @@
 msgid "annotation"
 msgstr "アノテーション"
 
-#: rhodecode/templates/files/files_ypjax.html:15
-msgid "Go back"
+#: rhodecode/templates/files/files_ypjax.html:23
+msgid "Go Back"
 msgstr "戻る"
 
-#: rhodecode/templates/files/files_ypjax.html:16
+#: rhodecode/templates/files/files_ypjax.html:24
 msgid "No files at given path"
 msgstr "そのパスにはファイルはありません"
 
@@ -4231,9 +5281,9 @@
 msgid "%s Followers"
 msgstr "%s フォロワー"
 
-#: rhodecode/templates/followers/followers.html:9
-#: rhodecode/templates/summary/summary.html:183
-#: rhodecode/templates/summary/summary.html:184
+#: rhodecode/templates/followers/followers.html:12
+#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/templates/summary/summary.html:150
 msgid "Followers"
 msgstr "フォロワー"
 
@@ -4243,35 +5293,35 @@
 
 #: rhodecode/templates/forks/fork.html:5
 #, python-format
-msgid "%s Fork"
-msgstr "%s フォーク"
-
-#: rhodecode/templates/forks/fork.html:28
+msgid "Fork repository %s"
+msgstr "リポジトリ %s をフォーク"
+
+#: rhodecode/templates/forks/fork.html:30
 msgid "Fork name"
 msgstr "フォーク名"
 
-#: rhodecode/templates/forks/fork.html:65
+#: rhodecode/templates/forks/fork.html:71
 msgid "Private"
 msgstr "非公開"
 
-#: rhodecode/templates/forks/fork.html:74
+#: rhodecode/templates/forks/fork.html:80
 msgid "Copy permissions"
 msgstr "権限のコピー"
 
-#: rhodecode/templates/forks/fork.html:78
+#: rhodecode/templates/forks/fork.html:84
 msgid "Copy permissions from forked repository"
 msgstr "フォーク元リポジトリから権限をコピーします"
 
-#: rhodecode/templates/forks/fork.html:84
+#: rhodecode/templates/forks/fork.html:90
 msgid "Update after clone"
 msgstr "クローン後にupdateする"
 
-#: rhodecode/templates/forks/fork.html:88
+#: rhodecode/templates/forks/fork.html:94
 msgid "Checkout source after making a clone"
 msgstr "クローンした後にソースをチェックアウトします"
 
-#: rhodecode/templates/forks/fork.html:93
-msgid "Fork this repository"
+#: rhodecode/templates/forks/fork.html:99
+msgid "Fork this Repository"
 msgstr "このリポジトリをフォーク"
 
 #: rhodecode/templates/forks/forks.html:5
@@ -4279,9 +5329,9 @@
 msgid "%s Forks"
 msgstr "%s フォーク"
 
-#: rhodecode/templates/forks/forks.html:9
-#: rhodecode/templates/summary/summary.html:189
-#: rhodecode/templates/summary/summary.html:190
+#: rhodecode/templates/forks/forks.html:12
+#: rhodecode/templates/summary/summary.html:155
+#: rhodecode/templates/summary/summary.html:156
 msgid "Forks"
 msgstr "フォーク"
 
@@ -4293,41 +5343,32 @@
 msgid "There are no forks yet"
 msgstr "まだフォークがありません"
 
-#: rhodecode/templates/journal/journal.html:21
+#: rhodecode/templates/journal/journal.html:24
 msgid "ATOM journal feed"
 msgstr "ATOM ジャーナルフィード"
 
-#: rhodecode/templates/journal/journal.html:22
+#: rhodecode/templates/journal/journal.html:25
 msgid "RSS journal feed"
 msgstr "RSS ジャーナルフィード"
 
-#: rhodecode/templates/journal/journal.html:32
-msgid "Refresh"
-msgstr "更新"
-
-#: rhodecode/templates/journal/journal.html:35
-#: rhodecode/templates/journal/public_journal.html:24
-msgid "ATOM feed"
-msgstr "ATOMフィード"
-
-#: rhodecode/templates/journal/journal.html:51
-msgid "Watched"
-msgstr "ウォッチ"
+#: rhodecode/templates/journal/journal.html:57
+msgid "My repos"
+msgstr "リポジトリ"
 
 #: rhodecode/templates/journal/journal_data.html:55
 msgid "No entries yet"
 msgstr "まだエントリがありません"
 
 #: rhodecode/templates/journal/public_journal.html:4
-#: rhodecode/templates/journal/public_journal.html:21
+#: rhodecode/templates/journal/public_journal.html:24
 msgid "Public Journal"
 msgstr "公開ジャーナル"
 
-#: rhodecode/templates/journal/public_journal.html:13
+#: rhodecode/templates/journal/public_journal.html:16
 msgid "ATOM public journal feed"
 msgstr "ATOM 公開ジャーナルフィード"
 
-#: rhodecode/templates/journal/public_journal.html:14
+#: rhodecode/templates/journal/public_journal.html:17
 msgid "RSS public journal feed"
 msgstr "RSS 公開ジャーナルフィード"
 
@@ -4336,127 +5377,154 @@
 msgid "New pull request"
 msgstr "新しいプルリクエスト"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:25
-msgid "Create new pull request"
-msgstr "新しいプルリクエストを作成"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:47
+#: rhodecode/templates/pullrequests/pullrequest.html:44
 msgid "Write a short description on this pull request"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.html:53
+msgstr "このプルリクエストの簡潔な説明を書いてください"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:50
 msgid "Changeset flow"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.html:60
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+msgstr "変更の流れ"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:68
 msgid "Origin repository"
-msgstr "Originリポジトリ"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:85
-msgid "Send pull request"
-msgstr "プルリクエストを送る"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:94
-#: rhodecode/templates/pullrequests/pullrequest_show.html:137
+msgstr "元のリポジトリ"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:82
+msgid "Send Pull Request"
+msgstr "プルリクエストを作成"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:91
+#: rhodecode/templates/pullrequests/pullrequest_show.html:104
 msgid "Pull request reviewers"
 msgstr "プルリクエストレビュアー"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:103
-#: rhodecode/templates/pullrequests/pullrequest_show.html:149
+#: rhodecode/templates/pullrequests/pullrequest.html:100
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
 msgid "owner"
 msgstr "所有者"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:115
+#: rhodecode/templates/pullrequests/pullrequest.html:114
 msgid "Add reviewer to this pull request."
 msgstr "このプルリクエストにレビュアーを追加"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:129
+#: rhodecode/templates/pullrequests/pullrequest.html:128
 msgid "Detailed compare view"
 msgstr "比較ビュー詳細"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:150
+#: rhodecode/templates/pullrequests/pullrequest.html:149
 msgid "Destination repository"
-msgstr ""
+msgstr "相手のリポジトリ"
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
 #, python-format
 msgid "%s Pull Request #%s"
 msgstr "%s プルリクエスト #%s"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:35
+#: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Review status"
 msgstr "レビューステータス"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:40
-msgid "Pull request status"
-msgstr "プルリクエストステータス"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:53
+#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:43
+msgid "Pull request status calculated from votes"
+msgstr "投票からプルリクエストのステータスを計算"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:56
 msgid "Still not reviewed by"
 msgstr "未レビュー"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:60
 #, python-format
 msgid "%d reviewer"
 msgid_plural "%d reviewers"
-msgstr[0] "%d レビュアー"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:59
+msgstr[0] "%d 人のレビュアー"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:62
 msgid "Pull request was reviewed by all reviewers"
 msgstr "プルリクエストはすべてのレビュアーにレビューされました"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:89
-msgid "Created on"
-msgstr "作成日"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:102
+#: rhodecode/templates/pullrequests/pullrequest_show.html:77
+#: rhodecode/templates/pullrequests/pullrequest_show.html:79
+msgid "Pull changes"
+msgstr "変更を取得:"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
+msgid "reviewer"
+msgstr "レビュアー"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:133
+msgid "Add or remove reviewer to this pull request."
+msgstr "このプルリクエストにレビュアーを追加/削除"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:137
+msgid "Save Changes"
+msgstr "変更を保存"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "Compare view"
 msgstr "比較ビュー"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:149
-msgid "reviewer"
-msgstr "レビュアー"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:164
-msgid "Add or remove reviewer to this pull request."
-msgstr "このプルリクエストにレビュアーを追加/削除"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:168
-msgid "Save changes"
-msgstr "変更を保存"
-
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
 #, python-format
 msgid "%s Pull Requests"
 msgstr "%s プルリクエスト"
 
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
+#, python-format
+msgid "Pull requests from %s"
+msgstr "%s からのプルリクエスト"
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:14
+#, python-format
+msgid "Pull requests to %s"
+msgstr "%s へのプルリクエスト"
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:38
+#, python-format
+msgid "Show pull requests to %s"
+msgstr "%s へのプルリクエストを表示"
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:40
+#, python-format
+msgid "Show pull requests from %s"
+msgstr "%s からのプルリクエストを表示"
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:50
+msgid "Hide closed pull requests"
+msgstr "クローズしたプルリクエストを隠す"
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:52
+msgid "Show closed pull requests too"
+msgstr "クローズしたプルリクエストも表示"
+
 #: rhodecode/templates/search/search.html:6
-msgid "Search repository"
-msgstr "リポジトリから検索"
+#, python-format
+msgid "%s Search"
+msgstr "%s 検索"
 
 #: rhodecode/templates/search/search.html:8
-#: rhodecode/templates/search/search.html:16
+#: rhodecode/templates/search/search.html:19
 msgid "Search in all repositories"
 msgstr "全てのリポジトリから検索"
 
-#: rhodecode/templates/search/search.html:50
+#: rhodecode/templates/search/search.html:53
 msgid "Search term"
 msgstr "検索キーワード"
 
-#: rhodecode/templates/search/search.html:62
+#: rhodecode/templates/search/search.html:65
 msgid "Search in"
 msgstr "検索対象"
 
-#: rhodecode/templates/search/search.html:65
+#: rhodecode/templates/search/search.html:68
 msgid "File contents"
-msgstr "ファイル内容"
-
-#: rhodecode/templates/search/search.html:66
+msgstr "ファイルの内容"
+
+#: rhodecode/templates/search/search.html:69
 msgid "Commit messages"
 msgstr "コミットメッセージ"
 
-#: rhodecode/templates/search/search.html:67
+#: rhodecode/templates/search/search.html:70
 msgid "File names"
 msgstr "ファイル名"
 
@@ -4466,6 +5534,75 @@
 msgid "Permission denied"
 msgstr "権限がありません"
 
+#: rhodecode/templates/summary/statistics.html:4
+#, python-format
+msgid "%s Statistics"
+msgstr "%s 統計情報"
+
+#: rhodecode/templates/summary/statistics.html:19
+#: rhodecode/templates/summary/summary.html:42
+#, python-format
+msgid "%s ATOM feed"
+msgstr "%s ATOM フィード"
+
+#: rhodecode/templates/summary/statistics.html:20
+#: rhodecode/templates/summary/summary.html:43
+#, python-format
+msgid "%s RSS feed"
+msgstr "%s RSS フィード"
+
+#: rhodecode/templates/summary/statistics.html:39
+#: rhodecode/templates/summary/summary.html:107
+#: rhodecode/templates/summary/summary.html:123
+msgid "Enable"
+msgstr "有効にする"
+
+#: rhodecode/templates/summary/statistics.html:42
+msgid "Stats gathered: "
+msgstr "収集した統計情報: "
+
+#: rhodecode/templates/summary/statistics.html:91
+#: rhodecode/templates/summary/summary.html:354
+msgid "files"
+msgstr "ファイル"
+
+#: rhodecode/templates/summary/statistics.html:115
+#: rhodecode/templates/summary/summary.html:378
+msgid "Show more"
+msgstr "もっと表示"
+
+#: rhodecode/templates/summary/statistics.html:392
+msgid "commits"
+msgstr "コミット"
+
+#: rhodecode/templates/summary/statistics.html:393
+msgid "files added"
+msgstr "追加されたファイル"
+
+#: rhodecode/templates/summary/statistics.html:394
+msgid "files changed"
+msgstr "変更されたファイル"
+
+#: rhodecode/templates/summary/statistics.html:395
+msgid "files removed"
+msgstr "削除されたファイル"
+
+#: rhodecode/templates/summary/statistics.html:397
+msgid "commit"
+msgstr "コミット"
+
+#: rhodecode/templates/summary/statistics.html:398
+msgid "file added"
+msgstr "追加されたファイル"
+
+#: rhodecode/templates/summary/statistics.html:399
+msgid "file changed"
+msgstr "変更されたファイル"
+
+#: rhodecode/templates/summary/statistics.html:400
+msgid "file removed"
+msgstr "削除されたファイル"
+
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
 msgid "%s Summary"
@@ -4473,170 +5610,85 @@
 
 #: rhodecode/templates/summary/summary.html:16
 #, python-format
-msgid "%s ATOM feed"
-msgstr "%s ATOM フィード"
-
-#: rhodecode/templates/summary/summary.html:17
-#, python-format
-msgid "%s RSS feed"
-msgstr "%s RSS フィード"
-
-#: rhodecode/templates/summary/summary.html:62
-#, python-format
 msgid "Repository locked by %s"
 msgstr "リポジトリは %s によってロックされました"
 
-#: rhodecode/templates/summary/summary.html:64
+#: rhodecode/templates/summary/summary.html:18
 msgid "Repository unlocked"
 msgstr "リポジトリはロックされていません"
 
-#: rhodecode/templates/summary/summary.html:83
-#, python-format
-msgid "Non changable ID %s"
-msgstr "変更不能ID %s"
-
-#: rhodecode/templates/summary/summary.html:88
-msgid "Public"
-msgstr "公開"
-
-#: rhodecode/templates/summary/summary.html:88
-#: rhodecode/templates/summary/summary.html:89
-msgid "Fork of"
-msgstr "フォーク元: "
-
-#: rhodecode/templates/summary/summary.html:97
-msgid "Remote clone"
-msgstr "リモートクローン"
-
-#: rhodecode/templates/summary/summary.html:117
-msgid "Contact"
-msgstr "コンタクト"
-
-#: rhodecode/templates/summary/summary.html:131
+#: rhodecode/templates/summary/summary.html:76
 msgid "Clone url"
 msgstr "クローンURL"
 
-#: rhodecode/templates/summary/summary.html:136
+#: rhodecode/templates/summary/summary.html:81
 msgid "Show by Name"
 msgstr "名前で表示"
 
-#: rhodecode/templates/summary/summary.html:137
+#: rhodecode/templates/summary/summary.html:82
 msgid "Show by ID"
 msgstr "IDで表示"
 
-#: rhodecode/templates/summary/summary.html:143
+#: rhodecode/templates/summary/summary.html:99
 msgid "Trending files"
 msgstr "トレンドファイル"
 
-#: rhodecode/templates/summary/summary.html:151
-#: rhodecode/templates/summary/summary.html:167
-msgid "Enable"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:159
+#: rhodecode/templates/summary/summary.html:115
 msgid "Download"
 msgstr "ダウンロード"
 
-#: rhodecode/templates/summary/summary.html:163
+#: rhodecode/templates/summary/summary.html:119
 msgid "There are no downloads yet"
 msgstr "まだダウンロードがありません"
 
-#: rhodecode/templates/summary/summary.html:165
+#: rhodecode/templates/summary/summary.html:121
 msgid "Downloads are disabled for this repository"
 msgstr "このリポジトリのダウンロードは無効化されています"
 
-#: rhodecode/templates/summary/summary.html:170
+#: rhodecode/templates/summary/summary.html:127
 msgid "Download as zip"
-msgstr "ZIPとしてダウンロード"
-
-#: rhodecode/templates/summary/summary.html:174
+msgstr "ZIPでダウンロード"
+
+#: rhodecode/templates/summary/summary.html:132
 msgid "Check this to download archive with subrepos"
 msgstr "チェックするとダウンロードアーカイブにサブリポジトリが含まれます"
 
-#: rhodecode/templates/summary/summary.html:174
+#: rhodecode/templates/summary/summary.html:132
 msgid "with subrepos"
-msgstr "サブリポジトリを含む"
-
-#: rhodecode/templates/summary/summary.html:197
+msgstr "サブリポジトリを含める"
+
+#: rhodecode/templates/summary/summary.html:163
 msgid "Repository Size"
 msgstr "リポジトリサイズ"
 
-#: rhodecode/templates/summary/summary.html:204
-#: rhodecode/templates/summary/summary.html:206
+#: rhodecode/templates/summary/summary.html:170
+#: rhodecode/templates/summary/summary.html:172
 msgid "Feed"
 msgstr "フィード"
 
-#: rhodecode/templates/summary/summary.html:224
-msgid "Commit activity by day / author"
-msgstr "コミットアクティビティ 日/作成者"
-
-#: rhodecode/templates/summary/summary.html:232
-msgid "enable"
-msgstr "有効にする"
-
-#: rhodecode/templates/summary/summary.html:235
-msgid "Stats gathered: "
-msgstr "収集した統計情報: "
-
-#: rhodecode/templates/summary/summary.html:256
+#: rhodecode/templates/summary/summary.html:193
 msgid "Latest changes"
 msgstr "最近の変更点"
 
-#: rhodecode/templates/summary/summary.html:258
+#: rhodecode/templates/summary/summary.html:195
 msgid "Quick start"
 msgstr "クイックスタート"
 
-#: rhodecode/templates/summary/summary.html:272
-#, python-format
-msgid "Readme file from revision %s"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:332
+#: rhodecode/templates/summary/summary.html:209
+#, python-format
+msgid "Readme file from revision %s:%s"
+msgstr "リビジョン %s:%s の README ファイル"
+
+#: rhodecode/templates/summary/summary.html:299
 #, python-format
 msgid "Download %s as %s"
-msgstr "%s を %sとしてダウンロード"
-
-#: rhodecode/templates/summary/summary.html:379
-msgid "files"
-msgstr "ファイル"
-
-#: rhodecode/templates/summary/summary.html:689
-msgid "commits"
-msgstr "コミット"
-
-#: rhodecode/templates/summary/summary.html:690
-msgid "files added"
-msgstr "追加されたファイル"
-
-#: rhodecode/templates/summary/summary.html:691
-msgid "files changed"
-msgstr "変更されたファイル"
-
-#: rhodecode/templates/summary/summary.html:692
-msgid "files removed"
-msgstr "削除されたファイル"
-
-#: rhodecode/templates/summary/summary.html:694
-msgid "commit"
-msgstr "コミット"
-
-#: rhodecode/templates/summary/summary.html:695
-msgid "file added"
-msgstr "追加されたファイル"
-
-#: rhodecode/templates/summary/summary.html:696
-msgid "file changed"
-msgstr "変更されたファイル"
-
-#: rhodecode/templates/summary/summary.html:697
-msgid "file removed"
-msgstr "削除されたファイル"
+msgstr "%s を %s でダウンロード"
 
 #: rhodecode/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr "%s タグ"
 
-#: rhodecode/templates/tags/tags.html:26
+#: rhodecode/templates/tags/tags.html:29
 msgid "Compare tags"
-msgstr "タグの比較"
+msgstr "タグを比較"
--- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po	Wed Jul 02 19:03:19 2014 -0400
+++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po	Wed Jul 02 19:03:20 2014 -0400
@@ -1,5 +1,5 @@
 # Translations template for RhodeCode.
-# Copyright (C) 2013 Marcin Kuzminski RhodeCode
+# Copyright (C) 2014 RhodeCode GmbH
 # This file is distributed under the same license as the RhodeCode project.
 # Translators:
 # Nemcio <areczek01@gmail.com>, 2013
@@ -10,10 +10,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: RhodeCode\n"
-"Report-Msgid-Bugs-To: marcin@maq.io\n"
-"POT-Creation-Date: 2013-06-05 19:55+0200\n"
-"PO-Revision-Date: 2013-06-07 16:50+0000\n"
-"Last-Translator: Nemcio <areczek01@gmail.com>\n"
+"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
+"POT-Creation-Date: 2014-02-13 15:30+0100\n"
+"PO-Revision-Date: 2014-02-13 14:34+0000\n"
+"Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/RhodeCode/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,1014 +22,1146 @@
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: rhodecode/controllers/changelog.py:149
+#: rhodecode/controllers/changelog.py:88 rhodecode/controllers/compare.py:88
+#: rhodecode/controllers/pullrequests.py:263
+msgid "There are no changesets yet"
+msgstr "Brak zestawienia zmian"
+
+#: rhodecode/controllers/changelog.py:184
 msgid "All Branches"
 msgstr "Wszystkie gałęzie"
 
-#: rhodecode/controllers/changeset.py:84
+#: rhodecode/controllers/changelog.py:187
+msgid "(closed)"
+msgstr "(zamknięty)"
+
+#: rhodecode/controllers/changeset.py:85
 msgid "Show white space"
 msgstr "pokazuj spacje"
 
-#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
+#: rhodecode/controllers/changeset.py:92 rhodecode/controllers/changeset.py:99
 msgid "Ignore white space"
 msgstr "Ignoruj pokazywanie spacji"
 
-#: rhodecode/controllers/changeset.py:164
-#, python-format
-msgid "%s line context"
-msgstr "%s linia w kontekście"
-
-#: rhodecode/controllers/changeset.py:345
-#: rhodecode/controllers/pullrequests.py:478
+#: rhodecode/controllers/changeset.py:165
+#, python-format
+msgid "increase diff context to %(num)s lines"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:207 rhodecode/controllers/files.py:96
+#: rhodecode/controllers/files.py:119
+msgid "Such revision does not exist for this repository"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:353
+#: rhodecode/controllers/pullrequests.py:480
 #, python-format
 msgid "Status change -> %s"
 msgstr "Zmiana statusu -> %s"
 
-#: rhodecode/controllers/changeset.py:376
+#: rhodecode/controllers/changeset.py:384
 msgid ""
 "Changing status on a changeset associated with a closed pull request is not "
 "allowed"
 msgstr "Zmiana statusu na grupy zmian powiązania łączy zamkniętego wniosku jest niedozwolona"
 
-#: rhodecode/controllers/compare.py:74
-#: rhodecode/controllers/pullrequests.py:256
-msgid "There are no changesets yet"
-msgstr "Brak zestawienia zmian"
-
-#: rhodecode/controllers/error.py:69
+#: rhodecode/controllers/compare.py:192 rhodecode/templates/base/root.html:67
+msgid "Select changeset"
+msgstr "Wybrane zmiany"
+
+#: rhodecode/controllers/error.py:70
 msgid "Home page"
 msgstr "Strona główna"
 
-#: rhodecode/controllers/error.py:98
+#: rhodecode/controllers/error.py:99
 msgid ""
 "The request could not be understood by the server due to malformed syntax."
 msgstr "Wniosek nie może być rozumiany przez serwer z powodu zniekształconej składni."
 
-#: rhodecode/controllers/error.py:101
+#: rhodecode/controllers/error.py:102
 msgid "Unauthorized access to resource"
 msgstr "Nieautoryzowany dostęp do zasobów"
 
-#: rhodecode/controllers/error.py:103
+#: rhodecode/controllers/error.py:104
 msgid "You don't have permission to view this page"
 msgstr "Nie masz uprawnień do przeglądania tej strony"
 
-#: rhodecode/controllers/error.py:105
+#: rhodecode/controllers/error.py:106
 msgid "The resource could not be found"
 msgstr "Zasób nie został znaleziony"
 
-#: rhodecode/controllers/error.py:107
+#: rhodecode/controllers/error.py:108
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr "Serwer napotkał niespodziewany warunek, który uniemożliwia jej spełnienie żądania."
 
-#: rhodecode/controllers/feed.py:52
+#: rhodecode/controllers/feed.py:53
 #, python-format
 msgid "Changes on %s repository"
 msgstr "Zmiany w %s repozytorium"
 
-#: rhodecode/controllers/feed.py:53
+#: rhodecode/controllers/feed.py:54
 #, python-format
 msgid "%s %s feed"
 msgstr "%s %s zasilać"
 
-#: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/controllers/feed.py:87
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr "Lista zmian była zbyt duża i została ucięta..."
 
-#: rhodecode/controllers/feed.py:90
+#: rhodecode/controllers/feed.py:91
 #, python-format
 msgid "%s committed on %s"
 msgstr "%s zakomitowal w %s"
 
-#: rhodecode/controllers/files.py:89
+#: rhodecode/controllers/files.py:90
 msgid "Click here to add new file"
 msgstr "Kliknij tutaj, by dodać nowy plik"
 
-#: rhodecode/controllers/files.py:90
-#, python-format
-msgid "There are no files yet %s"
-msgstr "Brak plików %s"
-
-#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339
+#: rhodecode/controllers/files.py:91
+#, python-format
+msgid "There are no files yet. %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:299 rhodecode/controllers/files.py:359
+#: rhodecode/controllers/files.py:426
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr "Repozytorium zostało zablokowane przez %s na %s"
 
-#: rhodecode/controllers/files.py:283
+#: rhodecode/controllers/files.py:311
+msgid "You can only delete files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:322
+#, python-format
+msgid "Deleted file %s via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:344
+#, python-format
+msgid "Successfully deleted file %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:348 rhodecode/controllers/files.py:414
+#: rhodecode/controllers/files.py:496
+msgid "Error occurred during commit"
+msgstr "Wystąpił błąd w trakcie zatwierdzania"
+
+#: rhodecode/controllers/files.py:371
 msgid "You can only edit files with revision being a valid branch "
 msgstr "Można tylko edytować pliki z rewizji obecnej gałęzi"
 
-#: rhodecode/controllers/files.py:297
+#: rhodecode/controllers/files.py:385
 #, python-format
 msgid "Edited file %s via RhodeCode"
 msgstr "Edytowanie %s w RhodeCode"
 
-#: rhodecode/controllers/files.py:313
+#: rhodecode/controllers/files.py:401
 msgid "No changes"
 msgstr "Bez zmian"
 
-#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394
+#: rhodecode/controllers/files.py:410 rhodecode/controllers/files.py:485
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Committ wykonany do %s"
 
-#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405
-msgid "Error occurred during commit"
-msgstr "Wystąpił błąd w trakcie zatwierdzania"
-
-#: rhodecode/controllers/files.py:351
+#: rhodecode/controllers/files.py:438
 msgid "Added file via RhodeCode"
 msgstr "Dodano %s poprzez RhodeCode"
 
-#: rhodecode/controllers/files.py:368
+#: rhodecode/controllers/files.py:459
 msgid "No content"
 msgstr "Brak treści"
 
-#: rhodecode/controllers/files.py:372
+#: rhodecode/controllers/files.py:463
 msgid "No filename"
 msgstr "Brak nazwy pliku"
 
-#: rhodecode/controllers/files.py:397
+#: rhodecode/controllers/files.py:488
 msgid "Location must be relative path and must not contain .. in path"
 msgstr "Lokalizacja musi być ścieżką względną i nie może zawierać .. ścieżki"
 
-#: rhodecode/controllers/files.py:431
+#: rhodecode/controllers/files.py:522
 msgid "Downloads disabled"
 msgstr "Pobieranie wyłączone"
 
-#: rhodecode/controllers/files.py:442
+#: rhodecode/controllers/files.py:533
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Nieznana wersja %s"
 
-#: rhodecode/controllers/files.py:444
+#: rhodecode/controllers/files.py:535
 msgid "Empty repository"
 msgstr "Puste repozytorium"
 
-#: rhodecode/controllers/files.py:446
+#: rhodecode/controllers/files.py:537
 msgid "Unknown archive type"
 msgstr "Nieznany typ archiwum"
 
-#: rhodecode/controllers/files.py:631
-#: rhodecode/templates/changeset/changeset_range.html:9
+#: rhodecode/controllers/files.py:773
+#: rhodecode/templates/changeset/changeset_range.html:12
 #: rhodecode/templates/email_templates/pull_request.html:12
-#: rhodecode/templates/pullrequests/pullrequest.html:124
+#: rhodecode/templates/pullrequests/pullrequest.html:123
 msgid "Changesets"
 msgstr "Różnice"
 
-#: rhodecode/controllers/files.py:632
-#: rhodecode/controllers/pullrequests.py:149
-#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682
+#: rhodecode/controllers/files.py:774
+#: rhodecode/controllers/pullrequests.py:158
+#: rhodecode/controllers/summary.py:74 rhodecode/model/scm.py:816
 #: rhodecode/templates/switch_to_list.html:3
-#: rhodecode/templates/branches/branches.html:10
+#: rhodecode/templates/branches/branches.html:13
 msgid "Branches"
 msgstr "Gałęzie"
 
-#: rhodecode/controllers/files.py:633
-#: rhodecode/controllers/pullrequests.py:150
-#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693
-#: rhodecode/templates/switch_to_list.html:15
-#: rhodecode/templates/tags/tags.html:10
+#: rhodecode/controllers/files.py:775
+#: rhodecode/controllers/pullrequests.py:159
+#: rhodecode/controllers/summary.py:75 rhodecode/model/scm.py:827
+#: rhodecode/templates/switch_to_list.html:25
+#: rhodecode/templates/tags/tags.html:13
 msgid "Tags"
 msgstr "Etykiety"
 
-#: rhodecode/controllers/forks.py:176
-#, python-format
-msgid "Forked repository %s as %s"
-msgstr "Gałęzi %s w repozytorium %s"
-
-#: rhodecode/controllers/forks.py:190
+#: rhodecode/controllers/forks.py:189
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium"
 
-#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153
+#: rhodecode/controllers/home.py:81
+msgid "Groups"
+msgstr ""
+
+#: rhodecode/controllers/home.py:86
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:106
+#: rhodecode/templates/admin/repos/repo_add.html:15
+#: rhodecode/templates/admin/repos/repo_add.html:19
+#: rhodecode/templates/admin/users/user_edit_advanced.html:6
+#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:87
+#: rhodecode/templates/base/base.html:136
+#: rhodecode/templates/base/base.html:389
+#: rhodecode/templates/base/base.html:560
+msgid "Repositories"
+msgstr "Repozytoria"
+
+#: rhodecode/controllers/home.py:127 rhodecode/templates/files/files.html:33
+#: rhodecode/templates/files/files_add.html:37
+#: rhodecode/templates/files/files_delete.html:37
+#: rhodecode/templates/files/files_edit.html:37
+msgid "Branch"
+msgstr "gałąź"
+
+#: rhodecode/controllers/home.py:133
+msgid "Tag"
+msgstr "Tag"
+
+#: rhodecode/controllers/home.py:139
+msgid "Bookmark"
+msgstr "Bookmark"
+
+#: rhodecode/controllers/journal.py:112 rhodecode/controllers/journal.py:155
 msgid "public journal"
 msgstr "Dziennik publiczny"
 
-#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157
-#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/controllers/journal.py:116 rhodecode/controllers/journal.py:159
+#: rhodecode/templates/journal/journal.html:15
 msgid "journal"
 msgstr "dziennik"
 
-#: rhodecode/controllers/login.py:138
+#: rhodecode/controllers/login.py:185 rhodecode/controllers/login.py:230
+msgid "bad captcha"
+msgstr ""
+
+#: rhodecode/controllers/login.py:191
 msgid "You have successfully registered into RhodeCode"
 msgstr "Udało Ci się zarejestrować na stronie"
 
-#: rhodecode/controllers/login.py:159
+#: rhodecode/controllers/login.py:235
 msgid "Your password reset link was sent"
 msgstr "Twój link zresetowania hasła został wysłany"
 
-#: rhodecode/controllers/login.py:179
+#: rhodecode/controllers/login.py:255
 msgid ""
 "Your password reset was successful, new password has been sent to your email"
 msgstr "Twoje hasło zostało zresetowane, nowe hasło zostanie wysłane na e-mail"
 
-#: rhodecode/controllers/pullrequests.py:136
-#: rhodecode/templates/changeset/changeset.html:10
-#: rhodecode/templates/email_templates/changeset_comment.html:8
+#: rhodecode/controllers/pullrequests.py:138
+#: rhodecode/templates/changeset/changeset.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:15
 msgid "Changeset"
 msgstr "Grupy zmian"
 
-#: rhodecode/controllers/pullrequests.py:146
+#: rhodecode/controllers/pullrequests.py:155
 msgid "Special"
 msgstr "Specjalne"
 
-#: rhodecode/controllers/pullrequests.py:147
+#: rhodecode/controllers/pullrequests.py:156
 msgid "Peer branches"
 msgstr "gałęzie"
 
-#: rhodecode/controllers/pullrequests.py:148 rhodecode/model/scm.py:688
-#: rhodecode/templates/switch_to_list.html:28
-#: rhodecode/templates/bookmarks/bookmarks.html:10
+#: rhodecode/controllers/pullrequests.py:157 rhodecode/model/scm.py:822
+#: rhodecode/templates/switch_to_list.html:38
+#: rhodecode/templates/bookmarks/bookmarks.html:13
 msgid "Bookmarks"
 msgstr "Zakładki"
 
-#: rhodecode/controllers/pullrequests.py:321
+#: rhodecode/controllers/pullrequests.py:328
 msgid "Pull request requires a title with min. 3 chars"
 msgstr "Wniosek połączenia gałęzi wymaga tytułu z min. 3 znakami"
 
-#: rhodecode/controllers/pullrequests.py:323
-msgid "Error creating pull request"
-msgstr "Błąd podczas tworzenia prośby o łączenie gałęzi"
-
-#: rhodecode/controllers/pullrequests.py:343
+#: rhodecode/controllers/pullrequests.py:330
+#, python-format
+msgid "Error creating pull request: %s"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:352
 msgid "Successfully opened new pull request"
 msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo"
 
-#: rhodecode/controllers/pullrequests.py:346
+#: rhodecode/controllers/pullrequests.py:355
 msgid "Error occurred during sending pull request"
 msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi"
 
-#: rhodecode/controllers/pullrequests.py:385
+#: rhodecode/controllers/pullrequests.py:395
 msgid "Successfully deleted pull request"
 msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo"
 
-#: rhodecode/controllers/pullrequests.py:481
+#: rhodecode/controllers/pullrequests.py:483
 msgid "Closing with"
 msgstr "Zamykanie"
 
-#: rhodecode/controllers/pullrequests.py:518
+#: rhodecode/controllers/pullrequests.py:520
 msgid ""
 "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr "Zamknij wszystkie wnioski połączenia gałęzi innych stanów niż odrzucony, zatwierdzony lub zabroniony"
 
-#: rhodecode/controllers/search.py:132
+#: rhodecode/controllers/search.py:133
 msgid "Invalid search query. Try quoting it."
 msgstr "Nieprawidłowe zapytania. Spróbuj zacytować go."
 
-#: rhodecode/controllers/search.py:137
+#: rhodecode/controllers/search.py:138
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr "Nie ma szukanego indeksu. Proszę uruchomić indeksowanie whoosh"
 
-#: rhodecode/controllers/search.py:141
+#: rhodecode/controllers/search.py:142
 msgid "An error occurred during this search operation"
 msgstr "Wystąpił błąd podczas wyszukiwania tej operacji"
 
-#: rhodecode/controllers/summary.py:182
+#: rhodecode/controllers/summary.py:201
 msgid "No data loaded yet"
 msgstr "Żadne dane nie zostały załadowane"
 
-#: rhodecode/controllers/summary.py:188
-#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/controllers/summary.py:204
+#: rhodecode/templates/summary/summary.html:105
 msgid "Statistics are disabled for this repository"
 msgstr "Statystyki są wyłączone dla tego repozytorium"
 
-#: rhodecode/controllers/admin/defaults.py:96
+#: rhodecode/controllers/admin/auth_settings.py:125
+msgid "Auth settings updated successfully"
+msgstr "Ustawienia autentykacji poprawnie zaktualizowane"
+
+#: rhodecode/controllers/admin/auth_settings.py:136
+msgid "error occurred during update of auth settings"
+msgstr "wystapił błąd podczas uaktualniania ustawień autentykacji"
+
+#: rhodecode/controllers/admin/defaults.py:95
 msgid "Default settings updated successfully"
 msgstr "Domyślne ustawienia zostały pomyślnie zaktualizowane"
 
-#: rhodecode/controllers/admin/defaults.py:110
+#: rhodecode/controllers/admin/defaults.py:109
 msgid "Error occurred during update of defaults"
 msgstr "wystąpił błąd podczas aktualizacji wartości domyślnych"
 
-#: rhodecode/controllers/admin/gists.py:56
+#: rhodecode/controllers/admin/gists.py:58
+#: rhodecode/controllers/admin/my_account.py:255
+#: rhodecode/controllers/admin/users.py:287
 msgid "forever"
 msgstr "na zawsze"
 
-#: rhodecode/controllers/admin/gists.py:57
+#: rhodecode/controllers/admin/gists.py:59
+#: rhodecode/controllers/admin/my_account.py:256
+#: rhodecode/controllers/admin/users.py:288
 msgid "5 minutes"
 msgstr "5 minut"
 
-#: rhodecode/controllers/admin/gists.py:58
+#: rhodecode/controllers/admin/gists.py:60
+#: rhodecode/controllers/admin/my_account.py:257
+#: rhodecode/controllers/admin/users.py:289
 msgid "1 hour"
 msgstr "1 godzina"
 
-#: rhodecode/controllers/admin/gists.py:59
+#: rhodecode/controllers/admin/gists.py:61
+#: rhodecode/controllers/admin/my_account.py:258
+#: rhodecode/controllers/admin/users.py:290
 msgid "1 day"
 msgstr "1 dzień"
 
-#: rhodecode/controllers/admin/gists.py:60
+#: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/my_account.py:259
+#: rhodecode/controllers/admin/users.py:291
 msgid "1 month"
 msgstr "1 miesiąc"
 
-#: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/gists.py:66
+#: rhodecode/controllers/admin/my_account.py:261
+#: rhodecode/controllers/admin/users.py:293
 msgid "Lifetime"
 msgstr "Czas życia"
 
-#: rhodecode/controllers/admin/gists.py:127
+#: rhodecode/controllers/admin/gists.py:145
 msgid "Error occurred during gist creation"
 msgstr "Wystąpił błąd podczas tworzenia git"
 
-#: rhodecode/controllers/admin/gists.py:165
+#: rhodecode/controllers/admin/gists.py:183
 #, python-format
 msgid "Deleted gist %s"
-msgstr "Usuń git %s"
-
-#: rhodecode/controllers/admin/ldap_settings.py:50
-msgid "BASE"
-msgstr "PODSTAWA"
-
-#: rhodecode/controllers/admin/ldap_settings.py:51
-msgid "ONELEVEL"
-msgstr "JEDEN POZIOM"
-
-#: rhodecode/controllers/admin/ldap_settings.py:52
-msgid "SUBTREE"
-msgstr "DRZEWO PODRZĘDNE"
-
-#: rhodecode/controllers/admin/ldap_settings.py:56
-msgid "NEVER"
-msgstr "NIGDY"
-
-#: rhodecode/controllers/admin/ldap_settings.py:57
-msgid "ALLOW"
-msgstr "POZWÓL"
-
-#: rhodecode/controllers/admin/ldap_settings.py:58
-msgid "TRY"
-msgstr "WYPRÓBUJ"
-
-#: rhodecode/controllers/admin/ldap_settings.py:59
-msgid "DEMAND"
-msgstr "ZAPYTANIE"
-
-#: rhodecode/controllers/admin/ldap_settings.py:60
-msgid "HARD"
-msgstr "TWARDY"
-
-#: rhodecode/controllers/admin/ldap_settings.py:64
-msgid "No encryption"
-msgstr "Bez szyfrowania"
-
-#: rhodecode/controllers/admin/ldap_settings.py:65
-msgid "LDAPS connection"
-msgstr "Połączenie LDAP"
-
-#: rhodecode/controllers/admin/ldap_settings.py:66
-msgid "START_TLS on LDAP connection"
-msgstr "START_TLS dla połączenia LDAP"
-
-#: rhodecode/controllers/admin/ldap_settings.py:124
-msgid "LDAP settings updated successfully"
-msgstr "Ustawienia LDAP zostały zaktualizowane"
-
-#: rhodecode/controllers/admin/ldap_settings.py:128
-msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
-msgstr "Nie można uaktywnić ldap.\"Python-ldap\" brakuje library."
-
-#: rhodecode/controllers/admin/ldap_settings.py:145
-msgid "Error occurred during update of ldap settings"
-msgstr "Wystąpił błąd podczas aktualizacji ustawień ldap"
-
-#: rhodecode/controllers/admin/permissions.py:58
-#: rhodecode/controllers/admin/permissions.py:62
-#: rhodecode/controllers/admin/permissions.py:66
-msgid "None"
-msgstr "Brak"
-
-#: rhodecode/controllers/admin/permissions.py:59
-#: rhodecode/controllers/admin/permissions.py:63
-#: rhodecode/controllers/admin/permissions.py:67
-msgid "Read"
-msgstr "Odczyt"
+msgstr "Usuń gist %s"
+
+#: rhodecode/controllers/admin/gists.py:232
+msgid "unmodified"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:261
+msgid "Successfully updated gist content"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:266
+msgid "Successfully updated gist data"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:269
+#, python-format
+msgid "Error occurred during update of gist %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:68
+msgid "You can't edit this user since it's crucial for entire application"
+msgstr "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej aplikacji"
+
+#: rhodecode/controllers/admin/my_account.py:125
+msgid "Your account was updated successfully"
+msgstr "Twoje konto zostało pomyślnie zaktualizowane"
+
+#: rhodecode/controllers/admin/my_account.py:139
+#: rhodecode/controllers/admin/users.py:205
+#, python-format
+msgid "Error occurred during update of user %s"
+msgstr "wystąpił błąd podczas aktualizacji użytkownika %s"
+
+#: rhodecode/controllers/admin/my_account.py:159
+msgid "Successfully updated password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:169
+msgid "Error occurred during update of user password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:211
+#: rhodecode/controllers/admin/users.py:430
+#, python-format
+msgid "Added email %s to user"
+msgstr "Dodano e-mail %s do użytkownika"
+
+#: rhodecode/controllers/admin/my_account.py:217
+#: rhodecode/controllers/admin/users.py:436
+msgid "An error occurred during email saving"
+msgstr "Wystąpił błąd podczas zapisywania e-maila"
+
+#: rhodecode/controllers/admin/my_account.py:226
+#: rhodecode/controllers/admin/users.py:447
+msgid "Removed email from user"
+msgstr "Usunięto e-mail użytkownikowi"
+
+#: rhodecode/controllers/admin/my_account.py:272
+#: rhodecode/controllers/admin/users.py:313
+msgid "Api key successfully created"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:284
+#: rhodecode/controllers/admin/users.py:329
+msgid "Api key successfully reset"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:288
+#: rhodecode/controllers/admin/users.py:333
+msgid "Api key successfully deleted"
+msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:60
 #: rhodecode/controllers/admin/permissions.py:64
 #: rhodecode/controllers/admin/permissions.py:68
-msgid "Write"
-msgstr "Zapis"
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:104
+msgid "None"
+msgstr "Brak"
 
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
 #: rhodecode/controllers/admin/permissions.py:69
-#: rhodecode/templates/admin/defaults/defaults.html:9
-#: rhodecode/templates/admin/ldap/ldap.html:9
-#: rhodecode/templates/admin/permissions/permissions.html:9
-#: rhodecode/templates/admin/repos/repo_add.html:10
-#: rhodecode/templates/admin/repos/repo_add.html:14
-#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:9
-#: rhodecode/templates/admin/users/user_add.html:8
-#: rhodecode/templates/admin/users/user_edit.html:9
-#: rhodecode/templates/admin/users/user_edit.html:133
-#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/admin/users_groups/users_group_add.html:8
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:9
-#: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:317
-#: rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:325
+msgid "Read"
+msgstr "Odczyt"
+
+#: rhodecode/controllers/admin/permissions.py:62
+#: rhodecode/controllers/admin/permissions.py:66
+#: rhodecode/controllers/admin/permissions.py:70
+msgid "Write"
+msgstr "Zapis"
+
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
+#: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/templates/admin/auth/auth_settings.html:12
+#: rhodecode/templates/admin/defaults/defaults.html:12
+#: rhodecode/templates/admin/permissions/permissions.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:17
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/settings/settings.html:12
+#: rhodecode/templates/admin/user_groups/user_group_add.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+#: rhodecode/templates/admin/users/user_add.html:11
+#: rhodecode/templates/admin/users/user_edit.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:114
+#: rhodecode/templates/admin/users/users.html:13
+#: rhodecode/templates/admin/users/users.html:58
+#: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:340
+#: rhodecode/templates/base/base.html:346
+#: rhodecode/templates/base/base.html:347
 msgid "Admin"
 msgstr "Administracja"
 
-#: rhodecode/controllers/admin/permissions.py:72
-#: rhodecode/controllers/admin/permissions.py:83
-#: rhodecode/controllers/admin/permissions.py:86
-#: rhodecode/controllers/admin/permissions.py:89
-#: rhodecode/controllers/admin/permissions.py:92
-msgid "Disabled"
-msgstr "Wyłączone"
-
 #: rhodecode/controllers/admin/permissions.py:74
+#: rhodecode/controllers/admin/permissions.py:85
+#: rhodecode/controllers/admin/permissions.py:90
+#: rhodecode/controllers/admin/permissions.py:93
+#: rhodecode/controllers/admin/permissions.py:96
+#: rhodecode/controllers/admin/permissions.py:99
+msgid "Disabled"
+msgstr "Wyłączone"
+
+#: rhodecode/controllers/admin/permissions.py:76
 msgid "Allowed with manual account activation"
 msgstr "Dozwolona z ręczną aktywacją konta"
 
-#: rhodecode/controllers/admin/permissions.py:76
+#: rhodecode/controllers/admin/permissions.py:78
 msgid "Allowed with automatic account activation"
 msgstr "Dozwolona z automatyczną aktywacją konta"
 
-#: rhodecode/controllers/admin/permissions.py:79
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444
+#: rhodecode/controllers/admin/permissions.py:81
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1485
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1542
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1564
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1603
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1655
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1682 rhodecode/model/db.py:1692
 msgid "Manual activation of external account"
 msgstr "Ręczna aktywacja nowego konta"
 
-#: rhodecode/controllers/admin/permissions.py:80
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445
+#: rhodecode/controllers/admin/permissions.py:82
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1486
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1565
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1604
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1656
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1683 rhodecode/model/db.py:1693
 msgid "Automatic activation of external account"
 msgstr "Automatyczna aktywacja nowego konta"
 
-#: rhodecode/controllers/admin/permissions.py:84
-#: rhodecode/controllers/admin/permissions.py:87
-#: rhodecode/controllers/admin/permissions.py:90
-#: rhodecode/controllers/admin/permissions.py:93
+#: rhodecode/controllers/admin/permissions.py:86
+#: rhodecode/controllers/admin/permissions.py:89
+#: rhodecode/controllers/admin/permissions.py:94
+#: rhodecode/controllers/admin/permissions.py:97
+#: rhodecode/controllers/admin/permissions.py:100
 msgid "Enabled"
 msgstr "Włączone"
 
-#: rhodecode/controllers/admin/permissions.py:138
-msgid "Default permissions updated successfully"
-msgstr "Domyślne uprawnienia zaktualizowane pomyślnie"
-
-#: rhodecode/controllers/admin/permissions.py:152
+#: rhodecode/controllers/admin/permissions.py:123
+msgid "Global permissions updated successfully"
+msgstr "Globalne uprawnienia zaktualizowane poprawnie"
+
+#: rhodecode/controllers/admin/permissions.py:137
 msgid "Error occurred during update of permissions"
 msgstr "Wystąpił błąd podczas aktualizacji uprawnień"
 
-#: rhodecode/controllers/admin/repos.py:128
-msgid "--REMOVE FORK--"
-msgstr "--USUŃ ROZGAŁĘZIENIE--"
-
-#: rhodecode/controllers/admin/repos.py:168
+#: rhodecode/controllers/admin/repo_groups.py:184
+#, python-format
+msgid "Created repository group %s"
+msgstr "Utworzono grupę repo %s"
+
+#: rhodecode/controllers/admin/repo_groups.py:196
+#, python-format
+msgid "Error occurred during creation of repository group %s"
+msgstr "Wystąpił błąd podczas tworzenia grupy repo %s"
+
+#: rhodecode/controllers/admin/repo_groups.py:254
+#, python-format
+msgid "Updated repository group %s"
+msgstr "Zaktualizowano grupę repo %s"
+
+#: rhodecode/controllers/admin/repo_groups.py:269
+#, python-format
+msgid "Error occurred during update of repository group %s"
+msgstr "Wystąpił błąd podczas aktualizacji grupy repo %s"
+
+#: rhodecode/controllers/admin/repo_groups.py:287
+#, python-format
+msgid "This group contains %s repositores and cannot be deleted"
+msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta"
+
+#: rhodecode/controllers/admin/repo_groups.py:294
+#, python-format
+msgid "This group contains %s subgroups and cannot be deleted"
+msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta"
+
+#: rhodecode/controllers/admin/repo_groups.py:300
+#, python-format
+msgid "Removed repository group %s"
+msgstr "Usunięto grupę repo %s"
+
+#: rhodecode/controllers/admin/repo_groups.py:305
+#, python-format
+msgid "Error occurred during deletion of repository group %s"
+msgstr "Wystąpił błąd podczas usuwania z repozytorium grupy %s"
+
+#: rhodecode/controllers/admin/repo_groups.py:417
+#: rhodecode/controllers/admin/repo_groups.py:452
+#: rhodecode/controllers/admin/user_groups.py:335
+msgid "Cannot revoke permission for yourself as admin"
+msgstr "Nie można cofnąć zezwolenia dla admina jako admin"
+
+#: rhodecode/controllers/admin/repo_groups.py:432
+msgid "Repository Group permissions updated"
+msgstr "Aktualizacja uprawnień grup repozytorium"
+
+#: rhodecode/controllers/admin/repo_groups.py:469
+#: rhodecode/controllers/admin/repos.py:424
+#: rhodecode/controllers/admin/user_groups.py:347
+msgid "An error occurred during revoking of permission"
+msgstr "Wystąpił błąd podczas cofania zezwolenia"
+
+#: rhodecode/controllers/admin/repos.py:160
+#, python-format
+msgid "Error creating repository %s"
+msgstr "utworzone repozytorium %s"
+
+#: rhodecode/controllers/admin/repos.py:235
 #, python-format
 msgid "Created repository %s from %s"
 msgstr "utworzone repozytorium %s z %s"
 
-#: rhodecode/controllers/admin/repos.py:174
+#: rhodecode/controllers/admin/repos.py:244
+#, python-format
+msgid "Forked repository %s as %s"
+msgstr "Gałęzi %s w repozytorium %s"
+
+#: rhodecode/controllers/admin/repos.py:247
 #, python-format
 msgid "Created repository %s"
 msgstr "Utworzone repozytorium %s"
 
-#: rhodecode/controllers/admin/repos.py:197
-#, python-format
-msgid "Error creating repository %s"
-msgstr "utworzone repozytorium %s"
-
-#: rhodecode/controllers/admin/repos.py:270
+#: rhodecode/controllers/admin/repos.py:287
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "Repozytorium %s zostało pomyślnie zaktualizowane"
 
-#: rhodecode/controllers/admin/repos.py:288
+#: rhodecode/controllers/admin/repos.py:305
 #, python-format
 msgid "Error occurred during update of repository %s"
 msgstr "Wystąpił błąd podczas aktualizacji repozytorium %s"
 
-#: rhodecode/controllers/admin/repos.py:315
+#: rhodecode/controllers/admin/repos.py:332
 #, python-format
 msgid "Detached %s forks"
 msgstr "Oderwane rozgałęzienie %s"
 
-#: rhodecode/controllers/admin/repos.py:318
+#: rhodecode/controllers/admin/repos.py:335
 #, python-format
 msgid "Deleted %s forks"
 msgstr "Usunięte repozytorium %s"
 
-#: rhodecode/controllers/admin/repos.py:323
+#: rhodecode/controllers/admin/repos.py:340
 #, python-format
 msgid "Deleted repository %s"
 msgstr "Usunięte repozytorium %s"
 
-#: rhodecode/controllers/admin/repos.py:326
+#: rhodecode/controllers/admin/repos.py:343
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr "Nie można usunąć %s nadal zawiera załączniki rozgałęzienia"
 
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/admin/repos.py:348
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "Wystąpił błąd podczas usuwania %s"
 
-#: rhodecode/controllers/admin/repos.py:345
+#: rhodecode/controllers/admin/repos.py:400
 msgid "Repository permissions updated"
-msgstr "Repozytorium wyłączone"
-
-#: rhodecode/controllers/admin/repos.py:375
-#: rhodecode/controllers/admin/repos_groups.py:332
-#: rhodecode/controllers/admin/users_groups.py:312
-msgid "An error occurred during revoking of permission"
-msgstr "Wystąpił błąd podczas cofania zezwolenia"
-
-#: rhodecode/controllers/admin/repos.py:392
-msgid "An error occurred during deletion of repository stats"
-msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk"
-
-#: rhodecode/controllers/admin/repos.py:409
-msgid "An error occurred during cache invalidation"
-msgstr "Wystąpił błąd podczas unieważniania cache"
-
-#: rhodecode/controllers/admin/repos.py:429
+msgstr "Uprawnienia repozytorium zostały zaktualizowane"
+
 #: rhodecode/controllers/admin/repos.py:456
-msgid "An error occurred during unlocking"
-msgstr "Wystąpił błąd podczas odblokowywania"
-
-#: rhodecode/controllers/admin/repos.py:447
-msgid "Unlocked"
-msgstr "Odblokowany"
-
-#: rhodecode/controllers/admin/repos.py:450
-msgid "Locked"
-msgstr "Zablokowany"
-
-#: rhodecode/controllers/admin/repos.py:452
-#, python-format
-msgid "Repository has been %s"
-msgstr "Repozytoriów jest %s"
-
-#: rhodecode/controllers/admin/repos.py:476
+msgid "An error occurred during creation of field"
+msgstr "Wystąpił błąd podczas tworzenia użytkownika %s"
+
+#: rhodecode/controllers/admin/repos.py:470
+msgid "An error occurred during removal of field"
+msgstr "Wystąpił błąd podczas zapisywania e-maila"
+
+#: rhodecode/controllers/admin/repos.py:486
+msgid "-- Not a fork --"
+msgstr "-- Brak rozgalezienia --"
+
+#: rhodecode/controllers/admin/repos.py:520
 msgid "Updated repository visibility in public journal"
 msgstr "Zaktualizowano widoczność stron w publicznym dzienniku"
 
-#: rhodecode/controllers/admin/repos.py:480
+#: rhodecode/controllers/admin/repos.py:524
 msgid "An error occurred during setting this repository in public journal"
 msgstr "Wystąpił błąd podczas ustawiania tego repozytorium w dzienniku publicznym"
 
-#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302
+#: rhodecode/controllers/admin/repos.py:529 rhodecode/model/validators.py:359
 msgid "Token mismatch"
 msgstr "Niezgodność tokenu"
 
-#: rhodecode/controllers/admin/repos.py:498
-msgid "Pulled from remote location"
-msgstr "Pobieranie z lokalizacji zdalnej"
-
-#: rhodecode/controllers/admin/repos.py:501
-msgid "An error occurred during pull from remote location"
-msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej"
-
-#: rhodecode/controllers/admin/repos.py:517
+#: rhodecode/controllers/admin/repos.py:544
 msgid "Nothing"
 msgstr "Brak"
 
-#: rhodecode/controllers/admin/repos.py:519
+#: rhodecode/controllers/admin/repos.py:546
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "Oznaczono %s repo jako rozwidlenie %s"
 
-#: rhodecode/controllers/admin/repos.py:523
+#: rhodecode/controllers/admin/repos.py:553
 msgid "An error occurred during this operation"
 msgstr "Wystąpił błąd podczas tej operacji"
 
-#: rhodecode/controllers/admin/repos.py:562
-msgid "An error occurred during creation of field"
-msgstr "Wystąpił błąd podczas tworzenia użytkownika %s"
-
-#: rhodecode/controllers/admin/repos.py:576
-msgid "An error occurred during removal of field"
-msgstr "Wystąpił błąd podczas zapisywania e-maila"
-
-#: rhodecode/controllers/admin/repos_groups.py:147
-#, python-format
-msgid "Created repository group %s"
-msgstr "Utworzono grupę repo %s"
-
-#: rhodecode/controllers/admin/repos_groups.py:159
-#, python-format
-msgid "Error occurred during creation of repository group %s"
-msgstr "Wystąpił błąd podczas tworzenia grupy repo %s"
-
-#: rhodecode/controllers/admin/repos_groups.py:217
-#, python-format
-msgid "Updated repository group %s"
-msgstr "Zaktualizowano grupę repo %s"
-
-#: rhodecode/controllers/admin/repos_groups.py:232
-#, python-format
-msgid "Error occurred during update of repository group %s"
-msgstr "Wystąpił błąd podczas aktualizacji grupy repo %s"
-
-#: rhodecode/controllers/admin/repos_groups.py:250
-#, python-format
-msgid "This group contains %s repositores and cannot be deleted"
-msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta"
-
-#: rhodecode/controllers/admin/repos_groups.py:257
-#, python-format
-msgid "This group contains %s subgroups and cannot be deleted"
-msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta"
-
-#: rhodecode/controllers/admin/repos_groups.py:263
-#, python-format
-msgid "Removed repository group %s"
-msgstr "Usunięto grupę repo %s"
-
-#: rhodecode/controllers/admin/repos_groups.py:268
-#, python-format
-msgid "Error occurred during deletion of repository group %s"
-msgstr "Wystąpił błąd podczas usuwania z repozytorium grupy %s"
-
-#: rhodecode/controllers/admin/repos_groups.py:279
-#: rhodecode/controllers/admin/repos_groups.py:314
-#: rhodecode/controllers/admin/users_groups.py:300
-msgid "Cannot revoke permission for yourself as admin"
-msgstr "Nie można cofnąć zezwolenia dla admina jako admin"
-
-#: rhodecode/controllers/admin/repos_groups.py:294
-msgid "Repository Group permissions updated"
-msgstr "Aktualizacja uprawnień grup repozytorium"
-
-#: rhodecode/controllers/admin/settings.py:123
+#: rhodecode/controllers/admin/repos.py:569
+msgid "Locked repository"
+msgstr "Zablokowane repozytorium"
+
+#: rhodecode/controllers/admin/repos.py:572
+msgid "Unlocked repository"
+msgstr "Odblokowane repozytorium"
+
+#: rhodecode/controllers/admin/repos.py:575
+#: rhodecode/controllers/admin/repos.py:602
+msgid "An error occurred during unlocking"
+msgstr "Wystąpił błąd podczas odblokowywania"
+
+#: rhodecode/controllers/admin/repos.py:593
+msgid "Unlocked"
+msgstr "Odblokowany"
+
+#: rhodecode/controllers/admin/repos.py:596
+msgid "Locked"
+msgstr "Zablokowany"
+
+#: rhodecode/controllers/admin/repos.py:598
+#, python-format
+msgid "Repository has been %s"
+msgstr "Repozytoriów jest %s"
+
+#: rhodecode/controllers/admin/repos.py:616
+msgid "Cache invalidation successful"
+msgstr "Cache wyczyszczony poprawnie"
+
+#: rhodecode/controllers/admin/repos.py:620
+msgid "An error occurred during cache invalidation"
+msgstr "Wystąpił błąd podczas unieważniania cache"
+
+#: rhodecode/controllers/admin/repos.py:635
+msgid "Pulled from remote location"
+msgstr "Pobieranie z lokalizacji zdalnej"
+
+#: rhodecode/controllers/admin/repos.py:638
+msgid "An error occurred during pull from remote location"
+msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej"
+
+#: rhodecode/controllers/admin/repos.py:671
+msgid "An error occurred during deletion of repository stats"
+msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk"
+
+#: rhodecode/controllers/admin/settings.py:171
+msgid "Updated VCS settings"
+msgstr "Aktualizacja ustawień VCS"
+
+#: rhodecode/controllers/admin/settings.py:175
+msgid ""
+"Unable to activate hgsubversion support. The \"hgsubversion\" library is "
+"missing"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:181
+#: rhodecode/controllers/admin/settings.py:273
+msgid "Error occurred during updating application settings"
+msgstr "Wystąpił błąd podczas aktualizacji ustawień aplikacji"
+
+#: rhodecode/controllers/admin/settings.py:214
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr "Repozytoria z powodzeniem zostały ponownie zeskanowane dodano: %s, usunięto: %s"
 
-#: rhodecode/controllers/admin/settings.py:132
-msgid "Whoosh reindex task scheduled"
-msgstr "Zadanie ponownej indeksacji whoosh zostało zaplanowane"
-
-#: rhodecode/controllers/admin/settings.py:163
+#: rhodecode/controllers/admin/settings.py:269
 msgid "Updated application settings"
 msgstr "Aktualizacja ustawień aplikacji"
 
-#: rhodecode/controllers/admin/settings.py:167
-#: rhodecode/controllers/admin/settings.py:304
-msgid "Error occurred during updating application settings"
-msgstr "Wystąpił błąd podczas aktualizacji ustawień aplikacji"
-
-#: rhodecode/controllers/admin/settings.py:219
+#: rhodecode/controllers/admin/settings.py:326
 msgid "Updated visualisation settings"
 msgstr "Aktualizacja ustawień wizualizacji"
 
-#: rhodecode/controllers/admin/settings.py:224
+#: rhodecode/controllers/admin/settings.py:331
 msgid "Error occurred during updating visualisation settings"
 msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji"
 
-#: rhodecode/controllers/admin/settings.py:300
-msgid "Updated VCS settings"
-msgstr "Aktualizacja ustawień VCS"
-
-#: rhodecode/controllers/admin/settings.py:314
+#: rhodecode/controllers/admin/settings.py:357
+msgid "Please enter email address"
+msgstr "Proszę podać adres email"
+
+#: rhodecode/controllers/admin/settings.py:369
+msgid "Send email task created"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:399
 msgid "Added new hook"
 msgstr "Dodano nowy hook"
 
-#: rhodecode/controllers/admin/settings.py:326
+#: rhodecode/controllers/admin/settings.py:413
 msgid "Updated hooks"
 msgstr "Aktualizacja hooku"
 
-#: rhodecode/controllers/admin/settings.py:330
+#: rhodecode/controllers/admin/settings.py:417
 msgid "Error occurred during hook creation"
 msgstr "Wystąpił błąd podczas tworzenia hooku"
 
-#: rhodecode/controllers/admin/settings.py:349
-msgid "Email task created"
-msgstr "E-mail został wysłany"
-
-#: rhodecode/controllers/admin/settings.py:413
-msgid "You can't edit this user since it's crucial for entire application"
-msgstr "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej aplikacji"
-
-#: rhodecode/controllers/admin/settings.py:455
-msgid "Your account was updated successfully"
-msgstr "Twoje konto zostało pomyślnie zaktualizowane"
-
-#: rhodecode/controllers/admin/settings.py:470
-#: rhodecode/controllers/admin/users.py:198
-#, python-format
-msgid "Error occurred during update of user %s"
-msgstr "wystąpił błąd podczas aktualizacji użytkownika %s"
-
-#: rhodecode/controllers/admin/users.py:130
+#: rhodecode/controllers/admin/settings.py:443
+msgid "Whoosh reindex task scheduled"
+msgstr "Zadanie ponownej indeksacji whoosh zostało zaplanowane"
+
+#: rhodecode/controllers/admin/settings.py:535
+msgid "Updated license information"
+msgstr "Zaktualizowano informacje o licencji"
+
+#: rhodecode/controllers/admin/settings.py:540
+msgid "Error occurred during updating license info"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:563
+#, python-format
+msgid ""
+"Your license will expire on %s, please contact support to extend your "
+"license."
+msgstr "Twoja licenzja wygaśnie %s, proszę skontaktowac sie z pomocą techniczna."
+
+#: rhodecode/controllers/admin/settings.py:566
+#, python-format
+msgid ""
+"Your license has expired on %s, please contact support to extend your "
+"license."
+msgstr "Twoja licencja wygasła %s, proszę skontaktować sie z pomocą techniczna w celu rozszerzenia licencji."
+
+#: rhodecode/controllers/admin/settings.py:571
+msgid ""
+"Unexpected error while reading license key. Please make sure your license "
+"token and key are correct"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:148
+#, python-format
+msgid "Created user group %s"
+msgstr "Utworzono grupę użytkowników %s"
+
+#: rhodecode/controllers/admin/user_groups.py:159
+#, python-format
+msgid "Error occurred during creation of user group %s"
+msgstr "Wystąpił błąd podczas tworzenia grupy użytkowników %s"
+
+#: rhodecode/controllers/admin/user_groups.py:197
+#, python-format
+msgid "Updated user group %s"
+msgstr "Zaktualizowano grupę użytkowników %s"
+
+#: rhodecode/controllers/admin/user_groups.py:219
+#, python-format
+msgid "Error occurred during update of user group %s"
+msgstr "Wystąpił błąd podczas aktualizacji grupy użytkowników %s"
+
+#: rhodecode/controllers/admin/user_groups.py:237
+msgid "Successfully deleted user group"
+msgstr "Grupa użytkowników została usunięta z powodzeniem"
+
+#: rhodecode/controllers/admin/user_groups.py:242
+msgid "An error occurred during deletion of user group"
+msgstr "Wystąpił błąd podczas usuwania grupy użytkowników"
+
+#: rhodecode/controllers/admin/user_groups.py:309
+msgid "Target group cannot be the same"
+msgstr "Grupa docelowa nie może być taka sama"
+
+#: rhodecode/controllers/admin/user_groups.py:315
+msgid "User Group permissions updated"
+msgstr "Aktualizacja uprawnień grupy użytkowników"
+
+#: rhodecode/controllers/admin/user_groups.py:435
+#: rhodecode/controllers/admin/users.py:395
+msgid "Updated permissions"
+msgstr "Aktualizacja uprawnień"
+
+#: rhodecode/controllers/admin/user_groups.py:439
+#: rhodecode/controllers/admin/users.py:399
+msgid "An error occurred during permissions saving"
+msgstr "Wystąpił błąd podczas zapisywania uprawnień"
+
+#: rhodecode/controllers/admin/users.py:133
 #, python-format
 msgid "Created user %s"
 msgstr "Utworzono użytkownika %s"
 
-#: rhodecode/controllers/admin/users.py:142
+#: rhodecode/controllers/admin/users.py:147
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr "Wystąpił błąd podczas tworzenia użytkownika %s"
 
-#: rhodecode/controllers/admin/users.py:176
+#: rhodecode/controllers/admin/users.py:186
 msgid "User updated successfully"
 msgstr "Użytkownik został zaktualizowany"
 
-#: rhodecode/controllers/admin/users.py:214
+#: rhodecode/controllers/admin/users.py:221
 msgid "Successfully deleted user"
 msgstr "Użytkownik został usunięty"
 
-#: rhodecode/controllers/admin/users.py:219
+#: rhodecode/controllers/admin/users.py:226
 msgid "An error occurred during deletion of user"
 msgstr "Wystąpił błąd podczas usuwania użytkownika"
 
-#: rhodecode/controllers/admin/users.py:234
+#: rhodecode/controllers/admin/users.py:240
+#: rhodecode/controllers/admin/users.py:258
+#: rhodecode/controllers/admin/users.py:281
+#: rhodecode/controllers/admin/users.py:306
+#: rhodecode/controllers/admin/users.py:319
+#: rhodecode/controllers/admin/users.py:343
+#: rhodecode/controllers/admin/users.py:406
+#: rhodecode/controllers/admin/users.py:453
 msgid "You can't edit this user"
 msgstr "Nie możesz edytować tego użytkownika"
 
-#: rhodecode/controllers/admin/users.py:293
-#: rhodecode/controllers/admin/users_groups.py:372
-msgid "Updated permissions"
-msgstr "Aktualizacja uprawnień"
-
-#: rhodecode/controllers/admin/users.py:297
-#: rhodecode/controllers/admin/users_groups.py:376
-msgid "An error occurred during permissions saving"
-msgstr "Wystąpił błąd podczas zapisywania uprawnień"
-
-#: rhodecode/controllers/admin/users.py:311
-#, python-format
-msgid "Added email %s to user"
-msgstr "Dodano e-mail %s do użytkownika"
-
-#: rhodecode/controllers/admin/users.py:317
-msgid "An error occurred during email saving"
-msgstr "Wystąpił błąd podczas zapisywania e-maila"
-
-#: rhodecode/controllers/admin/users.py:327
-msgid "Removed email from user"
-msgstr "Usunięto e-mail użytkownikowi"
-
-#: rhodecode/controllers/admin/users.py:340
-#, python-format
-msgid "Added ip %s to user"
-msgstr "Dodano e-mail %s do użytkownika"
-
-#: rhodecode/controllers/admin/users.py:346
+#: rhodecode/controllers/admin/users.py:481
+#, python-format
+msgid "Added ip %s to user whitelist"
+msgstr "Dodano ip %s do listy dozwolonych adresów użytkownia"
+
+#: rhodecode/controllers/admin/users.py:487
 msgid "An error occurred during ip saving"
 msgstr "Wystąpił błąd podczas zapisywania e-maila"
 
-#: rhodecode/controllers/admin/users.py:358
-msgid "Removed ip from user"
-msgstr "Usunięto e-mail użytkownikowi"
-
-#: rhodecode/controllers/admin/users_groups.py:162
-#, python-format
-msgid "Created user group %s"
-msgstr "Utworzono grupę użytkowników %s"
-
-#: rhodecode/controllers/admin/users_groups.py:173
-#, python-format
-msgid "Error occurred during creation of user group %s"
-msgstr "Wystąpił błąd podczas tworzenia grupy użytkowników %s"
-
-#: rhodecode/controllers/admin/users_groups.py:210
-#, python-format
-msgid "Updated user group %s"
-msgstr "Zaktualizowano grupę użytkowników %s"
-
-#: rhodecode/controllers/admin/users_groups.py:232
-#, python-format
-msgid "Error occurred during update of user group %s"
-msgstr "Wystąpił błąd podczas aktualizacji grupy użytkowników %s"
-
-#: rhodecode/controllers/admin/users_groups.py:250
-msgid "Successfully deleted user group"
-msgstr "Grupa użytkowników została usunięta z powodzeniem"
-
-#: rhodecode/controllers/admin/users_groups.py:255
-msgid "An error occurred during deletion of user group"
-msgstr "Wystąpił błąd podczas usuwania grupy użytkowników"
-
-#: rhodecode/controllers/admin/users_groups.py:274
-msgid "Target group cannot be the same"
-msgstr "Grupa docelowa nie może być taka sama"
-
-#: rhodecode/controllers/admin/users_groups.py:280
-msgid "User Group permissions updated"
-msgstr "Aktualizacja uprawnień grupy użytkowników"
-
-#: rhodecode/lib/auth.py:544
+#: rhodecode/controllers/admin/users.py:501
+msgid "Removed ip address from user whitelist"
+msgstr "Usunięto adres ip z listy dozwolonych adresów dla użytkownika"
+
+#: rhodecode/lib/auth.py:746
 #, python-format
 msgid "IP %s not allowed"
 msgstr "Obserwatorzy %s"
 
-#: rhodecode/lib/auth.py:593
+#: rhodecode/lib/auth.py:807
 msgid "You need to be a registered user to perform this action"
 msgstr "Musisz być zarejestrowanym użytkownikiem, żeby wykonać to działanie"
 
-#: rhodecode/lib/auth.py:634
+#: rhodecode/lib/auth.py:844
 msgid "You need to be a signed in to view this page"
 msgstr "Musisz być zalogowany, żeby oglądać stronę"
 
-#: rhodecode/lib/diffs.py:66
+#: rhodecode/lib/diffs.py:64
 msgid "Binary file"
 msgstr "Plik binarny"
 
-#: rhodecode/lib/diffs.py:82
+#: rhodecode/lib/diffs.py:80
 msgid ""
 "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr "Lista zmian była zbyt duża i została obcięta, użyj menu porównań żeby wyświetlić różnice"
 
-#: rhodecode/lib/diffs.py:92
+#: rhodecode/lib/diffs.py:90
 msgid "No changes detected"
 msgstr "Nie wykryto zmian"
 
-#: rhodecode/lib/helpers.py:539
-msgid "True"
-msgstr "Prawda"
-
-#: rhodecode/lib/helpers.py:542
-msgid "False"
-msgstr "Fałsz"
-
-#: rhodecode/lib/helpers.py:580
+#: rhodecode/lib/helpers.py:598
 #, python-format
 msgid "Deleted branch: %s"
 msgstr "Usunięta gałąź: %s"
 
-#: rhodecode/lib/helpers.py:583
+#: rhodecode/lib/helpers.py:601
 #, python-format
 msgid "Created tag: %s"
 msgstr "Utworzony tag: %s"
 
-#: rhodecode/lib/helpers.py:596
+#: rhodecode/lib/helpers.py:614
 msgid "Changeset not found"
 msgstr "Nie znaleziono changeset"
 
-#: rhodecode/lib/helpers.py:646
+#: rhodecode/lib/helpers.py:664
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "Pokaż wszystkie zestawienia zmian changesets %s->%s"
 
-#: rhodecode/lib/helpers.py:652
+#: rhodecode/lib/helpers.py:670
 msgid "compare view"
 msgstr "Wyświetl porównanie"
 
-#: rhodecode/lib/helpers.py:672
+#: rhodecode/lib/helpers.py:690
 msgid "and"
 msgstr "i"
 
-#: rhodecode/lib/helpers.py:673
+#: rhodecode/lib/helpers.py:691
 #, python-format
 msgid "%s more"
 msgstr "%s więcej"
 
-#: rhodecode/lib/helpers.py:674
-#: rhodecode/templates/changelog/changelog.html:53
+#: rhodecode/lib/helpers.py:692
+#: rhodecode/templates/changelog/changelog.html:58
 msgid "revisions"
 msgstr "rewizja"
 
-#: rhodecode/lib/helpers.py:698
+#: rhodecode/lib/helpers.py:716
 #, python-format
 msgid "fork name %s"
 msgstr "nazwa rozgałęzienia %s"
 
-#: rhodecode/lib/helpers.py:715
-#: rhodecode/templates/pullrequests/pullrequest_show.html:8
+#: rhodecode/lib/helpers.py:733
+#: rhodecode/templates/pullrequests/pullrequest_show.html:11
 #, python-format
 msgid "Pull request #%s"
 msgstr "Połączonych gałęzi #%s"
 
-#: rhodecode/lib/helpers.py:725
+#: rhodecode/lib/helpers.py:743
 msgid "[deleted] repository"
 msgstr "[usunięte] repozytorium"
 
-#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739
+#: rhodecode/lib/helpers.py:745 rhodecode/lib/helpers.py:757
 msgid "[created] repository"
 msgstr "[utworzone] repozytorium"
 
-#: rhodecode/lib/helpers.py:729
+#: rhodecode/lib/helpers.py:747
 msgid "[created] repository as fork"
 msgstr "[utworzone] repozytorium jako rozgałęzienie"
 
-#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741
+#: rhodecode/lib/helpers.py:749 rhodecode/lib/helpers.py:759
 msgid "[forked] repository"
 msgstr "[rozgałęzione] repozytorium"
 
-#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743
+#: rhodecode/lib/helpers.py:751 rhodecode/lib/helpers.py:761
 msgid "[updated] repository"
 msgstr "[zaktualizowane] repozytorium"
 
-#: rhodecode/lib/helpers.py:735
+#: rhodecode/lib/helpers.py:753
 msgid "[downloaded] archive from repository"
 msgstr "[pobierz] archiwum z repozytorium"
 
-#: rhodecode/lib/helpers.py:737
+#: rhodecode/lib/helpers.py:755
 msgid "[delete] repository"
 msgstr "[skasowane] repozytorium"
 
-#: rhodecode/lib/helpers.py:745
+#: rhodecode/lib/helpers.py:763
 msgid "[created] user"
 msgstr "[utworzony] użytkownik"
 
-#: rhodecode/lib/helpers.py:747
+#: rhodecode/lib/helpers.py:765
 msgid "[updated] user"
 msgstr "[zaktualizowany] użytkownik"
 
-#: rhodecode/lib/helpers.py:749
+#: rhodecode/lib/helpers.py:767
 msgid "[created] user group"
 msgstr "[utworzona] grupa użytkowników"
 
-#: rhodecode/lib/helpers.py:751
+#: rhodecode/lib/helpers.py:769
 msgid "[updated] user group"
 msgstr "[zaktualizowana] grupa użytkowników"
 
-#: rhodecode/lib/helpers.py:753
+#: rhodecode/lib/helpers.py:771
 msgid "[commented] on revision in repository"
 msgstr "[komentarz] do zmiany w repozytorium"
 
-#: rhodecode/lib/helpers.py:755
+#: rhodecode/lib/helpers.py:773
 msgid "[commented] on pull request for"
 msgstr "[komentarz] wniosek o połączenie gałęzi"
 
-#: rhodecode/lib/helpers.py:757
+#: rhodecode/lib/helpers.py:775
 msgid "[closed] pull request for"
 msgstr "[zamknięty] wniosek o połączenie gałęzi"
 
-#: rhodecode/lib/helpers.py:759
+#: rhodecode/lib/helpers.py:777
 msgid "[pushed] into"
 msgstr "[wysłane zmiany] w"
 
-#: rhodecode/lib/helpers.py:761
+#: rhodecode/lib/helpers.py:779
 msgid "[committed via RhodeCode] into repository"
 msgstr "[synchronizacja przez RhodeCode] z repozytorium"
 
-#: rhodecode/lib/helpers.py:763
+#: rhodecode/lib/helpers.py:781
 msgid "[pulled from remote] into repository"
 msgstr "[pobieranie z zdalnego] do repozytorium"
 
-#: rhodecode/lib/helpers.py:765
+#: rhodecode/lib/helpers.py:783
 msgid "[pulled] from"
 msgstr "[pobrano] "
 
-#: rhodecode/lib/helpers.py:767
+#: rhodecode/lib/helpers.py:785
 msgid "[started following] repository"
 msgstr "[start następnego] repozytorium"
 
-#: rhodecode/lib/helpers.py:769
+#: rhodecode/lib/helpers.py:787
 msgid "[stopped following] repository"
 msgstr "[zatrzymany po] repozytorium"
 
-#: rhodecode/lib/helpers.py:1088
+#: rhodecode/lib/helpers.py:1102
 #, python-format
 msgid " and %s more"
 msgstr "i %s więcej"
 
-#: rhodecode/lib/helpers.py:1092
+#: rhodecode/lib/helpers.py:1106
 msgid "No Files"
 msgstr "Brak Plików"
 
-#: rhodecode/lib/helpers.py:1158
+#: rhodecode/lib/helpers.py:1172
 msgid "new file"
 msgstr "nowy plik"
 
-#: rhodecode/lib/helpers.py:1161
+#: rhodecode/lib/helpers.py:1175
 msgid "mod"
 msgstr "modyfikuj"
 
-#: rhodecode/lib/helpers.py:1164
+#: rhodecode/lib/helpers.py:1178
 msgid "del"
 msgstr "kasuj"
 
-#: rhodecode/lib/helpers.py:1167
+#: rhodecode/lib/helpers.py:1181
 msgid "rename"
 msgstr "zmień nazwę"
 
-#: rhodecode/lib/helpers.py:1172
+#: rhodecode/lib/helpers.py:1186
 msgid "chmod"
 msgstr "chmod"
 
-#: rhodecode/lib/helpers.py:1404
+#: rhodecode/lib/helpers.py:1418
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from the"
 " filesystem please run the application again in order to rescan repositories"
 msgstr "%s repozytorium nie jest mapowane do db może zostało utworzone lub zmienione z systemie plików proszę uruchomić aplikację ponownie, aby ponownie przeskanować repozytoria"
 
-#: rhodecode/lib/unionrepo.py:193
-msgid "cannot create new union repository"
-msgstr "[utworzone] repozytorium"
-
-#: rhodecode/lib/utils2.py:410
+#: rhodecode/lib/utils2.py:413
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
@@ -1037,7 +1169,7 @@
 msgstr[1] "%d lata"
 msgstr[2] "%d lat"
 
-#: rhodecode/lib/utils2.py:411
+#: rhodecode/lib/utils2.py:414
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
@@ -1045,7 +1177,7 @@
 msgstr[1] "%d miesięcy"
 msgstr[2] "%d miesięcy"
 
-#: rhodecode/lib/utils2.py:412
+#: rhodecode/lib/utils2.py:415
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -1053,7 +1185,7 @@
 msgstr[1] "%d dni"
 msgstr[2] "%d dni"
 
-#: rhodecode/lib/utils2.py:413
+#: rhodecode/lib/utils2.py:416
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1061,7 +1193,7 @@
 msgstr[1] "%d godziny"
 msgstr[2] "%d godzin"
 
-#: rhodecode/lib/utils2.py:414
+#: rhodecode/lib/utils2.py:417
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1069,7 +1201,7 @@
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: rhodecode/lib/utils2.py:415
+#: rhodecode/lib/utils2.py:418
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1077,248 +1209,463 @@
 msgstr[1] "%d sekund"
 msgstr[2] "%d sekund"
 
-#: rhodecode/lib/utils2.py:431
+#: rhodecode/lib/utils2.py:434
 #, python-format
 msgid "in %s"
 msgstr "w %s"
 
-#: rhodecode/lib/utils2.py:433
+#: rhodecode/lib/utils2.py:436
 #, python-format
 msgid "%s ago"
 msgstr "%s temu"
 
-#: rhodecode/lib/utils2.py:435
+#: rhodecode/lib/utils2.py:438
 #, python-format
 msgid "in %s and %s"
 msgstr "w %s i %s"
 
-#: rhodecode/lib/utils2.py:438
+#: rhodecode/lib/utils2.py:441
 #, python-format
 msgid "%s and %s ago"
 msgstr "%s i %s temu"
 
-#: rhodecode/lib/utils2.py:441
+#: rhodecode/lib/utils2.py:444
 msgid "just now"
 msgstr "przed chwilą"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1454
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1511
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1572
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1622
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1649 rhodecode/model/db.py:1659
 msgid "Repository no access"
 msgstr "Brak dostępu do repozytorium"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1455
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1573
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1623
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1650 rhodecode/model/db.py:1660
 msgid "Repository read access"
 msgstr "Repozytorium do odczytu"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1456
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1574
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1651 rhodecode/model/db.py:1661
 msgid "Repository write access"
 msgstr "Repozytorium do zapisu"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1167
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1457
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1515
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1575
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1652 rhodecode/model/db.py:1662
 msgid "Repository admin access"
 msgstr "Administracja dostępu do repozytorium"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308
 msgid "Repositories Group no access"
 msgstr "Grupy repozytoriów brak dostępu"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309
 msgid "Repositories Group read access"
 msgstr "Grupy repozytoriów dostęp do odczytu"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310
 msgid "Repositories Group write access"
 msgstr "Grupy repozytoriów dostęp do zapisu"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311
 msgid "Repositories Group admin access"
 msgstr "Repozytoria Grupy dostęp administratora"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1452
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1509
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1510
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1570
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1620
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1647 rhodecode/model/db.py:1657
 msgid "RhodeCode Administrator"
 msgstr "Administrator Repo"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1475
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1532
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1554
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1593
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1670 rhodecode/model/db.py:1680
 msgid "Repository creation disabled"
-msgstr "Repozytorium wyłączone"
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
+msgstr "Tworzenie repozytorium jest wyłączone"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1476
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1555
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1594
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1671 rhodecode/model/db.py:1681
 msgid "Repository creation enabled"
-msgstr "Repozytorium włączone"
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
+msgstr "Tworzenie repozytorium jest włączone"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1478
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1557
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1596
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1648
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1675 rhodecode/model/db.py:1685
 msgid "Repository forking disabled"
 msgstr "Rozwidlenie repozytorium wyłączone"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1479
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1537
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1558
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1597
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1649
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1676 rhodecode/model/db.py:1686
 msgid "Repository forking enabled"
 msgstr "Rozwidlenie repozytorium włączone"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1403
 msgid "Register disabled"
 msgstr "Rejestracja wyłączona"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1180
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1404
 msgid "Register new user with RhodeCode with manual activation"
 msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1183
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1407
 msgid "Register new user with RhodeCode with auto activation"
 msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1651
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1980
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2040
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2062
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2101
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2154
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2200 rhodecode/model/db.py:2210
 msgid "Not Reviewed"
 msgstr "Brak Korekty"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1652
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1981
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2063
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2102
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2155
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2201 rhodecode/model/db.py:2211
 msgid "Approved"
 msgstr "Zaakceptowano"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1653
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1982
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2064
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2103
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2156
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2202 rhodecode/model/db.py:2212
 msgid "Rejected"
 msgstr "Odrzucono"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1654
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1983
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2044
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2065
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2104
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2157
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2203 rhodecode/model/db.py:2213
 msgid "Under Review"
 msgstr "Objęty Przeglądem"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1300
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1357
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1358
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1379
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1471
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1498 rhodecode/model/db.py:1508
 msgid "top level"
 msgstr "najwyższy poziom"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1459
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1516
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1577
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1654 rhodecode/model/db.py:1664
 msgid "Repository group no access"
 msgstr "Grupy repozytoriów brak dostępu"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1460
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1578
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1628
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1655 rhodecode/model/db.py:1665
 msgid "Repository group read access"
 msgstr "Grupy repozytoriów dostęp do odczytu"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1461
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1579
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1629
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1656 rhodecode/model/db.py:1666
 msgid "Repository group write access"
 msgstr "Grupy repozytoriów dostęp do zapisu"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1462
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1520
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1580
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1630
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1657 rhodecode/model/db.py:1667
 msgid "Repository group admin access"
 msgstr "Repozytoria Grupy dostęp administratora"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1464
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1521
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1582
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1632
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1659 rhodecode/model/db.py:1669
 msgid "User group no access"
 msgstr "Ta grupa użytkowników nie ma dostępu"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1465
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1583
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1633
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1660 rhodecode/model/db.py:1670
 msgid "User group read access"
 msgstr "Dostęp do grupy parametrów użytkownika"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1466
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1545
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1584
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1634
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1661 rhodecode/model/db.py:1671
 msgid "User group write access"
 msgstr "Ta grupa użytkowników ma prawo do zapisu"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1467
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1525
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1546
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1585
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1635
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1662 rhodecode/model/db.py:1672
 msgid "User group admin access"
 msgstr "Ta grupa użytkowników ma uprawnienia administratora"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1469
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1526
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1548
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1587
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1637
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1664 rhodecode/model/db.py:1674
 msgid "Repository Group creation disabled"
 msgstr "Tworzenie grup repozytoriów wyłączone"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1470
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1528
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1549
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1588
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1638
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1665 rhodecode/model/db.py:1675
 msgid "Repository Group creation enabled"
 msgstr "Tworzenie grup repozytoriów włączone"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1472
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1529
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1551
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1590
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1640
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1667 rhodecode/model/db.py:1677
 msgid "User Group creation disabled"
 msgstr "Tworzenie grup użytkowników wyłączone"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1473
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1552
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1591
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1641
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1668 rhodecode/model/db.py:1678
 msgid "User Group creation enabled"
 msgstr "Tworzenie grup użytkowników właczone"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1481
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1560
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1599
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1651
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1678 rhodecode/model/db.py:1688
 msgid "Registration disabled"
 msgstr "Rejestracja wyłączona"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1482
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1561
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1600
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1652
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1679 rhodecode/model/db.py:1689
 msgid "User Registration with manual account activation"
 msgstr "Rejestracja użytkownika z ręczną aktywacją konta"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1483
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1562
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1601
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1653
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1680 rhodecode/model/db.py:1690
 msgid "User Registration with automatic account activation"
 msgstr "Rejestracja użytkownika z automatyczną aktywacją konta"
 
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1672 rhodecode/model/db.py:1682
+msgid ""
+"Repository creation enabled with write permission to a repository group"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1673 rhodecode/model/db.py:1683
+msgid ""
+"Repository creation disabled with write permission to a repository group"
+msgstr ""
+
 #: rhodecode/model/comment.py:75
 #, python-format
 msgid "on line %s"
@@ -1328,470 +1675,487 @@
 msgid "[Mention]"
 msgstr "[Wymieniony]"
 
-#: rhodecode/model/forms.py:43
+#: rhodecode/model/forms.py:57
 msgid "Please enter a login"
 msgstr "Wpisz login"
 
-#: rhodecode/model/forms.py:44
+#: rhodecode/model/forms.py:58
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr "Wprowadź wartość %(min)i znaków lub więcej"
 
-#: rhodecode/model/forms.py:52
+#: rhodecode/model/forms.py:66
 msgid "Please enter a password"
 msgstr "Wpisz hasło"
 
-#: rhodecode/model/forms.py:53
+#: rhodecode/model/forms.py:67
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr "Wpisz %(min)i lub więcej znaków"
 
-#: rhodecode/model/notification.py:228
+#: rhodecode/model/forms.py:156
+msgid "Name must not contain only digits"
+msgstr ""
+
+#: rhodecode/model/notification.py:229
 #, python-format
 msgid "%(user)s commented on changeset at %(when)s"
 msgstr "%(user)s skomentował zatwierdzenie %(when)s"
 
-#: rhodecode/model/notification.py:229
+#: rhodecode/model/notification.py:230
 #, python-format
 msgid "%(user)s sent message at %(when)s"
 msgstr "%(user)s wysłał wiadomość do %(when)s"
 
-#: rhodecode/model/notification.py:230
+#: rhodecode/model/notification.py:231
 #, python-format
 msgid "%(user)s mentioned you at %(when)s"
 msgstr "%(user)s wspomniał o Tobie w %(when)s"
 
-#: rhodecode/model/notification.py:231
+#: rhodecode/model/notification.py:232
 #, python-format
 msgid "%(user)s registered in RhodeCode at %(when)s"
 msgstr "%(user)s zarejestrował na stronie w %(when)s"
 
-#: rhodecode/model/notification.py:232
+#: rhodecode/model/notification.py:233
 #, python-format
 msgid "%(user)s opened new pull request at %(when)s"
 msgstr "%(user)s otworzył nowe połączenie gałęzi w %(when)s"
 
-#: rhodecode/model/notification.py:233
+#: rhodecode/model/notification.py:234
 #, python-format
 msgid "%(user)s commented on pull request at %(when)s"
 msgstr "%(user)s skomentował nowe połączenie gałęzi w %(when)s"
 
-#: rhodecode/model/pull_request.py:98
+#: rhodecode/model/pull_request.py:105
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s: %(pr_title)s"
 
-#: rhodecode/model/scm.py:674
+#: rhodecode/model/scm.py:808
 msgid "latest tip"
 msgstr "ostatni tip"
 
-#: rhodecode/model/user.py:232
+#: rhodecode/model/user.py:196
 msgid "New user registration"
 msgstr "nowy użytkownik się zarejestrował"
 
-#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
+#: rhodecode/model/user.py:220 rhodecode/model/user.py:245
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej aplikacji"
 
-#: rhodecode/model/user.py:303
+#: rhodecode/model/user.py:268
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr "Nie możesz usunąć tego użytkownika ponieważ jest kluczowy dla całej aplikacji"
 
-#: rhodecode/model/user.py:309
+#: rhodecode/model/user.py:274
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch owners "
 "or remove those repositories. %s"
 msgstr "użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może zostać usunięty. Zmień właściciela lub usuń te repozytoria. %s"
 
-#: rhodecode/model/user.py:334
+#: rhodecode/model/user.py:302
 msgid "Password reset link"
 msgstr "łącze resetowania hasła"
 
-#: rhodecode/model/user.py:366
+#: rhodecode/model/user.py:331
 msgid "Your new password"
 msgstr "Nowe hasło"
 
-#: rhodecode/model/user.py:367
+#: rhodecode/model/user.py:332
 #, python-format
 msgid "Your new RhodeCode password:%s"
 msgstr "Nowe hasło do strony: %s"
 
-#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39
+#: rhodecode/model/validators.py:82 rhodecode/model/validators.py:83
 msgid "Value cannot be an empty list"
 msgstr "Wartość listy nie może być pusta"
 
-#: rhodecode/model/validators.py:85
+#: rhodecode/model/validators.py:120
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "Użytkownik \"%(username)s\" już istnieje"
 
-#: rhodecode/model/validators.py:87
+#: rhodecode/model/validators.py:122
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr "Nazwa użytkownika \"%(username)s\" jest zabroniona"
 
-#: rhodecode/model/validators.py:89
+#: rhodecode/model/validators.py:124
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or "
 "dashes and must begin with alphanumeric character or underscore"
 msgstr "Nazwa użytkownika może zawierać tylko znaki alfanumeryczne, podkreślenia, kropki lub myślniki i muszą zaczynać się znakiem alfanumerycznym lub podkreśleniem"
 
-#: rhodecode/model/validators.py:117
+#: rhodecode/model/validators.py:151
+msgid "The input is not valid"
+msgstr ""
+
+#: rhodecode/model/validators.py:158
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr "Nazwa użytkownika %(username)s jest nieprawidłowa"
 
-#: rhodecode/model/validators.py:136
+#: rhodecode/model/validators.py:177
 msgid "Invalid user group name"
 msgstr "Niewłaściwa nazwa grupy"
 
-#: rhodecode/model/validators.py:137
+#: rhodecode/model/validators.py:178
 #, python-format
 msgid "User group \"%(usergroup)s\" already exists"
 msgstr "Nazwa grupy \"%(usergroup)s\" już istnieje"
 
-#: rhodecode/model/validators.py:139
+#: rhodecode/model/validators.py:180
 msgid ""
 "user group name may only contain alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr "nazwa grupy może zawierać tylko znaki alfanumeryczne, podkreślenia, kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym"
 
-#: rhodecode/model/validators.py:177
+#: rhodecode/model/validators.py:218
 msgid "Cannot assign this group as parent"
 msgstr "Nie można przypisać do tej grupy jako rodzic"
 
-#: rhodecode/model/validators.py:178
+#: rhodecode/model/validators.py:219
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "Nazwa grupy \"%(group_name)s\" już istnieje"
 
-#: rhodecode/model/validators.py:180
+#: rhodecode/model/validators.py:221
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "Repozytorium o nazwie \"%(group_name)s\" już istnieje"
 
-#: rhodecode/model/validators.py:238
+#: rhodecode/model/validators.py:279
 msgid "Invalid characters (non-ascii) in password"
 msgstr "Nieprawidłowe znaki (nie-ascii) w haśle"
 
-#: rhodecode/model/validators.py:253
+#: rhodecode/model/validators.py:294
+msgid "Invalid old password"
+msgstr ""
+
+#: rhodecode/model/validators.py:310
 msgid "Passwords do not match"
 msgstr "Hasła różnią się"
 
-#: rhodecode/model/validators.py:270
+#: rhodecode/model/validators.py:327
 msgid "invalid password"
 msgstr "nieprawidłowe hasło"
 
-#: rhodecode/model/validators.py:271
+#: rhodecode/model/validators.py:328
 msgid "invalid user name"
 msgstr "niepoprawna nazwa użytkownika"
 
-#: rhodecode/model/validators.py:272
+#: rhodecode/model/validators.py:329
 msgid "Your account is disabled"
 msgstr "Twoje konto jest wyłączone"
 
-#: rhodecode/model/validators.py:316
+#: rhodecode/model/validators.py:373
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr "Nazwa repozytorium  %(repo)s jest zabroniona"
 
-#: rhodecode/model/validators.py:318
+#: rhodecode/model/validators.py:375
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "Repozytorium o nazwie %(repo)s już istnieje"
 
-#: rhodecode/model/validators.py:319
+#: rhodecode/model/validators.py:376
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "Repozytorium  \"%(repo)s\" już istnieje w grupie \"%(group)s\""
 
-#: rhodecode/model/validators.py:321
+#: rhodecode/model/validators.py:378
 #, python-format
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr "Grupa repozytoriów z nazwą \"%(repo)s\" już istnieje"
 
-#: rhodecode/model/validators.py:438
+#: rhodecode/model/validators.py:493
 msgid "invalid clone url"
 msgstr "nieprawidłowe url klonowania"
 
-#: rhodecode/model/validators.py:439
+#: rhodecode/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr "Nieprawidłowe url klonowania, wstaw prawidłowy url http(s)/svn+http(s)"
 
-#: rhodecode/model/validators.py:464
+#: rhodecode/model/validators.py:519
 msgid "Fork have to be the same type as parent"
 msgstr "Fork musi być tego samego typu, jak rodzic"
 
-#: rhodecode/model/validators.py:479
+#: rhodecode/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr "Nie masz uprawnień do tworzenia repozytorium w tej grupie"
 
-#: rhodecode/model/validators.py:481
+#: rhodecode/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr "nie masz uprawnień do tworzenia repozytorium w tej grupie"
 
-#: rhodecode/model/validators.py:518
+#: rhodecode/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
 msgstr "Nie masz uprawnień do tworzenia repozytorium w tej grupie"
 
-#: rhodecode/model/validators.py:559
+#: rhodecode/model/validators.py:626
 msgid "This username or user group name is not valid"
 msgstr "Ta nazwa użytkownika lub grupy użytkowników nie jest prawidłowa"
 
-#: rhodecode/model/validators.py:652
+#: rhodecode/model/validators.py:719
 msgid "This is not a valid path"
 msgstr "To nie jest prawidłowa ścieżka"
 
-#: rhodecode/model/validators.py:667
+#: rhodecode/model/validators.py:734
 msgid "This e-mail address is already taken"
 msgstr "Ten adres e-mail jest już zajęty"
 
-#: rhodecode/model/validators.py:687
+#: rhodecode/model/validators.py:754
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "e-mail \"%(email)s\" nie istnieje."
 
-#: rhodecode/model/validators.py:724
+#: rhodecode/model/validators.py:791
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name of "
 "the attribute that is equivalent to \"username\""
 msgstr "Atrybut logowania CN do LDAP należy określić, jest to nazwa atrybutu, który jest odpowiednikiem  \"username\""
 
-#: rhodecode/model/validators.py:737
+#: rhodecode/model/validators.py:804
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr "Rewizja  %(revs)s jest już częścią  nowej gałęzi więc określ jego status"
 
-#: rhodecode/model/validators.py:769
+#: rhodecode/model/validators.py:836
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr "Proszę podać poprawny adres IPv4 lub IPv6"
 
-#: rhodecode/model/validators.py:770
+#: rhodecode/model/validators.py:837
 #, python-format
 msgid ""
 "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr "Rozmiar sieci (bits) może mieścić się w zakresie od 0-32 (nie %(bits)r)"
 
-#: rhodecode/model/validators.py:803
+#: rhodecode/model/validators.py:870
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr "Klucz nazwy może składać się tylko z liter, podkreślenia, myślnika lub numerów"
 
-#: rhodecode/model/validators.py:817
+#: rhodecode/model/validators.py:884
 msgid "Filename cannot be inside a directory"
 msgstr "Nazwa pliku nie może znajdować się w katalogu"
 
+#: rhodecode/model/validators.py:900
+#, python-format
+msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
+msgstr ""
+
 #: rhodecode/templates/index.html:5
 msgid "Dashboard"
 msgstr "Repozytorium"
 
 #: rhodecode/templates/index_base.html:6
-#: rhodecode/templates/repo_switcher_list.html:4
-#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/users/user_edit_my_account.html:31
-#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/bookmarks/bookmarks.html:9
-#: rhodecode/templates/branches/branches.html:9
-#: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:46
-#: rhodecode/templates/journal/journal.html:47
-#: rhodecode/templates/tags/tags.html:9
+#: rhodecode/templates/admin/my_account/my_account_repos.html:3
+#: rhodecode/templates/admin/my_account/my_account_watched.html:3
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:12
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:12
+#: rhodecode/templates/admin/users/users.html:12
+#: rhodecode/templates/bookmarks/bookmarks.html:12
+#: rhodecode/templates/branches/branches.html:12
+#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:50
+#: rhodecode/templates/tags/tags.html:12
 msgid "quick filter..."
 msgstr "szybki filtr..."
 
 #: rhodecode/templates/index_base.html:6
-#: rhodecode/templates/admin/repos/repos.html:9
+#: rhodecode/templates/admin/repos/repos.html:12
 msgid "repositories"
 msgstr "repozytoria"
 
-#: rhodecode/templates/index_base.html:13
-#: rhodecode/templates/index_base.html:18
-#: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repos.html:22
-msgid "Add repository"
-msgstr "Dodaj repozytorium"
-
-#: rhodecode/templates/index_base.html:15
 #: rhodecode/templates/index_base.html:20
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31
-msgid "Add group"
-msgstr "Dodaj grupę"
-
+#: rhodecode/templates/index_base.html:25
+#: rhodecode/templates/admin/repos/repo_add.html:22
+#: rhodecode/templates/admin/repos/repos.html:25
+msgid "Add Repository"
+msgstr "Dodaj Repozytorium"
+
+#: rhodecode/templates/index_base.html:22
 #: rhodecode/templates/index_base.html:27
-msgid "Edit group"
-msgstr "Edytuj grupę"
-
-#: rhodecode/templates/index_base.html:27
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:16
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:29
+msgid "Add Repository Group"
+msgstr "Dodaj Grupę Repozytoriów"
+
+#: rhodecode/templates/index_base.html:32
 msgid "You have admin right to this group, and can edit it"
 msgstr "Jako administrator uprawnienia tej grupy, i możesz je edytować"
 
-#: rhodecode/templates/index_base.html:40
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43
-#: rhodecode/templates/admin/users_groups/users_group_add.html:32
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:33
-#: rhodecode/templates/admin/users_groups/users_groups.html:37
-msgid "Group name"
-msgstr "Nazwa grupy"
-
-#: rhodecode/templates/index_base.html:41
-#: rhodecode/templates/index_base.html:123
-#: rhodecode/templates/admin/repos/repo_add_base.html:56
-#: rhodecode/templates/admin/repos/repo_edit.html:68
-#: rhodecode/templates/admin/repos/repos.html:75
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44
-#: rhodecode/templates/email_templates/changeset_comment.html:9
+#: rhodecode/templates/index_base.html:32
+msgid "Edit Repository Group"
+msgstr "Edytuj Grupę Repozytoriów"
+
+#: rhodecode/templates/index_base.html:45
+msgid "Group Name"
+msgstr "Nazwa Grupy"
+
+#: rhodecode/templates/index_base.html:46
+#: rhodecode/templates/index_base.html:128
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:64
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:45
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:17
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:32
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:72
+#: rhodecode/templates/admin/repos/repos.html:51
+#: rhodecode/templates/admin/user_groups/user_group_add.html:43
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:51
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:64
+#: rhodecode/templates/email_templates/changeset_comment.html:16
 #: rhodecode/templates/email_templates/pull_request.html:9
-#: rhodecode/templates/forks/fork.html:56
-#: rhodecode/templates/pullrequests/pullrequest.html:43
-#: rhodecode/templates/pullrequests/pullrequest_show.html:81
-#: rhodecode/templates/summary/summary.html:106
+#: rhodecode/templates/forks/fork.html:41
+#: rhodecode/templates/pullrequests/pullrequest.html:40
+#: rhodecode/templates/pullrequests/pullrequest_show.html:86
+#: rhodecode/templates/summary/summary.html:88
 msgid "Description"
 msgstr "Opis"
 
-#: rhodecode/templates/index_base.html:51
-#: rhodecode/templates/admin/permissions/permissions.html:55
-#: rhodecode/templates/admin/repos/repo_add_base.html:29
-#: rhodecode/templates/admin/repos/repo_edit.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57
-#: rhodecode/templates/forks/fork.html:47
-msgid "Repository group"
-msgstr "Repozytorium grupy"
-
-#: rhodecode/templates/index_base.html:121
+#: rhodecode/templates/index_base.html:126
+#: rhodecode/templates/admin/my_account/my_account_repos.html:46
+#: rhodecode/templates/admin/my_account/my_account_watched.html:46
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:50
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
-#: rhodecode/templates/admin/repos/repo_edit.html:32
-#: rhodecode/templates/admin/repos/repos.html:73
-#: rhodecode/templates/admin/users/user_edit_my_account.html:172
-#: rhodecode/templates/base/perms_summary.html:37
-#: rhodecode/templates/bookmarks/bookmarks.html:48
-#: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:47
-#: rhodecode/templates/branches/branches_data.html:6
-#: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:193
-#: rhodecode/templates/journal/journal.html:283
-#: rhodecode/templates/summary/summary.html:55
-#: rhodecode/templates/summary/summary.html:124
-#: rhodecode/templates/tags/tags.html:48
-#: rhodecode/templates/tags/tags_data.html:6
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:7
+#: rhodecode/templates/admin/repos/repos.html:50
+#: rhodecode/templates/admin/user_groups/user_groups.html:50
+#: rhodecode/templates/base/perms_summary.html:53
+#: rhodecode/templates/bookmarks/bookmarks.html:51
+#: rhodecode/templates/bookmarks/bookmarks_data.html:7
+#: rhodecode/templates/branches/branches.html:50
+#: rhodecode/templates/branches/branches_data.html:7
+#: rhodecode/templates/files/files_browser.html:41
+#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/journal/journal.html:288
+#: rhodecode/templates/tags/tags.html:51
+#: rhodecode/templates/tags/tags_data.html:7
 msgid "Name"
 msgstr "Nazwa"
 
-#: rhodecode/templates/index_base.html:124
+#: rhodecode/templates/index_base.html:129
 msgid "Last Change"
 msgstr "Ostatnia akytwność"
 
-#: rhodecode/templates/index_base.html:126
-#: rhodecode/templates/admin/repos/repos.html:76
-#: rhodecode/templates/admin/users/user_edit_my_account.html:174
-#: rhodecode/templates/journal/journal.html:195
-#: rhodecode/templates/journal/journal.html:285
+#: rhodecode/templates/index_base.html:131
+#: rhodecode/templates/admin/my_account/my_account_repos.html:48
+#: rhodecode/templates/admin/my_account/my_account_watched.html:48
+#: rhodecode/templates/admin/repos/repos.html:52
+#: rhodecode/templates/journal/journal.html:199
+#: rhodecode/templates/journal/journal.html:290
 msgid "Tip"
 msgstr "Ostatnia zmiana"
 
-#: rhodecode/templates/index_base.html:128
-#: rhodecode/templates/admin/repos/repo_edit.html:114
-#: rhodecode/templates/admin/repos/repos.html:78
+#: rhodecode/templates/index_base.html:133
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:10
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:53
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:60
+#: rhodecode/templates/admin/repos/repos.html:53
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:8
+#: rhodecode/templates/admin/user_groups/user_groups.html:54
+#: rhodecode/templates/summary/summary.html:141
 msgid "Owner"
 msgstr "Właściciel"
 
-#: rhodecode/templates/index_base.html:136
-#: rhodecode/templates/admin/repos/repos.html:86
-#: rhodecode/templates/admin/users/user_edit_my_account.html:183
-#: rhodecode/templates/admin/users/users.html:107
-#: rhodecode/templates/bookmarks/bookmarks.html:74
-#: rhodecode/templates/branches/branches.html:73
-#: rhodecode/templates/journal/journal.html:204
-#: rhodecode/templates/journal/journal.html:294
-#: rhodecode/templates/tags/tags.html:74
+#: rhodecode/templates/index_base.html:141
+#: rhodecode/templates/admin/my_account/my_account_repos.html:57
+#: rhodecode/templates/admin/my_account/my_account_watched.html:57
+#: rhodecode/templates/base/root.html:69
+#: rhodecode/templates/bookmarks/bookmarks.html:81
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:208
+#: rhodecode/templates/journal/journal.html:299
+#: rhodecode/templates/tags/tags.html:81
 msgid "Click to sort ascending"
 msgstr "Kliknij, aby posortować rosnąco"
 
-#: rhodecode/templates/index_base.html:137
-#: rhodecode/templates/admin/repos/repos.html:87
-#: rhodecode/templates/admin/users/user_edit_my_account.html:184
-#: rhodecode/templates/admin/users/users.html:108
-#: rhodecode/templates/bookmarks/bookmarks.html:75
-#: rhodecode/templates/branches/branches.html:74
-#: rhodecode/templates/journal/journal.html:205
-#: rhodecode/templates/journal/journal.html:295
-#: rhodecode/templates/tags/tags.html:75
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/admin/my_account/my_account_repos.html:58
+#: rhodecode/templates/admin/my_account/my_account_watched.html:58
+#: rhodecode/templates/base/root.html:70
+#: rhodecode/templates/bookmarks/bookmarks.html:82
+#: rhodecode/templates/branches/branches.html:81
+#: rhodecode/templates/journal/journal.html:209
+#: rhodecode/templates/journal/journal.html:300
+#: rhodecode/templates/tags/tags.html:82
 msgid "Click to sort descending"
 msgstr "Kliknij, aby posortować malejąco"
 
-#: rhodecode/templates/index_base.html:138
+#: rhodecode/templates/index_base.html:143
 msgid "No repositories found."
 msgstr "Nie znaleziono repozytorium."
 
-#: rhodecode/templates/index_base.html:139
-#: rhodecode/templates/admin/repos/repos.html:89
-#: rhodecode/templates/admin/users/user_edit_my_account.html:186
-#: rhodecode/templates/admin/users/users.html:110
-#: rhodecode/templates/bookmarks/bookmarks.html:77
-#: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:207
-#: rhodecode/templates/journal/journal.html:297
-#: rhodecode/templates/tags/tags.html:77
+#: rhodecode/templates/index_base.html:144
+#: rhodecode/templates/admin/my_account/my_account_repos.html:60
+#: rhodecode/templates/admin/my_account/my_account_watched.html:60
+#: rhodecode/templates/base/root.html:72
+#: rhodecode/templates/bookmarks/bookmarks.html:84
+#: rhodecode/templates/branches/branches.html:83
+#: rhodecode/templates/journal/journal.html:211
+#: rhodecode/templates/journal/journal.html:302
+#: rhodecode/templates/tags/tags.html:84
 msgid "Data error."
 msgstr "Błąd danych."
 
-#: rhodecode/templates/index_base.html:140
-#: rhodecode/templates/admin/repos/repos.html:90
-#: rhodecode/templates/admin/users/user_edit_my_account.html:58
-#: rhodecode/templates/admin/users/user_edit_my_account.html:187
-#: rhodecode/templates/admin/users/users.html:111
-#: rhodecode/templates/bookmarks/bookmarks.html:78
-#: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:208
-#: rhodecode/templates/journal/journal.html:298
-#: rhodecode/templates/tags/tags.html:78
+#: rhodecode/templates/index_base.html:145
+#: rhodecode/templates/admin/my_account/my_account_repos.html:61
+#: rhodecode/templates/admin/my_account/my_account_watched.html:61
+#: rhodecode/templates/base/base.html:148
+#: rhodecode/templates/base/root.html:73
+#: rhodecode/templates/bookmarks/bookmarks.html:85
+#: rhodecode/templates/branches/branches.html:84
+#: rhodecode/templates/journal/journal.html:212
+#: rhodecode/templates/journal/journal.html:303
+#: rhodecode/templates/tags/tags.html:85
 msgid "Loading..."
 msgstr "Wczytywanie..."
 
-#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239
+#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:32
+#: rhodecode/templates/base/base.html:267
 msgid "Log In"
 msgstr "Zaloguj się"
 
-#: rhodecode/templates/login.html:21
+#: rhodecode/templates/login.html:30
 #, python-format
 msgid "Log In to %s"
 msgstr "Zaloguj się do %s"
 
-#: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
+#: rhodecode/templates/login.html:43 rhodecode/templates/register.html:40
 #: rhodecode/templates/admin/admin_log.html:5
-#: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:57
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31
-#: rhodecode/templates/admin/users/users.html:77
-#: rhodecode/templates/base/base.html:215
-#: rhodecode/templates/summary/summary.html:123
+#: rhodecode/templates/admin/my_account/my_account_profile.html:30
+#: rhodecode/templates/admin/users/user_add.html:35
+#: rhodecode/templates/admin/users/user_edit_profile.html:33
+#: rhodecode/templates/admin/users/users.html:53
+#: rhodecode/templates/base/base.html:243
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
-#: rhodecode/templates/admin/ldap/ldap.html:46
-#: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:224
+#: rhodecode/templates/login.html:52 rhodecode/templates/register.html:49
+#: rhodecode/templates/admin/my_account/my_account.html:39
+#: rhodecode/templates/admin/users/user_add.html:44
+#: rhodecode/templates/base/base.html:252
 msgid "Password"
 msgstr "Hasło"
 
-#: rhodecode/templates/login.html:50
+#: rhodecode/templates/login.html:62
 msgid "Remember me"
 msgstr "Zapamiętaj mnie"
 
-#: rhodecode/templates/login.html:54
+#: rhodecode/templates/login.html:66
 msgid "Sign In"
 msgstr "Zaloguj się"
 
-#: rhodecode/templates/login.html:60
+#: rhodecode/templates/login.html:72
 msgid "Forgot your password ?"
 msgstr "Zapomniałeś hasła?"
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235
+#: rhodecode/templates/login.html:75 rhodecode/templates/base/base.html:263
 msgid "Don't have an account ?"
 msgstr "Nie masz konta?"
 
@@ -1799,111 +2163,112 @@
 msgid "Password Reset"
 msgstr "Łącze resetowania hasła"
 
-#: rhodecode/templates/password_reset.html:11
-msgid "Reset your password to"
-msgstr "Resetowanie hasła dla"
-
-#: rhodecode/templates/password_reset.html:21
-msgid "Email address"
-msgstr "Adres e-mail"
-
-#: rhodecode/templates/password_reset.html:30
-msgid "Reset my password"
-msgstr "Zresetuj swoje hasło"
+#: rhodecode/templates/password_reset.html:29
+#, python-format
+msgid "Reset your Password to %s"
+msgstr ""
 
 #: rhodecode/templates/password_reset.html:31
+msgid "Reset your Password"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:42
+msgid "Email Address"
+msgstr "Adres Email"
+
+#: rhodecode/templates/password_reset.html:52
+#: rhodecode/templates/register.html:95
+msgid "Captcha"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:63
+msgid "Send password reset email"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:64
 msgid "Password reset link will be send to matching email address"
 msgstr "Link do zresetowania hasła zostanie wysłany na adres e-mail"
 
-#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74
+#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:30
+#: rhodecode/templates/register.html:106
 msgid "Sign Up"
 msgstr "Zarejestruj się"
 
-#: rhodecode/templates/register.html:11
-msgid "Sign Up to"
-msgstr "Zarejestruj się do"
-
-#: rhodecode/templates/register.html:38
+#: rhodecode/templates/register.html:28
+#, python-format
+msgid "Sign Up to %s"
+msgstr ""
+
+#: rhodecode/templates/register.html:58
 msgid "Re-enter password"
 msgstr "Ponownie wprowadź hasło"
 
-#: rhodecode/templates/register.html:47
-#: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
+#: rhodecode/templates/register.html:67
+#: rhodecode/templates/admin/my_account/my_account_profile.html:41
+#: rhodecode/templates/admin/users/user_add.html:62
+#: rhodecode/templates/admin/users/user_edit_profile.html:87
 msgid "First Name"
 msgstr "Imię"
 
-#: rhodecode/templates/register.html:56
-#: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:106
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
+#: rhodecode/templates/register.html:76
+#: rhodecode/templates/admin/my_account/my_account_profile.html:50
+#: rhodecode/templates/admin/users/user_add.html:71
+#: rhodecode/templates/admin/users/user_edit_profile.html:96
 msgid "Last Name"
 msgstr "Nazwisko"
 
-#: rhodecode/templates/register.html:65
-#: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:115
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/summary/summary.html:125
+#: rhodecode/templates/register.html:85
+#: rhodecode/templates/admin/my_account/my_account_profile.html:59
+#: rhodecode/templates/admin/settings/settings.html:44
+#: rhodecode/templates/admin/users/user_add.html:80
+#: rhodecode/templates/admin/users/user_edit_profile.html:42
 msgid "Email"
 msgstr "E-mail"
 
-#: rhodecode/templates/register.html:76
+#: rhodecode/templates/register.html:108
 msgid "Your account will be activated right after registration"
 msgstr "Twoje konto zostanie aktywowane zaraz po rejestracji"
 
-#: rhodecode/templates/register.html:78
+#: rhodecode/templates/register.html:110
 msgid "Your account must wait for activation by administrator"
 msgstr "Twoje konto musi zostać aktywowane przez administratora"
 
-#: rhodecode/templates/repo_switcher_list.html:10
-#: rhodecode/templates/admin/defaults/defaults.html:44
-#: rhodecode/templates/admin/repos/repo_add_base.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:78
-#: rhodecode/templates/data_table/_dt_elements.html:61
-#: rhodecode/templates/summary/summary.html:77
-msgid "Private repository"
-msgstr "Prywatne repozytorium"
-
-#: rhodecode/templates/repo_switcher_list.html:12
-#: rhodecode/templates/data_table/_dt_elements.html:63
-#: rhodecode/templates/summary/summary.html:79
-msgid "Public repository"
-msgstr "Publiczne repozytorium"
-
 #: rhodecode/templates/switch_to_list.html:10
-#: rhodecode/templates/branches/branches_data.html:57
+#: rhodecode/templates/branches/branches_data.html:67
 msgid "There are no branches yet"
 msgstr "Nie ma jeszcze gałęzi"
 
-#: rhodecode/templates/switch_to_list.html:22
-#: rhodecode/templates/tags/tags_data.html:38
+#: rhodecode/templates/switch_to_list.html:16
+msgid "Closed Branches"
+msgstr "Zamknięte Gałęzie"
+
+#: rhodecode/templates/switch_to_list.html:32
+#: rhodecode/templates/tags/tags_data.html:44
 msgid "There are no tags yet"
 msgstr "Nie ma jeszcze tagów"
 
-#: rhodecode/templates/switch_to_list.html:35
-#: rhodecode/templates/bookmarks/bookmarks_data.html:37
+#: rhodecode/templates/switch_to_list.html:45
+#: rhodecode/templates/bookmarks/bookmarks_data.html:43
 msgid "There are no bookmarks yet"
 msgstr "Nie ma jeszcze zakładek"
 
 #: rhodecode/templates/admin/admin.html:5
-#: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/base/base.html:73
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/base/base.html:69
 msgid "Admin journal"
 msgstr "Dziennik administratora"
 
-#: rhodecode/templates/admin/admin.html:10
+#: rhodecode/templates/admin/admin.html:13
 msgid "journal filter..."
 msgstr "szybkie wyszukiwanie..."
 
-#: rhodecode/templates/admin/admin.html:12
-#: rhodecode/templates/journal/journal.html:11
+#: rhodecode/templates/admin/admin.html:15
+#: rhodecode/templates/journal/journal.html:14
 msgid "filter"
 msgstr "filtr"
 
-#: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/journal/journal.html:15
 #, python-format
 msgid "%s entry"
 msgid_plural "%s entries"
@@ -1912,28 +2277,30 @@
 msgstr[2] "%s wejść"
 
 #: rhodecode/templates/admin/admin_log.html:6
-#: rhodecode/templates/admin/repos/repos.html:79
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
-#: rhodecode/templates/admin/users/user_edit_my_account.html:176
-#: rhodecode/templates/admin/users/users.html:87
-#: rhodecode/templates/admin/users_groups/users_groups.html:40
-#: rhodecode/templates/journal/journal.html:197
-#: rhodecode/templates/journal/journal.html:287
+#: rhodecode/templates/admin/my_account/my_account_repos.html:50
+#: rhodecode/templates/admin/my_account/my_account_watched.html:50
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:54
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:8
+#: rhodecode/templates/admin/repos/repos.html:55
+#: rhodecode/templates/admin/user_groups/user_groups.html:55
+#: rhodecode/templates/admin/users/users.html:60
+#: rhodecode/templates/journal/journal.html:201
+#: rhodecode/templates/journal/journal.html:292
 msgid "Action"
 msgstr "Działanie"
 
 #: rhodecode/templates/admin/admin_log.html:7
-#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/permissions/permissions_globals.html:18
 msgid "Repository"
 msgstr "Repozytorium"
 
 #: rhodecode/templates/admin/admin_log.html:8
-#: rhodecode/templates/bookmarks/bookmarks.html:49
-#: rhodecode/templates/bookmarks/bookmarks_data.html:7
-#: rhodecode/templates/branches/branches.html:48
-#: rhodecode/templates/branches/branches_data.html:7
-#: rhodecode/templates/tags/tags.html:49
-#: rhodecode/templates/tags/tags_data.html:7
+#: rhodecode/templates/bookmarks/bookmarks.html:53
+#: rhodecode/templates/bookmarks/bookmarks_data.html:9
+#: rhodecode/templates/branches/branches.html:52
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/tags/tags.html:53
+#: rhodecode/templates/tags/tags_data.html:9
 msgid "Date"
 msgstr "Data"
 
@@ -1945,309 +2312,598 @@
 msgid "No actions yet"
 msgstr "Brak akcji"
 
+#: rhodecode/templates/admin/auth/auth_settings.html:5
+msgid "Authentication Settings"
+msgstr "Ustawienia Autentykacji"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:14
+#: rhodecode/templates/base/base.html:75
+msgid "Authentication"
+msgstr "Autentykacja"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:31
+msgid "Authentication Plugins"
+msgstr "Wtyczki Autentykacji"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:34
+msgid "Enabled Plugins"
+msgstr "Włączone Wtyczki"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:36
+msgid ""
+"Comma separated list of plugins. Order of plugins is also order in which "
+"RhodeCode will try to authenticate user"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:37
+msgid "Available built-in plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:65
+msgid "enabled"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:66
+msgid "disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:51
+#: rhodecode/templates/admin/defaults/defaults.html:87
+#: rhodecode/templates/admin/my_account/my_account_password.html:33
+#: rhodecode/templates/admin/my_account/my_account_profile.html:68
+#: rhodecode/templates/admin/permissions/permissions_globals.html:108
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:72
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:114
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:101
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:134
+#: rhodecode/templates/admin/settings/settings_hooks.html:53
+#: rhodecode/templates/admin/user_groups/user_group_add.html:60
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:104
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:67
+#: rhodecode/templates/admin/users/user_add.html:99
+#: rhodecode/templates/admin/users/user_edit_profile.html:122
+#: rhodecode/templates/base/default_perms_box.html:64
+msgid "Save"
+msgstr "Zapisz"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:57
+msgid "Plugin"
+msgstr "Wtyczka"
+
 #: rhodecode/templates/admin/defaults/defaults.html:5
-#: rhodecode/templates/admin/defaults/defaults.html:25
+#: rhodecode/templates/admin/defaults/defaults.html:28
 msgid "Repositories defaults"
 msgstr "Repozytoria domyślne"
 
-#: rhodecode/templates/admin/defaults/defaults.html:11
-#: rhodecode/templates/base/base.html:80
+#: rhodecode/templates/admin/defaults/defaults.html:14
+#: rhodecode/templates/base/base.html:76
 msgid "Defaults"
 msgstr "Domyślne"
 
-#: rhodecode/templates/admin/defaults/defaults.html:35
-#: rhodecode/templates/admin/repos/repo_add_base.html:38
+#: rhodecode/templates/admin/defaults/defaults.html:38
+#: rhodecode/templates/admin/repos/repo_add_base.html:59
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:7
 msgid "Type"
 msgstr "Typ"
 
-#: rhodecode/templates/admin/defaults/defaults.html:48
-#: rhodecode/templates/admin/repos/repo_add_base.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:82
-#: rhodecode/templates/forks/fork.html:69
+#: rhodecode/templates/admin/defaults/defaults.html:47
+#: rhodecode/templates/admin/repos/repo_add_base.html:77
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:82
+#: rhodecode/templates/data_table/_dt_elements.html:70
+msgid "Private repository"
+msgstr "Prywatne repozytorium"
+
+#: rhodecode/templates/admin/defaults/defaults.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:81
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:86
+#: rhodecode/templates/forks/fork.html:75
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
 msgstr "Prywatne repozytoria są widoczne tylko dla osób bezpośrednio dodanych jako współpracownicy."
 
-#: rhodecode/templates/admin/defaults/defaults.html:55
-#: rhodecode/templates/admin/repos/repo_edit.html:87
+#: rhodecode/templates/admin/defaults/defaults.html:58
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:91
 msgid "Enable statistics"
 msgstr "Włącz statystyki"
 
-#: rhodecode/templates/admin/defaults/defaults.html:59
-#: rhodecode/templates/admin/repos/repo_edit.html:91
+#: rhodecode/templates/admin/defaults/defaults.html:62
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:95
 msgid "Enable statistics window on summary page."
 msgstr "Włącz okno statystyk na stronie podsumowania."
 
-#: rhodecode/templates/admin/defaults/defaults.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:96
+#: rhodecode/templates/admin/defaults/defaults.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:100
 msgid "Enable downloads"
 msgstr "Włącz pobieranie"
 
-#: rhodecode/templates/admin/defaults/defaults.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:100
+#: rhodecode/templates/admin/defaults/defaults.html:72
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:104
 msgid "Enable download menu on summary page."
 msgstr "Włącz menu pobierania na stronie podsumowania."
 
-#: rhodecode/templates/admin/defaults/defaults.html:75
-#: rhodecode/templates/admin/repos/repo_edit.html:105
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64
+#: rhodecode/templates/admin/defaults/defaults.html:78
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:34
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:109
 msgid "Enable locking"
 msgstr "Włącz blokowanie"
 
-#: rhodecode/templates/admin/defaults/defaults.html:79
-#: rhodecode/templates/admin/repos/repo_edit.html:109
+#: rhodecode/templates/admin/defaults/defaults.html:82
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:113
 msgid "Enable lock-by-pulling on repository."
 msgstr "Włącz blokowanie pobierania w repozytorium."
 
-#: rhodecode/templates/admin/defaults/defaults.html:84
-#: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/permissions/permissions.html:122
-#: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos/repo_edit.html:166
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96
-#: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_add.html:94
-#: rhodecode/templates/admin/users/user_edit.html:140
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88
-#: rhodecode/templates/admin/users_groups/users_group_add.html:49
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:143
-#: rhodecode/templates/base/default_perms_box.html:53
-msgid "Save"
-msgstr "Zapisz"
-
-#: rhodecode/templates/admin/gists/index.html:5
-#: rhodecode/templates/base/base.html:299
-msgid "Gists"
-msgstr "Git"
-
-#: rhodecode/templates/admin/gists/index.html:10
+#: rhodecode/templates/admin/gists/edit.html:5
+#: rhodecode/templates/admin/gists/edit.html:22
+msgid "Edit Gist"
+msgstr "Edytuj Gist"
+
+#: rhodecode/templates/admin/gists/edit.html:40
+#, python-format
+msgid ""
+"Gist was update since you started editing. Copy your changes and click "
+"%(here)s to reload new version."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:59
+#: rhodecode/templates/admin/gists/new.html:43
+msgid "Gist description ..."
+msgstr "Opis Gist ..."
+
+#: rhodecode/templates/admin/gists/edit.html:61
+#: rhodecode/templates/admin/gists/new.html:45
+msgid "Gist lifetime"
+msgstr "Trwałość Gist"
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/edit.html:67
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/index.html:62
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/gists/show.html:52
+msgid "Expires"
+msgstr "Wygasa"
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+msgid "never"
+msgstr "nigdy"
+
+#: rhodecode/templates/admin/gists/edit.html:80
+#: rhodecode/templates/admin/gists/new.html:52
+#: rhodecode/templates/files/files_add.html:59
+#: rhodecode/templates/files/files_edit.html:64
+msgid "plain"
+msgstr "zwykły"
+
+#: rhodecode/templates/admin/gists/edit.html:147
+msgid "Update Gist"
+msgstr "Zaktualizuj Gist"
+
+#: rhodecode/templates/admin/gists/edit.html:148
+#: rhodecode/templates/changeset/changeset_file_comment.html:89
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: rhodecode/templates/admin/gists/index.html:6
+#: rhodecode/templates/admin/gists/index.html:19
 #, python-format
 msgid "Private Gists for user %s"
-msgstr "Prywatne git użytkownika %s"
-
-#: rhodecode/templates/admin/gists/index.html:12
+msgstr "Prywatne Gists użytkownika %s"
+
+#: rhodecode/templates/admin/gists/index.html:8
+#: rhodecode/templates/admin/gists/index.html:21
 #, python-format
 msgid "Public Gists for user %s"
-msgstr "Publiczne git użytkownika %s"
-
-#: rhodecode/templates/admin/gists/index.html:14
+msgstr "Publiczne Gists użytkownika %s"
+
+#: rhodecode/templates/admin/gists/index.html:10
+#: rhodecode/templates/admin/gists/index.html:23
 msgid "Public Gists"
-msgstr "Publiczne git"
-
-#: rhodecode/templates/admin/gists/index.html:31
-#: rhodecode/templates/admin/gists/show.html:24
-#: rhodecode/templates/base/base.html:302
-msgid "Create new gist"
-msgstr "Utwórz nowe git"
-
-#: rhodecode/templates/admin/gists/index.html:48
+msgstr "Publiczne Gists"
+
+#: rhodecode/templates/admin/gists/index.html:40
+#: rhodecode/templates/admin/gists/show.html:28
+msgid "Create New Gist"
+msgstr "Utwórz Nowy Gist"
+
+#: rhodecode/templates/admin/gists/index.html:57
+#: rhodecode/templates/data_table/_dt_elements.html:143
 msgid "Created"
 msgstr "Utworzono"
 
-#: rhodecode/templates/admin/gists/index.html:51
-#: rhodecode/templates/admin/gists/index.html:53
-#: rhodecode/templates/admin/gists/show.html:43
-#: rhodecode/templates/admin/gists/show.html:45
-msgid "Expires"
-msgstr "Wygasa"
-
-#: rhodecode/templates/admin/gists/index.html:51
-#: rhodecode/templates/admin/gists/show.html:43
-msgid "never"
-msgstr "nigdy"
-
-#: rhodecode/templates/admin/gists/index.html:68
+#: rhodecode/templates/admin/gists/index.html:77
 msgid "There are no gists yet"
-msgstr "Nie ma jeszcze repozytorium git"
+msgstr "Nie ma jeszcze żadnych gists"
 
 #: rhodecode/templates/admin/gists/new.html:5
-#: rhodecode/templates/admin/gists/new.html:16
-msgid "New gist"
-msgstr "Nowe git"
-
-#: rhodecode/templates/admin/gists/new.html:37
-msgid "Gist description ..."
-msgstr "Opis git ..."
-
-#: rhodecode/templates/admin/gists/new.html:52
-msgid "Create private gist"
-msgstr "Utwórz prywatne git"
-
-#: rhodecode/templates/admin/gists/new.html:53
-msgid "Create public gist"
-msgstr "Utwórz publiczne git"
-
-#: rhodecode/templates/admin/gists/new.html:54
-#: rhodecode/templates/admin/permissions/permissions.html:123
-#: rhodecode/templates/admin/permissions/permissions.html:185
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos/repo_edit.html:167
-#: rhodecode/templates/admin/repos/repo_edit.html:381
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97
-#: rhodecode/templates/admin/settings/settings.html:115
-#: rhodecode/templates/admin/settings/settings.html:196
-#: rhodecode/templates/admin/settings/settings.html:288
-#: rhodecode/templates/admin/users/user_edit.html:141
-#: rhodecode/templates/admin/users/user_edit.html:198
-#: rhodecode/templates/admin/users/user_edit.html:246
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:144
-#: rhodecode/templates/base/default_perms_box.html:54
-#: rhodecode/templates/files/files_add.html:80
-#: rhodecode/templates/files/files_edit.html:66
-#: rhodecode/templates/pullrequests/pullrequest.html:86
+#: rhodecode/templates/admin/gists/new.html:22
+msgid "New Gist"
+msgstr "Nowy Gist"
+
+#: rhodecode/templates/admin/gists/new.html:51
+msgid "name this file..."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:60
+msgid "Create Private Gist"
+msgstr "Utwórz Prywatny Gist"
+
+#: rhodecode/templates/admin/gists/new.html:61
+msgid "Create Public Gist"
+msgstr "Utwórz Publiczny Gist"
+
+#: rhodecode/templates/admin/gists/new.html:62
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:70
+#: rhodecode/templates/admin/my_account/my_account_emails.html:46
+#: rhodecode/templates/admin/my_account/my_account_password.html:34
+#: rhodecode/templates/admin/my_account/my_account_profile.html:69
+#: rhodecode/templates/admin/permissions/permissions_globals.html:109
+#: rhodecode/templates/admin/permissions/permissions_ips.html:41
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:115
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:43
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:59
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:102
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:135
+#: rhodecode/templates/admin/settings/settings_global.html:56
+#: rhodecode/templates/admin/settings/settings_license.html:43
+#: rhodecode/templates/admin/settings/settings_vcs.html:81
+#: rhodecode/templates/admin/settings/settings_visual.html:116
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:105
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:70
+#: rhodecode/templates/admin/users/user_edit_emails.html:46
+#: rhodecode/templates/admin/users/user_edit_ips.html:50
+#: rhodecode/templates/admin/users/user_edit_profile.html:123
+#: rhodecode/templates/base/default_perms_box.html:65
+#: rhodecode/templates/files/files_add.html:70
+#: rhodecode/templates/files/files_delete.html:58
+#: rhodecode/templates/files/files_edit.html:73
+#: rhodecode/templates/pullrequests/pullrequest.html:83
 msgid "Reset"
 msgstr "Zresetuj"
 
 #: rhodecode/templates/admin/gists/show.html:5
-msgid "gist"
-msgstr "git"
-
-#: rhodecode/templates/admin/gists/show.html:9
+#: rhodecode/templates/admin/gists/show.html:12
 msgid "Gist"
-msgstr "Git"
-
-#: rhodecode/templates/admin/gists/show.html:36
-msgid "Public gist"
-msgstr "Publiczne git"
-
-#: rhodecode/templates/admin/gists/show.html:38
-msgid "Private gist"
-msgstr "Prywatne git"
-
-#: rhodecode/templates/admin/gists/show.html:54
-#: rhodecode/templates/admin/repos/repo_edit.html:299
-#: rhodecode/templates/changeset/changeset_file_comment.html:40
+msgstr "Gist"
+
+#: rhodecode/templates/admin/gists/show.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:4
+#: rhodecode/templates/email_templates/pull_request.html:4
+#: rhodecode/templates/email_templates/pull_request_comment.html:4
+msgid "URL"
+msgstr "Adres URL"
+
+#: rhodecode/templates/admin/gists/show.html:40
+msgid "Public Gist"
+msgstr "Publiczny Gist"
+
+#: rhodecode/templates/admin/gists/show.html:42
+msgid "Private Gist"
+msgstr "Prywatny Gist"
+
+#: rhodecode/templates/admin/gists/show.html:59
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:80
+#: rhodecode/templates/changeset/changeset_file_comment.html:48
+#: rhodecode/templates/files/files_source.html:39
+#: rhodecode/templates/files/files_source.html:42
+#: rhodecode/templates/files/files_source.html:45
 msgid "Delete"
 msgstr "Usuń"
 
-#: rhodecode/templates/admin/gists/show.html:54
-msgid "Confirm to delete this gist"
-msgstr "Potwierdź usunięcie git"
-
-#: rhodecode/templates/admin/gists/show.html:63
-#: rhodecode/templates/admin/gists/show.html:84
-#: rhodecode/templates/files/files_edit.html:48
-#: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:55
-msgid "Show as raw"
-msgstr "wyświetl jako raw"
-
-#: rhodecode/templates/admin/gists/show.html:71
+#: rhodecode/templates/admin/gists/show.html:59
+msgid "Confirm to delete this Gist"
+msgstr "Potwierdź aby usunąć ten Gist"
+
+#: rhodecode/templates/admin/gists/show.html:66
+#: rhodecode/templates/changeset/changeset_file_comment.html:81
+#: rhodecode/templates/changeset/changeset_file_comment.html:190
+#: rhodecode/templates/data_table/_dt_elements.html:167
+#: rhodecode/templates/data_table/_dt_elements.html:183
+#: rhodecode/templates/files/files_source.html:41
+#: rhodecode/templates/files/files_source.html:44
+msgid "Edit"
+msgstr "Edycja"
+
+#: rhodecode/templates/admin/gists/show.html:68
+#: rhodecode/templates/files/files_edit.html:54
+#: rhodecode/templates/files/files_source.html:34
+msgid "Show as Raw"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:76
 msgid "created"
 msgstr "utworzono"
 
-#: rhodecode/templates/admin/ldap/ldap.html:5
-msgid "LDAP administration"
-msgstr "Administracja LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:11
-#: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:79
-msgid "LDAP"
-msgstr "LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:28
-msgid "Connection settings"
-msgstr "Ustawienia połączeń"
-
-#: rhodecode/templates/admin/ldap/ldap.html:30
-msgid "Enable LDAP"
-msgstr "Włącz LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:34
-msgid "Host"
-msgstr "Host"
-
-#: rhodecode/templates/admin/ldap/ldap.html:38
-msgid "Port"
-msgstr "Port"
-
-#: rhodecode/templates/admin/ldap/ldap.html:42
-msgid "Account"
-msgstr "Konto"
-
-#: rhodecode/templates/admin/ldap/ldap.html:50
-msgid "Connection security"
-msgstr "Zabezpieczenie połączenia"
-
-#: rhodecode/templates/admin/ldap/ldap.html:54
-msgid "Certificate Checks"
-msgstr "Kontrola certyfikatów"
-
-#: rhodecode/templates/admin/ldap/ldap.html:57
-msgid "Search settings"
-msgstr "Ustawienia wyszukiwania"
-
-#: rhodecode/templates/admin/ldap/ldap.html:59
-msgid "Base DN"
-msgstr "Bazowy DN"
-
-#: rhodecode/templates/admin/ldap/ldap.html:63
-msgid "LDAP Filter"
-msgstr "Filtr LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:67
-msgid "LDAP Search Scope"
-msgstr "Zakres wyszukiwania LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:70
-msgid "Attribute mappings"
-msgstr "Mapowanie atrybutów"
-
-#: rhodecode/templates/admin/ldap/ldap.html:72
-msgid "Login Attribute"
-msgstr "Atrybuty logowania"
-
-#: rhodecode/templates/admin/ldap/ldap.html:76
-msgid "First Name Attribute"
-msgstr "Atrybut Nazwiska"
-
-#: rhodecode/templates/admin/ldap/ldap.html:80
-msgid "Last Name Attribute"
-msgstr "Atrybut Imienia"
-
-#: rhodecode/templates/admin/ldap/ldap.html:84
-msgid "E-mail Attribute"
-msgstr "Atrybut E-maila"
+#: rhodecode/templates/admin/gists/show.html:89
+#: rhodecode/templates/files/files_source.html:71
+msgid "Show as raw"
+msgstr "wyświetl jako raw"
+
+#: rhodecode/templates/admin/my_account/my_account.html:5
+#: rhodecode/templates/base/base.html:282
+msgid "My account"
+msgstr "Moje konto"
+
+#: rhodecode/templates/admin/my_account/my_account.html:12
+msgid "My Account"
+msgstr "Moje konto"
+
+#: rhodecode/templates/admin/my_account/my_account.html:38
+#: rhodecode/templates/admin/users/user_edit.html:42
+msgid "Profile"
+msgstr "Profil"
+
+#: rhodecode/templates/admin/my_account/my_account.html:40
+#: rhodecode/templates/admin/users/user_edit.html:43
+msgid "API keys"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:41
+msgid "My Emails"
+msgstr "Moje Emaile"
+
+#: rhodecode/templates/admin/my_account/my_account.html:42
+msgid "My Repositories"
+msgstr "Moje Repozytoria"
+
+#: rhodecode/templates/admin/my_account/my_account.html:43
+#: rhodecode/templates/journal/journal.html:54
+msgid "Watched"
+msgstr "Obserwowane"
+
+#: rhodecode/templates/admin/my_account/my_account.html:44
+msgid "Pull requests"
+msgstr "Połączone gałęzie"
+
+#: rhodecode/templates/admin/my_account/my_account.html:45
+msgid "My permissions"
+msgstr "Moje uprawnienia"
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:6
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:6
+msgid "Built-in"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:32
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:32
+msgid "expires"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:14
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:14
+#, python-format
+msgid "Confirm to reset this api key: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:15
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:15
+msgid "reset"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:30
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:30
+msgid "expired"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:40
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:40
+#, python-format
+msgid "Confirm to remove this api key: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:42
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:42
+msgid "remove"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:49
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:49
+msgid "No additional api keys specified"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:61
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:61
+msgid "New api key"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:69
+#: rhodecode/templates/admin/my_account/my_account_emails.html:45
+#: rhodecode/templates/admin/permissions/permissions_ips.html:40
+#: rhodecode/templates/admin/repos/repo_add_base.html:85
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:58
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:69
+#: rhodecode/templates/admin/users/user_edit_emails.html:45
+#: rhodecode/templates/admin/users/user_edit_ips.html:49
+msgid "Add"
+msgstr "Dodaj"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:7
+#: rhodecode/templates/admin/users/user_edit_emails.html:7
+msgid "Primary"
+msgstr "Główny"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:19
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:24
+#: rhodecode/templates/admin/permissions/permissions_ips.html:14
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:18
+#: rhodecode/templates/admin/settings/settings_hooks.html:36
+#: rhodecode/templates/admin/users/user_edit_emails.html:19
+#: rhodecode/templates/admin/users/user_edit_ips.html:22
+#: rhodecode/templates/data_table/_dt_elements.html:131
+#: rhodecode/templates/data_table/_dt_elements.html:159
+#: rhodecode/templates/data_table/_dt_elements.html:175
+#: rhodecode/templates/data_table/_dt_elements.html:191
+msgid "delete"
+msgstr "usuń"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:20
+#: rhodecode/templates/admin/users/user_edit_emails.html:20
+#, python-format
+msgid "Confirm to delete this email: %s"
+msgstr "Potwierdź, aby usunąć ten e-mail: %s"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:26
+#: rhodecode/templates/admin/users/user_edit_emails.html:26
+msgid "No additional emails specified"
+msgstr "Brak dodatkowych emaili"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:38
+#: rhodecode/templates/admin/users/user_edit_emails.html:38
+msgid "New email address"
+msgstr "Nowy adres e-mail"
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:1
+msgid "Change your account password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:7
+msgid "Current password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:16
+#: rhodecode/templates/admin/users/user_edit_profile.html:69
+msgid "New password"
+msgstr "Nowe hasło"
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:25
+msgid "Confirm new password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:9
+msgid "Change your avatar at"
+msgstr "Zmiana awataru na"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:10
+#: rhodecode/templates/admin/users/user_edit_profile.html:9
+msgid "Using"
+msgstr "Używa:"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:11
+msgid "Avatars are disabled"
+msgstr "Avatary są wyłączone"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:13
+msgid "Missing email, please update your user email address."
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:14
+#: rhodecode/templates/admin/users/user_edit_profile.html:15
+msgid "current IP"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:26
+msgid ""
+"Your user is in an external Source of Record; some details cannot be managed"
+" here"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:2
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:4
+msgid "Show closed pull requests"
+msgstr "[zamknięty] wniosek o połączenie gałęzi"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:6
+msgid "Opened by me"
+msgstr "Otwarty przez mnie"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:15
+#, python-format
+msgid "Pull request #%s opened on %s"
+msgstr "Wniosek połączenia gałęzi #%s otwarty %s"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:17
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:47
+#: rhodecode/templates/pullrequests/pullrequest_data.html:11
+#: rhodecode/templates/pullrequests/pullrequest_show.html:30
+#: rhodecode/templates/pullrequests/pullrequest_show.html:45
+msgid "Closed"
+msgstr "Zamknięte"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:25
+msgid "Confirm to delete this pull request"
+msgstr "Potwierdź usunięcie połączenia gałęzi"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:32
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:53
+msgid "Nothing here yet"
+msgstr "Nic tu nie ma jeszcze"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:36
+msgid "I participate in"
+msgstr "Biorę udział w"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:44
+#: rhodecode/templates/pullrequests/pullrequest_data.html:8
+#, python-format
+msgid "Pull request #%s opened by %s on %s"
+msgstr "Wniosek połączenia gałęzi #%s otwarty %s dnia %s"
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:1
+msgid "Repositories you are owner of"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:59
+#: rhodecode/templates/admin/my_account/my_account_watched.html:59
+#: rhodecode/templates/base/root.html:71
+#: rhodecode/templates/bookmarks/bookmarks.html:83
+#: rhodecode/templates/branches/branches.html:82
+#: rhodecode/templates/journal/journal.html:210
+#: rhodecode/templates/journal/journal.html:301
+#: rhodecode/templates/tags/tags.html:83
+msgid "No records found."
+msgstr "Nie znaleziono rekordów."
+
+#: rhodecode/templates/admin/my_account/my_account_watched.html:1
+msgid "Repositories you are watching"
+msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:5
-#: rhodecode/templates/admin/notifications/notifications.html:9
+#: rhodecode/templates/admin/notifications/notifications.html:12
 msgid "My Notifications"
 msgstr "Opcje powiadomień"
 
-#: rhodecode/templates/admin/notifications/notifications.html:29
+#: rhodecode/templates/admin/notifications/notifications.html:32
 msgid "All"
 msgstr "Wszystkie"
 
-#: rhodecode/templates/admin/notifications/notifications.html:30
+#: rhodecode/templates/admin/notifications/notifications.html:33
 msgid "Comments"
 msgstr "Komentarze"
 
-#: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
-msgid "Pull requests"
+#: rhodecode/templates/admin/notifications/notifications.html:34
+#: rhodecode/templates/base/base.html:193
+msgid "Pull Requests"
 msgstr "Połączone gałęzie"
 
-#: rhodecode/templates/admin/notifications/notifications.html:35
+#: rhodecode/templates/admin/notifications/notifications.html:38
 msgid "Mark all read"
 msgstr "Oznacz wszystko jako przeczytane"
 
-#: rhodecode/templates/admin/notifications/notifications_data.html:39
+#: rhodecode/templates/admin/notifications/notifications_data.html:40
 msgid "No notifications here yet"
 msgstr "Brak powiadomień"
 
 #: rhodecode/templates/admin/notifications/show_notification.html:5
-#: rhodecode/templates/admin/notifications/show_notification.html:11
+#: rhodecode/templates/admin/notifications/show_notification.html:14
 msgid "Show notification"
 msgstr "Pokaż powiadomienia"
 
-#: rhodecode/templates/admin/notifications/show_notification.html:9
-#: rhodecode/templates/base/base.html:253
+#: rhodecode/templates/admin/notifications/show_notification.html:12
+#: rhodecode/templates/base/base.html:281
 msgid "Notifications"
 msgstr "Powiadomienia"
 
@@ -2255,565 +2911,222 @@
 msgid "Permissions administration"
 msgstr "Uprawnienia administracji"
 
-#: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:151
-#: rhodecode/templates/admin/repos/repo_edit.html:158
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88
-#: rhodecode/templates/admin/users/user_edit.html:150
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:129
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/base/base.html:78
+#: rhodecode/templates/admin/permissions/permissions.html:14
+#: rhodecode/templates/admin/permissions/permissions.html:37
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:55
+#: rhodecode/templates/admin/repos/repo_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:45
+#: rhodecode/templates/base/base.html:74
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: rhodecode/templates/admin/permissions/permissions.html:24
-msgid "Default permissions"
-msgstr "Domyślne uprawnienia"
-
-#: rhodecode/templates/admin/permissions/permissions.html:31
+#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/settings/settings.html:42
+msgid "Global"
+msgstr "Globalne"
+
+#: rhodecode/templates/admin/permissions/permissions.html:42
+msgid "IP whitelist"
+msgstr "Lista dozwolonych adresów IP"
+
+#: rhodecode/templates/admin/permissions/permissions.html:43
+msgid "Overview"
+msgstr "Podgląd"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:7
 msgid "Anonymous access"
 msgstr "Dostęp anonimowy"
 
-#: rhodecode/templates/admin/permissions/permissions.html:49
+#: rhodecode/templates/admin/permissions/permissions_globals.html:13
+#, python-format
+msgid ""
+"Allow access to RhodeCode without need to log in. Anonymous users use %s "
+"user permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:26
 msgid ""
 "All default permissions on each repository will be reset to chosen "
 "permission, note that all custom default permission on repositories will be "
 "lost"
 msgstr "Wszystkie uprawnienia domyślne każdego repozytorium zostaną przywrócone. Wybrane uprawnienie zostaną skasowane. Pamiętaj, że wszystkie niestandardowe uprawnienia w repozytoriach zostaną utracone."
 
-#: rhodecode/templates/admin/permissions/permissions.html:50
-#: rhodecode/templates/admin/permissions/permissions.html:63
-#: rhodecode/templates/admin/permissions/permissions.html:77
+#: rhodecode/templates/admin/permissions/permissions_globals.html:27
+#: rhodecode/templates/admin/permissions/permissions_globals.html:40
+#: rhodecode/templates/admin/permissions/permissions_globals.html:54
 msgid "Overwrite existing settings"
 msgstr "Nadpisz ustawienia"
 
-#: rhodecode/templates/admin/permissions/permissions.html:62
+#: rhodecode/templates/admin/permissions/permissions_globals.html:32
+#: rhodecode/templates/admin/repos/repo_add_base.html:41
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:42
+#: rhodecode/templates/data_table/_dt_elements.html:204
+#: rhodecode/templates/forks/fork.html:51
+msgid "Repository group"
+msgstr "Repozytorium grupy"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:39
 msgid ""
 "All default permissions on each repository group will be reset to chosen "
 "permission, note that all custom default permission on repository groups "
 "will be lost"
 msgstr "Wszystkie uprawnienia domyślne każdego repozytorium zostaną przywrócone. Wybrane uprawnienie zostaną skasowane. Pamiętaj, że wszystkie niestandardowe uprawnienia w repozytoriach zostaną utracone."
 
-#: rhodecode/templates/admin/permissions/permissions.html:69
+#: rhodecode/templates/admin/permissions/permissions_globals.html:46
+#: rhodecode/templates/data_table/_dt_elements.html:211
 msgid "User group"
 msgstr "Grupa użytkownika"
 
-#: rhodecode/templates/admin/permissions/permissions.html:76
+#: rhodecode/templates/admin/permissions/permissions_globals.html:53
 msgid ""
 "All default permissions on each user group will be reset to chosen "
 "permission, note that all custom default permission on repository groups "
 "will be lost"
 msgstr "Wszystkie Uprawnienia domyślne każdej grupy użytkowników zostaną przywrócone do wybranego zezwolenia, trzeba pamiętać, że wszystkie niestandardowe uprawnienia domyślne dla grup repozytorium zostaną utracone"
 
-#: rhodecode/templates/admin/permissions/permissions.html:83
+#: rhodecode/templates/admin/permissions/permissions_globals.html:60
 msgid "Repository creation"
 msgstr "Tworzenie repozytorium"
 
-#: rhodecode/templates/admin/permissions/permissions.html:91
+#: rhodecode/templates/admin/permissions/permissions_globals.html:68
+msgid "Repository creation with group write access"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:72
+msgid ""
+"Write permission to repository groups allows creating repositories inside "
+"that group"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:77
 msgid "User group creation"
 msgstr "Tworzenie grupy użytkowników"
 
-#: rhodecode/templates/admin/permissions/permissions.html:99
+#: rhodecode/templates/admin/permissions/permissions_globals.html:85
 msgid "Repository forking"
 msgstr "Rozwidlanie repozytorium"
 
-#: rhodecode/templates/admin/permissions/permissions.html:107
+#: rhodecode/templates/admin/permissions/permissions_globals.html:93
 msgid "Registration"
 msgstr "Rejestracja"
 
-#: rhodecode/templates/admin/permissions/permissions.html:115
+#: rhodecode/templates/admin/permissions/permissions_globals.html:101
 msgid "External auth account activation"
 msgstr "Autoryzacja aktywacji zewnętrznego konta"
 
-#: rhodecode/templates/admin/permissions/permissions.html:133
-msgid "Default User Permissions"
-msgstr "Domyślne uprawnienia"
-
-#: rhodecode/templates/admin/permissions/permissions.html:144
-#: rhodecode/templates/admin/users/user_edit.html:207
-msgid "Allowed IP addresses"
-msgstr "Adresy e-mail"
-
-#: rhodecode/templates/admin/permissions/permissions.html:158
-#: rhodecode/templates/admin/repos/repo_edit.html:340
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
-#: rhodecode/templates/admin/users/user_edit.html:175
-#: rhodecode/templates/admin/users/user_edit.html:220
-#: rhodecode/templates/admin/users_groups/users_groups.html:54
-#: rhodecode/templates/data_table/_dt_elements.html:122
-#: rhodecode/templates/data_table/_dt_elements.html:136
-msgid "delete"
-msgstr "usuń"
-
-#: rhodecode/templates/admin/permissions/permissions.html:159
-#: rhodecode/templates/admin/users/user_edit.html:221
+#: rhodecode/templates/admin/permissions/permissions_ips.html:1
+msgid "Default ip whitelist for all users"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_ips.html:15
+#: rhodecode/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
-msgstr "Potwierdź, aby usunąć ten e-mail: %s"
-
-#: rhodecode/templates/admin/permissions/permissions.html:165
-#: rhodecode/templates/admin/users/user_edit.html:227
+msgstr "Potwierdź, aby usunąć to ip: %s"
+
+#: rhodecode/templates/admin/permissions/permissions_ips.html:21
+#: rhodecode/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed"
 msgstr "Wszystkie adresy IP są dozwolone"
 
-#: rhodecode/templates/admin/permissions/permissions.html:176
-#: rhodecode/templates/admin/users/user_edit.html:238
+#: rhodecode/templates/admin/permissions/permissions_ips.html:32
+#: rhodecode/templates/admin/users/user_edit_ips.html:42
 msgid "New ip address"
 msgstr "Nowy adres ip"
 
-#: rhodecode/templates/admin/permissions/permissions.html:184
-#: rhodecode/templates/admin/repos/repo_add_base.html:73
-#: rhodecode/templates/admin/repos/repo_edit.html:380
-#: rhodecode/templates/admin/users/user_edit.html:197
-#: rhodecode/templates/admin/users/user_edit.html:245
-msgid "Add"
-msgstr "Dodaj"
-
-#: rhodecode/templates/admin/repos/repo_add.html:12
-#: rhodecode/templates/admin/repos/repo_add.html:16
-#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88
-#: rhodecode/templates/base/base.html:116
-#: rhodecode/templates/base/base.html:275
-msgid "Repositories"
-msgstr "Repozytoria"
-
-#: rhodecode/templates/admin/repos/repo_add.html:19
-msgid "Add new"
-msgstr "Dodaj nowe"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:96
-#: rhodecode/templates/summary/summary.html:97
-msgid "Clone from"
-msgstr "Klonuj z"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:24
-#: rhodecode/templates/admin/repos/repo_edit.html:45
-msgid "Optional http[s] url from which repository should be cloned."
-msgstr "Opcjonalnie http[s] url z którego repozytorium powinno być klonowane."
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:33
-#: rhodecode/templates/forks/fork.html:51
-msgid "Optionaly select a group to put this repository into."
-msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium."
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:42
-msgid "Type of repository to create."
-msgstr "Rodzaj repozytorium do stworzenia."
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:47
-#: rhodecode/templates/admin/repos/repo_edit.html:59
-#: rhodecode/templates/forks/fork.html:38
-msgid "Landing revision"
-msgstr "Docelowa rewizja"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:51
-#: rhodecode/templates/admin/repos/repo_edit.html:63
-#: rhodecode/templates/forks/fork.html:42
-msgid "Default revision for files page, downloads, whoosh and readme"
-msgstr "Wersja domyślna dla plików stronicowania, pobierania plików, readme"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:60
-#: rhodecode/templates/admin/repos/repo_edit.html:72
-#: rhodecode/templates/forks/fork.html:60
-msgid ""
-"Keep it short and to the point. Use a README file for longer descriptions."
-msgstr "Powinna być krótka i na temat. Użyj pliku README dla dłuższych opisów."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:8
-msgid "Edit repository"
-msgstr "Edytuj repozytorium"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:12
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:11
-#: rhodecode/templates/base/base.html:81
-#: rhodecode/templates/base/base.html:134
-#: rhodecode/templates/summary/summary.html:212
+#: rhodecode/templates/admin/permissions/permissions_perms.html:1
+msgid "Default user permissions overview"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:5
+msgid "Add repository group"
+msgstr "Repozytorium grupy"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:14
+#: rhodecode/templates/base/base.html:71 rhodecode/templates/base/base.html:90
+msgid "Repository groups"
+msgstr "Repozytorium grupy"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:36
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:8
+#: rhodecode/templates/admin/user_groups/user_group_add.html:35
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:7
+msgid "Group name"
+msgstr "Nazwa grupy"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:54
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:26
+msgid "Group parent"
+msgstr "Rodzic gropy"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:63
+#: rhodecode/templates/admin/repos/repo_add_base.html:50
+msgid "Copy parent group permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:67
+#: rhodecode/templates/admin/repos/repo_add_base.html:54
+msgid "Copy permission set from parent repository group."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:5
+#, python-format
+msgid "%s Repository group settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:105
+msgid "Repository Groups"
+msgstr "Grupy Repozytoriów"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:24
+msgid "Add Child Group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:53
+#: rhodecode/templates/admin/repos/repo_edit.html:15
+#: rhodecode/templates/admin/repos/repo_edit.html:43
+#: rhodecode/templates/admin/settings/settings.html:14
+#: rhodecode/templates/admin/settings/settings.html:36
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:42
+#: rhodecode/templates/base/base.html:77
+#: rhodecode/templates/base/base.html:159
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:36
-msgid "Non-changeable id"
-msgstr "Brak zmiennej id"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:41
-msgid "Clone uri"
-msgstr "Klonowane uri"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:54
-msgid "Optional select a group to put this repository into."
-msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:119
-msgid "Change owner of this repository."
-msgstr "Zmiana właściciela tego repozytorium."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:177
-msgid "Advanced settings"
-msgstr "Zapisz ustawienia"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:180
-msgid "Statistics"
-msgstr "Statystyki"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Reset current statistics"
-msgstr "Zresetuj bieżące statystyki"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Confirm to remove current statistics"
-msgstr "Potwierdź usunięcie aktualnych statystyk"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:187
-msgid "Fetched to rev"
-msgstr "Ściągnięte do rev"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:188
-msgid "Stats gathered"
-msgstr "statystyki zgromadzone"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:196
-msgid "Remote"
-msgstr "Zdalnie"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:200
-msgid "Pull changes from remote location"
-msgstr "Pobierz z zdalnej lokalizacji"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:200
-msgid "Confirm to pull changes from remote side"
-msgstr "Potwierdź pull z zdalnej strony"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:211
-msgid "Cache"
-msgstr "Pamięć podręczna"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:215
-msgid "Invalidate repository cache"
-msgstr "Unieważnij pamięć podręczną repozytorium"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:215
-msgid "Confirm to invalidate repository cache"
-msgstr "Potwierdź unieważnienie pamięci podręcznej repozytorium"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:218
-msgid ""
-"Manually invalidate cache for this repository. On first access repository "
-"will be cached again"
-msgstr "Ręcznie unieważnienie cache dla tego repozytorium. Przy pierwszym dostępie do repozytorium zostanie dodany do bufora ponownie"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:223
-msgid "List of cached values"
-msgstr "Lista buforowanych wartości"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:226
-msgid "Prefix"
-msgstr "Prefiks"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:227
-msgid "Key"
-msgstr "Klucz"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:228
-#: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:124
-#: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/admin/users_groups/users_group_add.html:41
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-#: rhodecode/templates/admin/users_groups/users_groups.html:39
-msgid "Active"
-msgstr "Aktywny"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:243
-#: rhodecode/templates/base/base.html:292
-#: rhodecode/templates/base/base.html:293
-msgid "Public journal"
-msgstr "Dziennik publiczny"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:249
-msgid "Remove from public journal"
-msgstr "Usuń z dziennika publicznego"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:251
-msgid "Add to public journal"
-msgstr "Dodaj do dziennika publicznego"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:256
-msgid ""
-"All actions made on this repository will be accessible to everyone in public"
-" journal"
-msgstr "Wszystkie działania wykonywane na tym repozytorium będą dostępne dla wszystkich w dzienniku publicznym"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:263
-msgid "Locking"
-msgstr "Blokuj"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
-msgid "Unlock locked repo"
-msgstr "Odblokuj zablokowane repo"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
-msgid "Confirm to unlock repository"
-msgstr "Potwierdź odblokowanie repozytorium"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:271
-msgid "Lock repo"
-msgstr "Blokada repo"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:271
-msgid "Confirm to lock repository"
-msgstr "Potwierdź blokowanie repozytorium"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:272
-msgid "Repository is not locked"
-msgstr "Repozytorium nie jest zablokowane"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:277
-msgid ""
-"Force locking on repository. Works only when anonymous access is disabled"
-msgstr "Wymuś blokowanie na repozytorium. Działa tylko wtedy, gdy dostęp anonimowy jest wyłączony"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:284
-msgid "Set as fork of"
-msgstr "Ustaw jako rozwidlenie"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:289
-msgid "Set"
-msgstr "Ustaw"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:293
-msgid "Manually set this repository as a fork of another from the list"
-msgstr "Ręczne ustawienie rozwidlenia z listy"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:308
-msgid "Remove this repository"
-msgstr "Usuń to repozytorium"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:308
-msgid "Confirm to delete this repository"
-msgstr "Potwierdź, aby usunąć repozytorium"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:310
-#, python-format
-msgid "this repository has %s fork"
-msgid_plural "this repository has %s forks"
-msgstr[0] "to repozytorium ma %s fork"
-msgstr[1] "to repozytorium ma %s forki"
-msgstr[2] "to repozytorium ma %s forków"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:311
-msgid "Detach forks"
-msgstr "Ustaw jako rozwidlenie"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:312
-msgid "Delete forks"
-msgstr "Usuń rozwidlenie"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:315
-msgid ""
-"This repository will be renamed in a special way in order to be unaccesible "
-"for RhodeCode and VCS systems. If you need to fully delete it from file "
-"system please do it manually"
-msgstr "To repozytorium zostanie zmienione w sposób szczególny, żeby było niedostępne dla strony i systemów VCS. Jeśli chcesz całkowicie usunąć go z systemu plików prosimy zrobić to ręcznie"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:329
-msgid "Extra fields"
-msgstr "Dodatkowe pola"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:341
-#, python-format
-msgid "Confirm to delete this field: %s"
-msgstr "Potwierdź, aby usunąć ten e-mail: %s"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:355
-msgid "New field key"
-msgstr "Nowe pole klucza"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:363
-msgid "New field label"
-msgstr "Nowa etykieta pola"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:366
-msgid "Enter short label"
-msgstr "Wpisz krótką etykietę"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:372
-msgid "New field description"
-msgstr "Nowy opis pola"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:375
-msgid "Enter description of a field"
-msgstr "Wprowadź opis pola"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:3
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3
-msgid "none"
-msgstr "brak"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:4
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4
-msgid "read"
-msgstr "odczyt"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:5
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5
-msgid "write"
-msgstr "zapis"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:6
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6
-msgid "admin"
-msgstr "administracja"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:7
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7
-msgid "member"
-msgstr "użytkownik"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-msgid "private repository"
-msgstr "prywatne repozytorium"
-
-#: 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:20
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35
-msgid "default"
-msgstr "domyślne"
-
-#: 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:25
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:55
-msgid "revoke"
-msgstr "odwołane"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:83
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81
-msgid "Add another member"
-msgstr "Dodaj kolejnego użytkownika"
-
-#: rhodecode/templates/admin/repos/repos.html:5
-msgid "Repositories administration"
-msgstr "Administracja repozytoriami"
-
-#: rhodecode/templates/admin/repos/repos.html:88
-#: rhodecode/templates/admin/users/user_edit_my_account.html:185
-#: rhodecode/templates/admin/users/users.html:109
-#: rhodecode/templates/bookmarks/bookmarks.html:76
-#: rhodecode/templates/branches/branches.html:75
-#: rhodecode/templates/journal/journal.html:206
-#: rhodecode/templates/journal/journal.html:296
-#: rhodecode/templates/tags/tags.html:76
-msgid "No records found."
-msgstr "Nie znaleziono rekordów."
-
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
-msgid "apply to children"
-msgstr "dotyczy dzieci"
-
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88
-msgid ""
-"Set or revoke permission to all children of that group, including non-"
-"private repositories and other groups"
-msgstr "Ustawia lub cofa uprawnienia do wszystkich dzieci z tej grupy, w tym repozytoria oraz innych grup"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
-#, python-format
-msgid "%s Group Dashboard"
-msgstr "%s Grupa"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:9
-msgid "Home"
-msgstr "Strona Główna"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:13
-msgid "with"
-msgstr "używając"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
-msgid "Add repository group"
-msgstr "Repozytorium grupy"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16
-#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91
-msgid "Repository groups"
-msgstr "Repozytorium grupy"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13
-msgid "Add new repository group"
-msgstr "Dodaj nową grupę repozytorium"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56
-msgid "Group parent"
-msgstr "Rodzic gropy"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59
-msgid "save"
-msgstr "zapisz"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
-msgid "Edit repository group"
-msgstr "Edytuj grupy repozytorium"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13
-#, python-format
-msgid "Edit repository group %s"
-msgstr "Edytuj grupę repozytorium %s"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27
-msgid "Add child group"
-msgstr "Dodaj dzieci grup"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68
-msgid ""
-"Enable lock-by-pulling on group. This option will be applied to all other "
-"groups and repositories inside"
-msgstr "Włącz blokowanie pobierania przez grupy. Opcja ta będzie stosowana do wszystkich innych grup i repozytoriów wewnątrz"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
-msgid "Repository groups administration"
-msgstr "Repozytoria grup administracyjnych"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45
-msgid "Number of toplevel repositories"
-msgstr "Liczba najwyższego poziomu repozytorium"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64
-#: rhodecode/templates/admin/users_groups/users_groups.html:48
-#: rhodecode/templates/changeset/changeset_file_comment.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:171
-msgid "Edit"
-msgstr "Edycja"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65
-#: rhodecode/templates/admin/users_groups/users_groups.html:49
-#: rhodecode/templates/base/perms_summary.html:29
-#: rhodecode/templates/base/perms_summary.html:60
-#: rhodecode/templates/base/perms_summary.html:62
-#: rhodecode/templates/data_table/_dt_elements.html:116
-#: rhodecode/templates/data_table/_dt_elements.html:117
-#: rhodecode/templates/data_table/_dt_elements.html:130
-#: rhodecode/templates/data_table/_dt_elements.html:131
-msgid "edit"
-msgstr "edycja"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:54
+#: rhodecode/templates/admin/repos/repo_edit.html:49
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:43
+#: rhodecode/templates/admin/users/user_edit.html:44
+msgid "Advanced"
+msgstr "Zaawansowane"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:1
+#, python-format
+msgid "Repository Group: %s"
+msgstr "Grupa Repozytoriów: %s"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:6
+msgid "Top level repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:7
+msgid "Total repositories"
+msgstr "Ogólna liczba repozytoriów"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:8
+msgid "Children groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_advanced.html:8
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+msgid "Created on"
+msgstr "Utworzono"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:192
 #, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
@@ -2821,880 +3134,1572 @@
 msgstr[1] "Potwierdź żeby usunąć grupę %s wraz z %s repozytoriami"
 msgstr[2] "Potwierdź żeby usunąć grupę %s wraz z %s repozytoriami"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78
-msgid "There are no repository groups yet"
-msgstr "Nie ma jeszcze grup repozytoriów"
-
-#: rhodecode/templates/admin/settings/hooks.html:5
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:25
+msgid "Delete this repository group"
+msgstr "Usuń ta grupę repozytoriów"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:7
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:8
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:7
+#: rhodecode/templates/base/perms_summary.html:14
+msgid "none"
+msgstr "brak"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:8
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:8
+#: rhodecode/templates/base/perms_summary.html:15
+msgid "read"
+msgstr "odczyt"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:9
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:10
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:9
+#: rhodecode/templates/base/perms_summary.html:16
+msgid "write"
+msgstr "zapis"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:10
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:10
+#: rhodecode/templates/base/perms_summary.html:17
+msgid "admin"
+msgstr "administracja"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:11
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:12
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:11
+msgid "user/user group"
+msgstr "użytkownik/grupa użytkowników"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:28
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:45
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:24
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:37
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:28
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:45
+msgid "default"
+msgstr "domyślny"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:34
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:71
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:43
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:68
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:34
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:71
+msgid "revoke"
+msgstr "odwołane"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:47
+msgid "delegated admin"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:97
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:94
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:97
+msgid "Add new"
+msgstr "Dodaj nowe"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:103
+msgid "apply to children"
+msgstr "dotyczy dzieci"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:107
+msgid "Both"
+msgstr "Oba"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:108
+msgid ""
+"Set or revoke permission to all children of that group, including non-"
+"private repositories and other groups if selected."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:38
+msgid ""
+"Enable lock-by-pulling on group. This option will be applied to all other "
+"groups and repositories inside"
+msgstr "Włącz blokowanie pobierania przez grupy. Opcja ta będzie stosowana do wszystkich innych grup i repozytoriów wewnątrz"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:4
+#, python-format
+msgid "%s Repository group dashboard"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:12
+msgid "Home"
+msgstr "Strona Główna"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:16
+msgid "with"
+msgstr "używając"
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:5
+msgid "Repository groups administration"
+msgstr "Repozytoria grup administracyjnych"
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+msgid "repository groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:52
+msgid "Number of toplevel repositories"
+msgstr "Liczba najwyższego poziomu repozytorium"
+
+#: rhodecode/templates/admin/repos/repo_add.html:5
+msgid "Add repository"
+msgstr "Dodaj repozytorium"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:14
+msgid "Import existing repository ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:23
+#: rhodecode/templates/summary/summary.html:32
+msgid "Clone from"
+msgstr "Klonuj z"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:27
+msgid "Optional http[s] url from which repository should be cloned."
+msgstr "Opcjonalnie http[s] url z którego repozytorium powinno być klonowane."
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:36
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:76
+#: rhodecode/templates/forks/fork.html:45
+msgid ""
+"Keep it short and to the point. Use a README file for longer descriptions."
+msgstr "Powinna być krótka i na temat. Użyj pliku README dla dłuższych opisów."
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:45
+#: rhodecode/templates/forks/fork.html:55
+msgid "Optionaly select a group to put this repository into."
+msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium."
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:63
+msgid "Type of repository to create."
+msgstr "Rodzaj repozytorium do stworzenia."
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:51
+#: rhodecode/templates/forks/fork.html:61
+msgid "Landing revision"
+msgstr "Docelowa rewizja"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:72
+msgid ""
+"Default revision for files page, downloads, full text search index and "
+"readme generation"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:9
+#, python-format
+msgid "%s Creating repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:16
+msgid "Creating repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:30
+#, python-format
+msgid ""
+"Repository \"%(repo_name)s\" is beeing created, you will be redirected when "
+"this process is finished.repo_name"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:42
+msgid ""
+"We're sorry but error occured during this operation. Please check your "
+"RhodeCode server logs, or contact administrator."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:8
+#, python-format
+msgid "%s repository settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:52
+msgid "Extra fields"
+msgstr "Dodatkowe pola"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:55
+msgid "Caches"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:58
+msgid "Remote"
+msgstr "Zdalnie"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:61
+#: rhodecode/templates/summary/statistics.html:11
+#: rhodecode/templates/summary/summary.html:178
+#: rhodecode/templates/summary/summary.html:179
+msgid "Statistics"
+msgstr "Statystyki"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:1
+#: rhodecode/templates/summary/summary.html:25
+msgid "Fork of"
+msgstr "Gałąź z"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:6
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:5
+msgid "Set"
+msgstr "Ustaw"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:10
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:9
+msgid "Manually set this repository as a fork of another from the list"
+msgstr "Ręczne ustawienie rozwidlenia z listy"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:24
+msgid "Public journal visibility"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:32
+msgid "Remove from public journal"
+msgstr "Usuń z dziennika publicznego"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:37
+msgid "Add to public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:43
+msgid ""
+"All actions made on this repository will be accessible to everyone in public"
+" journal"
+msgstr "Wszystkie działania wykonywane na tym repozytorium będą dostępne dla wszystkich w dzienniku publicznym"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:49
+msgid "Change locking"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:56
+msgid "Confirm to unlock repository"
+msgstr "Potwierdź odblokowanie repozytorium"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:58
+msgid "Unlock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:64
+msgid "Confirm to lock repository"
+msgstr "Potwierdź blokowanie repozytorium"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:66
+msgid "Lock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:68
+msgid "Repository is not locked"
+msgstr "Repozytorium nie jest zablokowane"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:73
+msgid ""
+"Force locking on repository. Works only when anonymous access is disabled. "
+"Trigering a pull locks repository by user who pulled, only the same user can"
+" unlock by doing a push"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:83
+#: rhodecode/templates/data_table/_dt_elements.html:132
+#, python-format
+msgid "Confirm to delete this repository: %s"
+msgstr "Potwierdź usunięcie repozytorium: %s"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:85
+msgid "Delete this repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:88
+#, python-format
+msgid "this repository has %s fork"
+msgid_plural "this repository has %s forks"
+msgstr[0] "to repozytorium ma %s fork"
+msgstr[1] "to repozytorium ma %s forki"
+msgstr[2] "to repozytorium ma %s forków"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:89
+msgid "Detach forks"
+msgstr "Ustaw jako rozwidlenie"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:90
+msgid "Delete forks"
+msgstr "Usuń rozwidlenie"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:94
+msgid ""
+"This repository will be renamed in a special way in order to be unaccesible "
+"for RhodeCode and VCS systems. If you need to fully delete it from file "
+"system please do it manually"
+msgstr "To repozytorium zostanie zmienione w sposób szczególny, żeby było niedostępne dla strony i systemów VCS. Jeśli chcesz całkowicie usunąć go z systemu plików prosimy zrobić to ręcznie"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Invalidate repository cache"
+msgstr "Unieważnij pamięć podręczną repozytorium"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Confirm to invalidate repository cache"
+msgstr "Potwierdź unieważnienie pamięci podręcznej repozytorium"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:7
+msgid ""
+"Manually invalidate cache for this repository. On first access repository "
+"will be cached again"
+msgstr "Ręcznie unieważnienie cache dla tego repozytorium. Przy pierwszym dostępie do repozytorium zostanie dodany do bufora ponownie"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:12
+msgid "List of cached values"
+msgstr "Lista buforowanych wartości"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:15
+msgid "Prefix"
+msgstr "Prefiks"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:16
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:6
+msgid "Key"
+msgstr "Klucz"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:17
+#: rhodecode/templates/admin/user_groups/user_group_add.html:52
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:24
+#: rhodecode/templates/admin/user_groups/user_groups.html:53
+#: rhodecode/templates/admin/users/user_add.html:91
+#: rhodecode/templates/admin/users/user_edit_profile.html:105
+#: rhodecode/templates/admin/users/users.html:57
+msgid "Active"
+msgstr "Aktywny"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:5
+msgid "Label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:19
+#, python-format
+msgid "Confirm to delete this field: %s"
+msgstr "Potwierdź, aby usunąć to pole: %s"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:33
+msgid "New field key"
+msgstr "Nowe pole klucza"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:41
+msgid "New field label"
+msgstr "Nowa etykieta pola"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:44
+msgid "Enter short label"
+msgstr "Wpisz krótką etykietę"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:50
+msgid "New field description"
+msgstr "Nowy opis pola"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:53
+msgid "Enter description of a field"
+msgstr "Wprowadź opis pola"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:66
+msgid "Extra fields are disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:21
+msgid "private repository"
+msgstr "prywatne repozytorium"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:3
+msgid "Remote url"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+msgid "Pull changes from remote location"
+msgstr "Pobierz z zdalnej lokalizacji"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+msgid "Confirm to pull changes from remote side"
+msgstr "Potwierdź pull z zdalnej strony"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:14
+msgid "This repository does not have any remote url set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "Non-changeable id"
+msgstr "Brak zmiennej id"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "what is that ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:13
+msgid "URL by id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:14
+msgid ""
+"In case this repository is renamed or moved into another group the repository url changes.\n"
+"                               Using above url guarantees that this repository will allways be accessible under such url.\n"
+"                               Usefull for CI systems, or any other cases that you need to hardcode the url into 3rd party service."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:21
+msgid "Clone uri"
+msgstr "Klonowane uri"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:27
+#: rhodecode/templates/base/perms_summary.html:43
+#: rhodecode/templates/base/perms_summary.html:79
+#: rhodecode/templates/base/perms_summary.html:81
+#: rhodecode/templates/data_table/_dt_elements.html:124
+#: rhodecode/templates/data_table/_dt_elements.html:125
+#: rhodecode/templates/data_table/_dt_elements.html:152
+#: rhodecode/templates/data_table/_dt_elements.html:153
+#: rhodecode/templates/data_table/_dt_elements.html:169
+#: rhodecode/templates/data_table/_dt_elements.html:185
+msgid "edit"
+msgstr "edycja"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:30
+msgid "new value"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:37
+msgid "http[s] url used for doing remote pulls."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:46
+msgid "Optional select a group to put this repository into."
+msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium."
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:55
+#: rhodecode/templates/forks/fork.html:65
+msgid "Default revision for files page, downloads, whoosh and readme"
+msgstr "Wersja domyślna dla plików stronicowania, pobierania plików, readme"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:65
+msgid "Change owner of this repository."
+msgstr "Zmiana właściciela tego repozytorium."
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:6
+msgid "Processed commits"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:7
+msgid "Processed progress"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Reset statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Confirm to remove current statistics"
+msgstr "Potwierdź usunięcie aktualnych statystyk"
+
+#: rhodecode/templates/admin/repos/repos.html:5
+msgid "Repositories administration"
+msgstr "Administracja repozytoriami"
+
+#: rhodecode/templates/admin/repos/repos.html:54
+msgid "State"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings.html:5
 msgid "Settings administration"
 msgstr "Ustawienia administracji"
 
-#: rhodecode/templates/admin/settings/hooks.html:24
-msgid "Built in hooks - read only"
-msgstr "Wbudowana w aktualizację - tylko do odczytu"
-
-#: rhodecode/templates/admin/settings/hooks.html:40
-msgid "Custom hooks"
-msgstr "Niestandardowa aktualizacja"
-
-#: rhodecode/templates/admin/settings/hooks.html:56
-msgid "remove"
-msgstr "usuń"
-
-#: rhodecode/templates/admin/settings/hooks.html:88
-msgid "Failed to remove hook"
-msgstr "Nie udało się usunąć hooka"
-
-#: rhodecode/templates/admin/settings/settings.html:26
-msgid "Remap and rescan repositories"
-msgstr "Mapowanie i skanowanie repozytorów"
-
-#: rhodecode/templates/admin/settings/settings.html:34
-msgid "Rescan option"
-msgstr "ponowne skanowanie opcji"
-
 #: rhodecode/templates/admin/settings/settings.html:40
-msgid ""
-"In case a repository was deleted from filesystem and there are leftovers in "
-"the database check this option to scan obsolete data in database and remove "
-"it."
-msgstr "W przypadku repozytoriów zostaną usunięte systemy plików i jeśli są pozostałości w bazie danych to ta opcja sprawdzi ją oraz przeskanuje, a następnie usunie je z bazy danych."
+msgid "VCS"
+msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:41
-msgid "Destroy old data"
-msgstr "Zniszcz stare dane"
+msgid "Remap and rescan"
+msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:43
-msgid ""
-"Rescan repositories location for new repositories. Also deletes obsolete if "
-"`destroy` flag is checked "
-msgstr "Skanowanie ponowne lokalizacji dla nowych repozytoriów. Usuwa również nieaktualne jeśli została zaznaczona flaga `zniszcz` do sprawdzana"
+msgid "Visual"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:45
+#: rhodecode/templates/admin/settings/settings_vcs.html:19
+msgid "Hooks"
+msgstr "Aktualizacja"
+
+#: rhodecode/templates/admin/settings/settings.html:46
+msgid "Full text search"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:47
+msgid "System Info"
+msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:48
-msgid "Rescan repositories"
-msgstr "Skanuj ponownie repozytoria"
-
-#: rhodecode/templates/admin/settings/settings.html:54
-msgid "Whoosh indexing"
-msgstr "indeksowanie Whoosh"
-
-#: rhodecode/templates/admin/settings/settings.html:62
-msgid "Index build option"
-msgstr "opcja budowania indeksowania"
-
-#: rhodecode/templates/admin/settings/settings.html:67
-msgid "Build from scratch"
-msgstr "buduj od podstaw"
-
-#: rhodecode/templates/admin/settings/settings.html:73
-msgid "Reindex"
-msgstr "Indeksuj ponownie"
-
-#: rhodecode/templates/admin/settings/settings.html:79
-msgid "Global application settings"
-msgstr "Globalne ustawienia aplikacji"
-
-#: rhodecode/templates/admin/settings/settings.html:88
+msgid "License"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:4
+msgid "Email prefix"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:5
+msgid "RhodeCode email from"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:6
+msgid "Error email from"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:7
+msgid "Error email recipients"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:9
+msgid "SMTP server"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:10
+msgid "SMTP username"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:11
+msgid "SMTP password"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:12
+msgid "SMTP port"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:14
+msgid "SMTP use TLS"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:15
+msgid "SMTP use SSL"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:16
+msgid "SMTP auth"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:31
+msgid "Send test email to"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:39
+msgid "Send"
+msgstr "Wyślij"
+
+#: rhodecode/templates/admin/settings/settings_global.html:8
 msgid "Site branding"
 msgstr "Nazwa strony"
 
-#: rhodecode/templates/admin/settings/settings.html:97
+#: rhodecode/templates/admin/settings/settings_global.html:12
+msgid "Set a custom title for your RhodeCode Service."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:18
 msgid "HTTP authentication realm"
 msgstr "Sfera uwierzytelniania HTTP"
 
-#: rhodecode/templates/admin/settings/settings.html:106
+#: rhodecode/templates/admin/settings/settings_global.html:27
 msgid "Google Analytics code"
 msgstr "Kod Google Analytics"
 
-#: rhodecode/templates/admin/settings/settings.html:114
-#: rhodecode/templates/admin/settings/settings.html:195
-#: rhodecode/templates/admin/settings/settings.html:287
+#: rhodecode/templates/admin/settings/settings_global.html:36
+msgid "ReCaptcha public key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:40
+msgid "Public key for reCaptcha system."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:46
+msgid "ReCaptcha private key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:50
+msgid ""
+"Private key for reCaptcha system. Setting this value will enable captcha on "
+"registration"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:55
+#: rhodecode/templates/admin/settings/settings_license.html:42
+#: rhodecode/templates/admin/settings/settings_vcs.html:80
+#: rhodecode/templates/admin/settings/settings_visual.html:115
 msgid "Save settings"
 msgstr "Zapisz ustawienia"
 
-#: rhodecode/templates/admin/settings/settings.html:121
-msgid "Visualisation settings"
-msgstr "Ustawienia wizualizacji"
-
-#: rhodecode/templates/admin/settings/settings.html:129
-msgid "General"
-msgstr "Główne"
-
-#: rhodecode/templates/admin/settings/settings.html:134
-msgid "Use repository extra fields"
-msgstr "Używaj w repozytorium dodatkowych pól"
-
-#: rhodecode/templates/admin/settings/settings.html:136
-msgid "Allows storing additional customized fields per repository."
-msgstr "Umożliwia przechowywanie dodatkowych niestandardowych pól w repozytorium."
-
-#: rhodecode/templates/admin/settings/settings.html:139
-msgid "Show RhodeCode version"
-msgstr "Pokaż wersję RhodeCode"
-
-#: rhodecode/templates/admin/settings/settings.html:141
-msgid "Shows or hides displayed version of RhodeCode in the footer"
-msgstr "Pokazuje lub ukrywa wyświetlaną wersję RhodeCode w stopce"
-
-#: rhodecode/templates/admin/settings/settings.html:146
-msgid "Dashboard items"
-msgstr "Pozycja panelu"
-
-#: rhodecode/templates/admin/settings/settings.html:150
+#: rhodecode/templates/admin/settings/settings_hooks.html:1
+msgid "Built in Mercurial hooks - read only"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:15
+msgid ""
+"Hooks can be used to trigger actions on certain events such as push / pull. "
+"They can trigger Python functions or external applications."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:19
+msgid "Custom hooks"
+msgstr "Niestandardowa aktualizacja"
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:69
+msgid "Failed to remove hook"
+msgstr "Nie udało się usunąć hooka"
+
+#: rhodecode/templates/admin/settings/settings_license.html:2
+msgid "Currently you're using a free license, which is limited to 20 users."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:9
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "RhodeCode version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "License token"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "No license token"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:13
+msgid "License issued to"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:14
+msgid "License issued on"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "License users limit"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "unlimited"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:16
+msgid "License expires on"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:33
+msgid "License key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:37
+msgid "Paste your RhodeCode license key into that textarea."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:52
+msgid ""
+"Please enter following lines (if yet not present) into [app:main] section of"
+" your .ini file. The token below is autogenerated."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:6
+msgid "Rescan option"
+msgstr "ponowne skanowanie opcji"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:11
+msgid "Destroy old data"
+msgstr "Zniszcz stare dane"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:13
 msgid ""
-"Number of items displayed in lightweight dashboard before pagination is "
-"shown."
-msgstr "Liczba elementów wyświetlanych w lekkim panelu z podziałem na strony."
-
-#: rhodecode/templates/admin/settings/settings.html:155
-msgid "Icons"
-msgstr "Ikony"
-
-#: rhodecode/templates/admin/settings/settings.html:160
-msgid "Show public repo icon on repositories"
-msgstr "Pokazuj w publicznym repo ikonę w repozytoriach"
-
-#: rhodecode/templates/admin/settings/settings.html:164
-msgid "Show private repo icon on repositories"
-msgstr "Pokazuj w prywatnym repo ikonę w repozytoriach"
-
-#: rhodecode/templates/admin/settings/settings.html:166
-msgid "Show public/private icons next to repositories names"
-msgstr "Pokazuj w publicznych/prywatnych repozytoriach ikony obok nazw"
-
-#: rhodecode/templates/admin/settings/settings.html:172
-msgid "Meta-Tagging"
-msgstr "Tagowanie meta"
-
-#: rhodecode/templates/admin/settings/settings.html:177
-msgid "Stylify recognised metatags:"
-msgstr "Stylizacja rozpoznanych meta tagów:"
-
-#: rhodecode/templates/admin/settings/settings.html:204
-msgid "VCS settings"
-msgstr "VCS ustawienia"
-
-#: rhodecode/templates/admin/settings/settings.html:213
+"In case a repository was deleted from filesystem and it still exists in the "
+"database check this option to scan obsolete data in database and remove it."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:17
+msgid "Invalidate cache for all repositories"
+msgstr "Unieważnia cache dla wszystkich repozytoriów"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:19
+msgid ""
+"Each cache data for repositories will be cleaned with this option selected. "
+"Use this to reload data and clear cache keys."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:23
+msgid "Install GIT hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:25
+msgid ""
+"Verify if RhodeCodes GIT hooks are installed for each repository. Current "
+"hooks will be updated to latest version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:32
+msgid "Rescan Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:7
+msgid "Index build option"
+msgstr "Opcja odbudowy indeksowania"
+
+#: rhodecode/templates/admin/settings/settings_search.html:12
+msgid "Build from scratch"
+msgstr "Buduj od podstaw"
+
+#: rhodecode/templates/admin/settings/settings_search.html:15
+msgid ""
+"This option completely reindex all the files within RhodeCode for proper "
+"fulltext search capabilities."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:21
+msgid "Reindex"
+msgstr "Indeksuj ponownie"
+
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "check for updates"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:5
+msgid "Python version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:6
+msgid "Platform"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:7
+msgid "GIT version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:8
+msgid "GIT path"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Upgrade info endpoint"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Note: please make sure this server can access this url"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:14
+msgid "Checking for updates..."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:22
+msgid "Python packages"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr "www"
 
-#: rhodecode/templates/admin/settings/settings.html:218
+#: rhodecode/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr "Wymagaj ssl dla operacji vcs"
 
-#: rhodecode/templates/admin/settings/settings.html:220
+#: rhodecode/templates/admin/settings/settings_vcs.html:13
 msgid ""
-"RhodeCode will require SSL for pushing or pulling. If SSL is missing it will"
-" return HTTP Error 406: Not Acceptable"
-msgstr "RhodeCode wymaga SSL do wysłania zmian lub pobierania. Jeśli brakuje SSL zwróci błąd HTTP 406: Not Acceptable"
-
-#: rhodecode/templates/admin/settings/settings.html:226
-msgid "Hooks"
-msgstr "Aktualizacja"
-
-#: rhodecode/templates/admin/settings/settings.html:231
-msgid "Update repository after push (hg update)"
-msgstr "Aktualizacja repozytorium po wysłaniu zmian (aktualizacja hg)"
-
-#: rhodecode/templates/admin/settings/settings.html:235
+"Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
+"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr "Pokaż rozmiar repozytorium po wysłaniu zmian"
 
-#: rhodecode/templates/admin/settings/settings.html:239
+#: rhodecode/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr "Logi poleceń wysłania zmian użytkowników"
 
-#: rhodecode/templates/admin/settings/settings.html:243
+#: rhodecode/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
 msgstr "Logi poleceń połączenia gałęzi użytkowników"
 
-#: rhodecode/templates/admin/settings/settings.html:247
-msgid "Advanced setup"
-msgstr "Zaawansowane ustawienia"
-
-#: rhodecode/templates/admin/settings/settings.html:252
+#: rhodecode/templates/admin/settings/settings_vcs.html:36
+msgid "Update repository after push (hg update)"
+msgstr "Aktualizacja repozytorium po wysłaniu zmian (aktualizacja hg)"
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:42
 msgid "Mercurial Extensions"
 msgstr "Rozszerzenia Mercurial"
 
-#: rhodecode/templates/admin/settings/settings.html:257
+#: rhodecode/templates/admin/settings/settings_vcs.html:47
 msgid "Enable largefiles extension"
 msgstr "Rozszerzenia dużych pliów"
 
-#: rhodecode/templates/admin/settings/settings.html:261
+#: rhodecode/templates/admin/settings/settings_vcs.html:51
 msgid "Enable hgsubversion extension"
 msgstr "Rozszerzenia hgsubversion"
 
-#: rhodecode/templates/admin/settings/settings.html:263
+#: rhodecode/templates/admin/settings/settings_vcs.html:53
 msgid ""
-"Requires hgsubversion library installed. Allows cloning from svn remote "
-"locations"
-msgstr "Wymaga biblioteki hgsubversion zainstalowanej. Umożliwia klonowanie z zdalnych lokalizacji svn"
-
-#: rhodecode/templates/admin/settings/settings.html:274
+"Requires hgsubversion library to be installed. Allows cloning remote SVN "
+"repositories and migrates them to Mercurial type."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:64
 msgid "Repositories location"
 msgstr "Położenie repozytorium"
 
-#: rhodecode/templates/admin/settings/settings.html:279
+#: rhodecode/templates/admin/settings/settings_vcs.html:69
 msgid ""
 "Click to unlock. You must restart RhodeCode in order to make this setting "
 "take effect."
 msgstr "Kliknij, aby odblokować. Musisz ponownie uruchomić RhodeCode żeby wprowadzić to ustawienie w życie."
 
-#: rhodecode/templates/admin/settings/settings.html:280
-#: rhodecode/templates/base/base.html:143
-msgid "Unlock"
-msgstr "Odblokowany"
-
-#: rhodecode/templates/admin/settings/settings.html:282
+#: rhodecode/templates/admin/settings/settings_vcs.html:72
+msgid ""
+"Filesystem location where repositories should be stored. After changing this"
+" value a restart and rescan of the repository folder are required."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:8
+msgid "General"
+msgstr "Główne"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:13
+msgid "Use repository extra fields"
+msgstr "Używaj w repozytorium dodatkowych pól"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:15
+msgid "Allows storing additional customized fields per repository."
+msgstr "Umożliwia przechowywanie dodatkowych niestandardowych pól w repozytorium."
+
+#: rhodecode/templates/admin/settings/settings_visual.html:18
+msgid "Show RhodeCode version"
+msgstr "Pokaż wersję RhodeCode"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:20
+msgid "Shows or hides a version number of RhodeCode displayed in the footer."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:24
+msgid "Use Gravatars in RhodeCode"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:30
+msgid ""
+"Gravatar url allows you to use other avatar server application.\n"
+"                                                        Following variables of the URL will be replaced accordingly.\n"
+"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {email}     user email,\n"
+"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
+"                                                        {size}      size of the image that is expected from the server application,\n"
+"                                                        {netloc}    network location/server host of running RhodeCode server"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:42
+msgid ""
+"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
+"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {user}   current user username,\n"
+"                                                        {netloc} network location/server host of running RhodeCode server,\n"
+"                                                        {repo}   full repository name,\n"
+"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:54
+msgid "Dashboard items"
+msgstr "Pozycja panelu"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:58
+msgid ""
+"Number of items displayed in the main page dashboard before pagination is "
+"shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:64
+msgid "Admin pages items"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:68
 msgid ""
-"Location where repositories are stored. After changing this value a restart,"
-" and rescan is required"
-msgstr "Miejsce, w którym przechowywane są repozytoria. Po zmianie tej wartości jest wymagany restart i ponowne skanowanie"
-
-#: rhodecode/templates/admin/settings/settings.html:303
-msgid "Test Email"
-msgstr "Test e-maila"
-
-#: rhodecode/templates/admin/settings/settings.html:311
-msgid "Email to"
-msgstr "E-mail do"
-
-#: rhodecode/templates/admin/settings/settings.html:319
-msgid "Send"
-msgstr "Wyślij"
-
-#: rhodecode/templates/admin/settings/settings.html:325
-msgid "System Info and Packages"
-msgstr "Informacje Systemowe i pakiety"
-
-#: rhodecode/templates/admin/settings/settings.html:328
-#: rhodecode/templates/changelog/changelog.html:51
-msgid "Show"
-msgstr "Wyświetl"
+"Number of items displayed in the admin pages grids before pagination is "
+"shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:74
+msgid "Icons"
+msgstr "Ikony"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:79
+msgid "Show public repo icon on repositories"
+msgstr "Pokazuj w publicznym repo ikonę w repozytoriach"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:83
+msgid "Show private repo icon on repositories"
+msgstr "Pokazuj w prywatnym repo ikonę w repozytoriach"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:85
+msgid "Show public/private icons next to repositories names."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:91
+msgid "Meta-Tagging"
+msgstr "Tagowanie meta"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:96
+msgid "Stylify recognised meta tags:"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:110
+msgid ""
+"Parses meta tags from repository description field and turns them into "
+"colored tags."
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:5
+msgid "Add user group"
+msgstr "Dodaj grupę użytkowników"
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:13
+#: rhodecode/templates/base/base.html:73 rhodecode/templates/base/base.html:93
+msgid "User groups"
+msgstr "Grupy użytkowników"
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:28
+msgid "Add User Group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:19
+msgid "Short, optional description for this user group."
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:5
+#, python-format
+msgid "%s user group settings"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:14
+msgid "User Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:44
+#: rhodecode/templates/admin/users/user_edit.html:45
+msgid "Default permissions"
+msgstr "Domyślne uprawnienia"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:6
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:32
+#: rhodecode/templates/admin/user_groups/user_groups.html:52
+msgid "Members"
+msgstr "Użytkownik"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:1
+#, python-format
+msgid "User Group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:19
+#: rhodecode/templates/data_table/_dt_elements.html:176
+#, python-format
+msgid "Confirm to delete this user group: %s"
+msgstr "Potwierdź usunięcie grupy użytkowników: %s"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:21
+msgid "Delete this user group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_members.html:15
+msgid "No members yet"
+msgstr "Nie ma jeszcze żadnego użytkownika"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:40
+msgid "Chosen group members"
+msgstr "Wybrane grupy użytkowników"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:43
+msgid "Remove all elements"
+msgstr "Usuń wszystkie elementy"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:53
+msgid "Available members"
+msgstr "Dostępni użytkownicy"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:56
+msgid "Add all elements"
+msgstr "Dodaj wszystkie elementy"
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:5
+msgid "User groups administration"
+msgstr "Użytkownicy grupy administracji"
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+msgid "user groups"
+msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr "Dodaj użytkownika"
 
-#: rhodecode/templates/admin/users/user_add.html:10
-#: rhodecode/templates/admin/users/user_edit.html:11
-#: rhodecode/templates/base/base.html:76
+#: rhodecode/templates/admin/users/user_add.html:13
+#: rhodecode/templates/admin/users/user_edit.html:14
+#: rhodecode/templates/base/base.html:72
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: rhodecode/templates/admin/users/user_add.html:12
-#: rhodecode/templates/admin/users/users.html:23
-msgid "Add new user"
-msgstr "Dodaj nowego użytkownika"
-
-#: rhodecode/templates/admin/users/user_add.html:50
+#: rhodecode/templates/admin/users/user_add.html:15
+#: rhodecode/templates/admin/users/users.html:27
+msgid "Add User"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_add.html:53
 msgid "Password confirmation"
 msgstr "Potwierdzenie hasła"
 
 #: rhodecode/templates/admin/users/user_edit.html:5
-msgid "Edit user"
-msgstr "Edytuj użytkownika"
-
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#, python-format
-msgid "Edit %s"
-msgstr "Edycja %s"
-
-#: rhodecode/templates/admin/users/user_edit.html:34
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:10
-msgid "Change your avatar at"
-msgstr "Zmiana awataru na"
-
-#: rhodecode/templates/admin/users/user_edit.html:35
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:11
-msgid "Using"
-msgstr "Używa:"
-
-#: rhodecode/templates/admin/users/user_edit.html:43
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:20
-msgid "API key"
-msgstr "Klucz API"
-
-#: rhodecode/templates/admin/users/user_edit.html:50
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25
-msgid "Current IP"
-msgstr "Obecny IP"
-
-#: rhodecode/templates/admin/users/user_edit.html:70
-msgid "LDAP DN"
-msgstr "LDAP DN"
-
-#: rhodecode/templates/admin/users/user_edit.html:79
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
-msgid "New password"
-msgstr "Nowe hasło"
-
-#: rhodecode/templates/admin/users/user_edit.html:88
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
+#, python-format
+msgid "%s user settings"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:46
+msgid "Emails"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:47
+msgid "Ip whitelist"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:1
+#, python-format
+msgid "User: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_profile.html:51
+msgid "Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:9
+msgid "Last Login"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:10
+msgid "Member of User groups"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:160
+#, python-format
+msgid "Confirm to delete this user: %s"
+msgstr "Potwierdź usunięcie tego użytkownika: %s"
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:23
+msgid "Delete this user"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_ips.html:8
+#, python-format
+msgid "Inherited from %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:8
+msgid "Change avatar at"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:12
+msgid "Missing email, please update this user email address."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:27
+#, python-format
+msgid ""
+"This user is in an external Source of Record (%s); some details cannot be "
+"managed here."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:60
+msgid "Name in Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr "Potwierdzenie nowego hasła"
 
-#: rhodecode/templates/admin/users/user_edit.html:163
-msgid "Email addresses"
-msgstr "Adresy e-mail"
-
-#: rhodecode/templates/admin/users/user_edit.html:176
-#, python-format
-msgid "Confirm to delete this email: %s"
-msgstr "Potwierdź, aby usunąć ten e-mail: %s"
-
-#: rhodecode/templates/admin/users/user_edit.html:190
-msgid "New email address"
-msgstr "Nowy adres e-mail"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:254
-msgid "My account"
-msgstr "Moje konto"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:9
-msgid "My Account"
-msgstr "Moje konto"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:35
-msgid "My permissions"
-msgstr "Moje uprawnienia"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:54
-msgid "My repos"
-msgstr "Moje repo"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:41
-msgid "My pull requests"
-msgstr "Moje prośby połączenia gałęzi"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4
-msgid "Show closed pull requests"
-msgstr "[zamknięty] wniosek o połączenie gałęzi"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6
-msgid "Opened by me"
-msgstr "Otwarty przez mnie"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
-#, python-format
-msgid "Pull request #%s opened on %s"
-msgstr "Wniosek połączenia gałęzi #%s otwarty %s"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45
-#: rhodecode/templates/pullrequests/pullrequest_data.html:11
-#: rhodecode/templates/pullrequests/pullrequest_show.html:27
-#: rhodecode/templates/pullrequests/pullrequest_show.html:42
-msgid "Closed"
-msgstr "Zamknięte"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23
-msgid "Confirm to delete this pull request"
-msgstr "Potwierdź usunięcie połączenia gałęzi"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51
-msgid "Nothing here yet"
-msgstr "Nic tu nie ma jeszcze"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34
-msgid "I participate in"
-msgstr "Biorę udział w"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42
-#: rhodecode/templates/pullrequests/pullrequest_data.html:8
-#, python-format
-msgid "Pull request #%s opened by %s on %s"
-msgstr "Wniosek połączenia gałęzi #%s otwarty %s dnia %s"
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "Administracja użytkownikami"
 
-#: rhodecode/templates/admin/users/users.html:9
+#: rhodecode/templates/admin/users/users.html:13
 msgid "users"
 msgstr "użytkownicy"
 
-#: rhodecode/templates/admin/users/users.html:80
+#: rhodecode/templates/admin/users/users.html:54
 msgid "Firstname"
 msgstr "imię"
 
-#: rhodecode/templates/admin/users/users.html:81
+#: rhodecode/templates/admin/users/users.html:55
 msgid "Lastname"
 msgstr "nazwisko"
 
-#: rhodecode/templates/admin/users/users.html:82
+#: rhodecode/templates/admin/users/users.html:56
 msgid "Last login"
 msgstr "Ostatnio zalogowany"
 
-#: rhodecode/templates/admin/users_groups/users_group_add.html:5
-msgid "Add user group"
-msgstr "Dodaj grupę użytkowników"
-
-#: rhodecode/templates/admin/users_groups/users_group_add.html:10
-#: rhodecode/templates/admin/users_groups/users_groups.html:11
-#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94
-msgid "User groups"
-msgstr "Grupy użytkowników"
-
-#: rhodecode/templates/admin/users_groups/users_group_add.html:12
-#: rhodecode/templates/admin/users_groups/users_groups.html:26
-msgid "Add new user group"
-msgstr "Dodaj nową grupę użytkowników"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:5
-msgid "Edit user group"
-msgstr "Edytuj grupę użytkowników"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:11
-msgid "UserGroups"
-msgstr "Użytkownicy Grupy"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:50
-#: rhodecode/templates/admin/users_groups/users_groups.html:38
-msgid "Members"
-msgstr "Użytkownik"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:58
-msgid "Chosen group members"
-msgstr "Wybrane grupy użytkowników"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:61
-msgid "Remove all elements"
-msgstr "Usuń wszystkie elementy"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:75
-msgid "Available members"
-msgstr "Dostępni użytkownicy"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:79
-msgid "Add all elements"
-msgstr "Dodaj wszystkie elementy"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:109
-msgid "No members yet"
-msgstr "Nie ma jeszcze żadnego użytkownika"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:117
-msgid "Global Permissions"
-msgstr "Uprawnienia globalne"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:5
-msgid "User groups administration"
-msgstr "Użytkownicy grupy administracji"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:55
-#, python-format
-msgid "Confirm to delete this user group: %s"
-msgstr "Potwierdź usunięcie grupy użytkowników: %s"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:62
-msgid "There are no user groups yet"
-msgstr "Nie ma jeszcze grupy użytkowników"
-
-#: rhodecode/templates/base/base.html:42
+#: rhodecode/templates/admin/users/users.html:59
+msgid "Auth type"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:37
 #, python-format
 msgid "Server instance: %s"
 msgstr "Wystąpienia serwera: %s"
 
-#: rhodecode/templates/base/base.html:52
-msgid "Report a bug"
-msgstr "Zgłoś błąd"
-
-#: rhodecode/templates/base/base.html:121
-#: rhodecode/templates/data_table/_dt_elements.html:9
+#: rhodecode/templates/base/base.html:46
+msgid "Support"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:131
+msgid "Create fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:142
 #: rhodecode/templates/data_table/_dt_elements.html:11
-#: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/summary/summary.html:8
+#: rhodecode/templates/data_table/_dt_elements.html:15
+#: rhodecode/templates/summary/summary.html:11
 msgid "Summary"
 msgstr "Podsumowanie"
 
-#: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/changelog/changelog.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:17
+#: rhodecode/templates/base/base.html:143
+#: rhodecode/templates/changelog/changelog.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
-#: rhodecode/templates/data_table/_dt_elements.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:23
 msgid "Changelog"
 msgstr "Dziennik zmian"
 
-#: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/data_table/_dt_elements.html:25
+#: rhodecode/templates/base/base.html:144
 #: rhodecode/templates/data_table/_dt_elements.html:27
-#: rhodecode/templates/data_table/_dt_elements.html:29
-#: rhodecode/templates/files/files.html:12
+#: rhodecode/templates/data_table/_dt_elements.html:31
+#: rhodecode/templates/files/files.html:15
 msgid "Files"
 msgstr "Pliki"
 
-#: rhodecode/templates/base/base.html:125
+#: rhodecode/templates/base/base.html:146
 msgid "Switch To"
 msgstr "Przełącz do"
 
-#: rhodecode/templates/base/base.html:127
-#: rhodecode/templates/base/base.html:279
-msgid "loading..."
-msgstr "wczytywanie..."
-
-#: rhodecode/templates/base/base.html:131
+#: rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:155
 msgid "Options"
 msgstr "Opcje"
 
-#: rhodecode/templates/base/base.html:137
+#: rhodecode/templates/base/base.html:163
 #: rhodecode/templates/forks/forks_data.html:21
 msgid "Compare fork"
 msgstr "Porównaj rozwidlenie"
 
-#: rhodecode/templates/base/base.html:139
-#: rhodecode/templates/base/base.html:312
-#: rhodecode/templates/search/search.html:14
-#: rhodecode/templates/search/search.html:54
+#: rhodecode/templates/base/base.html:165
+#: rhodecode/templates/bookmarks/bookmarks.html:58
+#: rhodecode/templates/bookmarks/bookmarks_data.html:13
+#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/branches/branches_data.html:13
+#: rhodecode/templates/tags/tags.html:58
+#: rhodecode/templates/tags/tags_data.html:13
+msgid "Compare"
+msgstr "Porównaj"
+
+#: rhodecode/templates/base/base.html:167
+#: rhodecode/templates/base/base.html:334
+#: rhodecode/templates/search/search.html:17
+#: rhodecode/templates/search/search.html:57
 msgid "Search"
 msgstr "Szukaj"
 
-#: rhodecode/templates/base/base.html:145
+#: rhodecode/templates/base/base.html:171
+msgid "Unlock"
+msgstr "Odblokowany"
+
+#: rhodecode/templates/base/base.html:173
 msgid "Lock"
 msgstr "zablokowane"
 
-#: rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:181
 msgid "Follow"
 msgstr "Obserwuj"
 
-#: rhodecode/templates/base/base.html:154
+#: rhodecode/templates/base/base.html:182
 msgid "Unfollow"
 msgstr "Nie obserwuj"
 
-#: rhodecode/templates/base/base.html:157
-#: rhodecode/templates/data_table/_dt_elements.html:33
+#: rhodecode/templates/base/base.html:185
 #: rhodecode/templates/data_table/_dt_elements.html:35
-#: rhodecode/templates/data_table/_dt_elements.html:37
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/forks/fork.html:9
+#: rhodecode/templates/data_table/_dt_elements.html:39
+#: rhodecode/templates/forks/fork.html:12
 msgid "Fork"
 msgstr "Gałąź"
 
-#: rhodecode/templates/base/base.html:159
+#: rhodecode/templates/base/base.html:187
 msgid "Create Pull Request"
 msgstr "Stwórz nowe żądanie połączenia gałęzi"
 
-#: rhodecode/templates/base/base.html:165
-msgid "Show Pull Requests"
-msgstr "Nowa prośba o połączenie gałęzi"
-
-#: rhodecode/templates/base/base.html:165
-msgid "Pull Requests"
-msgstr "Połączone gałęzie"
-
-#: rhodecode/templates/base/base.html:202
+#: rhodecode/templates/base/base.html:193
+#, python-format
+msgid "Show Pull Requests for %s"
+msgstr "Pokaż Prośby Pobrania %s"
+
+#: rhodecode/templates/base/base.html:230
 msgid "Not logged in"
 msgstr "Zaloguj się"
 
-#: rhodecode/templates/base/base.html:209
+#: rhodecode/templates/base/base.html:237
 msgid "Login to your account"
 msgstr "Zaloguj się do swojego konta"
 
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/templates/base/base.html:260
 msgid "Forgot password ?"
 msgstr "Nie pamiętasz hasła?"
 
-#: rhodecode/templates/base/base.html:255
+#: rhodecode/templates/base/base.html:283
 msgid "Log Out"
 msgstr "Wyloguj się"
 
-#: rhodecode/templates/base/base.html:274
-msgid "Switch repository"
-msgstr "Przełącz repozytorium"
-
-#: rhodecode/templates/base/base.html:286
+#: rhodecode/templates/base/base.html:308
 msgid "Show recent activity"
 msgstr "Pokaż ostatnią aktywność"
 
-#: rhodecode/templates/base/base.html:287
+#: rhodecode/templates/base/base.html:309
 #: rhodecode/templates/journal/journal.html:4
 msgid "Journal"
 msgstr "Dziennik"
 
-#: rhodecode/templates/base/base.html:298
+#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:315
+msgid "Public journal"
+msgstr "Dziennik publiczny"
+
+#: rhodecode/templates/base/base.html:320
 msgid "Show public gists"
-msgstr "Wyświetl publiczne git"
-
-#: rhodecode/templates/base/base.html:303
+msgstr "Wyświetl publiczne gists"
+
+#: rhodecode/templates/base/base.html:321
+msgid "Gists"
+msgstr "Gists"
+
+#: rhodecode/templates/base/base.html:324
+msgid "Create new gist"
+msgstr "Utwórz nowy gist"
+
+#: rhodecode/templates/base/base.html:325
 msgid "All public gists"
-msgstr "Wszystkie publiczne git"
-
-#: rhodecode/templates/base/base.html:305
+msgstr "Wszystkie publiczne gists"
+
+#: rhodecode/templates/base/base.html:327
 msgid "My public gists"
-msgstr "Moje publiczne git"
-
-#: rhodecode/templates/base/base.html:306
+msgstr "Moje publiczne gists"
+
+#: rhodecode/templates/base/base.html:328
 msgid "My private gists"
-msgstr "Moje prywatne git"
-
-#: rhodecode/templates/base/base.html:311
+msgstr "Moje prywatne gists"
+
+#: rhodecode/templates/base/base.html:333
 msgid "Search in repositories"
 msgstr "Szukaj we wszystkich repozytoriach"
 
+#: rhodecode/templates/base/base.html:394
+msgid "No matches found"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:522
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:531
+msgid "Site-wide shortcuts"
+msgstr ""
+
 #: rhodecode/templates/base/default_perms_box.html:14
-msgid "Inherit default permissions"
-msgstr "Dziedziczą uprawnienia domyślne"
-
-#: rhodecode/templates/base/default_perms_box.html:18
+msgid "Inherit from defaults"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:19
 #, python-format
 msgid ""
-"Select to inherit permissions from %s settings. With this selected below "
-"options does not apply."
-msgstr "Wybierz dziedziczone uprawnienia z %s ustawień. Po wybraniu tej opcji poniżej, nie ma ta opcja zastosowania."
-
-#: rhodecode/templates/base/default_perms_box.html:26
+"Select to inherit permissions from %s permissions settings, and default IP "
+"address whitelist."
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:28
 msgid "Create repositories"
 msgstr "Utwórz repozytorium"
 
-#: rhodecode/templates/base/default_perms_box.html:30
+#: rhodecode/templates/base/default_perms_box.html:33
 msgid "Select this option to allow repository creation for this user"
 msgstr "Wybierz tę opcję, aby umożliwić stworzenie repozytorium dla tego użytkownika"
 
-#: rhodecode/templates/base/default_perms_box.html:35
+#: rhodecode/templates/base/default_perms_box.html:40
 msgid "Create user groups"
 msgstr "Tworzenie grup użytkowników"
 
-#: rhodecode/templates/base/default_perms_box.html:39
+#: rhodecode/templates/base/default_perms_box.html:45
 msgid "Select this option to allow user group creation for this user"
 msgstr "Wybierz tę opcję, aby umożliwić utworzenie grupy użytkowników dla tego użytkownika"
 
-#: rhodecode/templates/base/default_perms_box.html:44
+#: rhodecode/templates/base/default_perms_box.html:52
 msgid "Fork repositories"
 msgstr "Rozwidlenie repozytorium"
 
-#: rhodecode/templates/base/default_perms_box.html:48
+#: rhodecode/templates/base/default_perms_box.html:57
 msgid "Select this option to allow repository forking for this user"
 msgstr "Wybierz tę opcję, aby umożliwić rozwidlania repozytorium dla tego użytkownika"
 
-#: rhodecode/templates/base/perms_summary.html:11
+#: rhodecode/templates/base/perms_summary.html:13
+msgid "show"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:22
 msgid "No permissions defined yet"
 msgstr "Nie ma jeszcze ustawionych uprawnień"
 
-#: rhodecode/templates/base/perms_summary.html:19
-#: rhodecode/templates/base/perms_summary.html:38
+#: rhodecode/templates/base/perms_summary.html:30
+#: rhodecode/templates/base/perms_summary.html:54
 msgid "Permission"
 msgstr "Uprawnienia"
 
-#: rhodecode/templates/base/perms_summary.html:20
-#: rhodecode/templates/base/perms_summary.html:39
+#: rhodecode/templates/base/perms_summary.html:32
+#: rhodecode/templates/base/perms_summary.html:56
 msgid "Edit Permission"
 msgstr "Edycja Uprawnień"
 
-#: rhodecode/templates/base/root.html:44
+#: rhodecode/templates/base/perms_summary.html:90
+msgid "No permission defined"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:47
 msgid "Add another comment"
 msgstr "Dodaj kolejny komentarz"
 
-#: rhodecode/templates/base/root.html:45
-#: rhodecode/templates/data_table/_dt_elements.html:147
+#: rhodecode/templates/base/root.html:48
+#: rhodecode/templates/data_table/_dt_elements.html:216
 msgid "Stop following this repository"
 msgstr "Zakończyć obserwację tego repozytorium"
 
-#: rhodecode/templates/base/root.html:46
+#: rhodecode/templates/base/root.html:49
 msgid "Start following this repository"
 msgstr "Zacznij obserwację tego repozytorium"
 
-#: rhodecode/templates/base/root.html:47
+#: rhodecode/templates/base/root.html:50
 msgid "Group"
 msgstr "Grupa"
 
-#: rhodecode/templates/base/root.html:48
+#: rhodecode/templates/base/root.html:51
 msgid "members"
 msgstr "użytkownik"
 
-#: rhodecode/templates/base/root.html:49
-#: rhodecode/templates/pullrequests/pullrequest.html:203
+#: rhodecode/templates/base/root.html:52
+#: rhodecode/templates/pullrequests/pullrequest.html:202
 msgid "Loading ..."
 msgstr "Ładuję..."
 
-#: rhodecode/templates/base/root.html:50
+#: rhodecode/templates/base/root.html:53
+msgid "loading ..."
+msgstr "ładuję ..."
+
+#: rhodecode/templates/base/root.html:54
 msgid "Search truncated"
 msgstr "Szukaj obcięte"
 
-#: rhodecode/templates/base/root.html:51
+#: rhodecode/templates/base/root.html:55
 msgid "No matching files"
 msgstr "Nie ma plików pasujących"
 
-#: rhodecode/templates/base/root.html:52
-#: rhodecode/templates/changelog/changelog.html:45
+#: rhodecode/templates/base/root.html:56
+#: rhodecode/templates/changelog/changelog.html:51
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
 msgid "Open new pull request"
 msgstr "Otwórz nową prośbę o połączenie gałęzi"
 
-#: rhodecode/templates/base/root.html:53
+#: rhodecode/templates/base/root.html:57
 msgid "Open new pull request for selected changesets"
 msgstr "Otwórz nową prośbę o połączenie gałęzi w zestawieniu zmian"
 
-#: rhodecode/templates/base/root.html:54
+#: rhodecode/templates/base/root.html:58
 msgid "Show selected changesets __S -> __E"
 msgstr "Pokaż wybrane zmiany __S -> __E"
 
-#: rhodecode/templates/base/root.html:55
+#: rhodecode/templates/base/root.html:59
 msgid "Show selected changeset __S"
 msgstr "Pokaż wybrane zmiany __S -> __E"
 
-#: rhodecode/templates/base/root.html:56
+#: rhodecode/templates/base/root.html:60
 msgid "Selection link"
 msgstr "Wybór linku"
 
-#: rhodecode/templates/base/root.html:57
+#: rhodecode/templates/base/root.html:61
 #: rhodecode/templates/changeset/diff_block.html:8
 msgid "Collapse diff"
 msgstr "Pliki różnic"
 
-#: rhodecode/templates/base/root.html:58
+#: rhodecode/templates/base/root.html:62
 msgid "Expand diff"
 msgstr "poprawka różnic"
 
-#: rhodecode/templates/base/root.html:59
+#: rhodecode/templates/base/root.html:63
 msgid "Failed to revoke permission"
 msgstr "Nie udało się cofnąć uprawnienia"
 
+#: rhodecode/templates/base/root.html:64
+msgid "confirm to revoke permission for {0}: {1} ?"
+msgstr "potwierdzić odwołanie pozwolenie na {0}: {1} ?"
+
+#: rhodecode/templates/base/root.html:68
+msgid "specify changeset"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr "%s Zakładki"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:26
-msgid "Compare bookmarks"
-msgstr "Porównaj zakładki"
-
-#: rhodecode/templates/bookmarks/bookmarks.html:51
-#: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:50
-#: rhodecode/templates/branches/branches_data.html:8
+#: rhodecode/templates/bookmarks/bookmarks.html:29
+msgid "Compare Bookmarks"
+msgstr ""
+
+#: rhodecode/templates/bookmarks/bookmarks.html:55
+#: rhodecode/templates/bookmarks/bookmarks_data.html:10
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:10
 #: rhodecode/templates/changelog/changelog_summary_data.html:8
-#: rhodecode/templates/tags/tags.html:51
-#: rhodecode/templates/tags/tags_data.html:8
+#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/tags/tags_data.html:10
 msgid "Author"
 msgstr "Autor"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:52
-#: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:51
-#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/bookmarks/bookmarks.html:56
+#: rhodecode/templates/bookmarks/bookmarks_data.html:12
+#: rhodecode/templates/branches/branches.html:55
+#: rhodecode/templates/branches/branches_data.html:12
 #: rhodecode/templates/changelog/changelog_summary_data.html:5
-#: rhodecode/templates/tags/tags.html:52
-#: rhodecode/templates/tags/tags_data.html:9
+#: rhodecode/templates/tags/tags.html:56
+#: rhodecode/templates/tags/tags_data.html:12
 msgid "Revision"
 msgstr "Rewizja"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:54
-#: rhodecode/templates/bookmarks/bookmarks_data.html:10
-#: rhodecode/templates/branches/branches.html:53
-#: rhodecode/templates/branches/branches_data.html:10
-#: rhodecode/templates/tags/tags.html:54
-#: rhodecode/templates/tags/tags_data.html:10
-msgid "Compare"
-msgstr "Porównaj"
-
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
 msgstr "%s Gałęzie"
 
-#: rhodecode/templates/branches/branches.html:26
-msgid "Compare branches"
-msgstr "porównaj gałęzie"
+#: rhodecode/templates/branches/branches.html:29
+msgid "Compare Branches"
+msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr "%s Dziennik zmian"
 
-#: rhodecode/templates/changelog/changelog.html:19
+#: rhodecode/templates/changelog/changelog.html:21
 #, python-format
 msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
-msgstr[0] "pokazano %d z rewizji %d"
-msgstr[1] "pokazano %d w rewizjach %d"
-msgstr[2] "pokazano %d w rewizjach %d"
-
-#: rhodecode/templates/changelog/changelog.html:39
+msgstr[0] "pokazano %d z  %d rewizji"
+msgstr[1] "pokazano %d z  %d rewizji"
+msgstr[2] "pokazano %d z  %d rewizji"
+
+#: rhodecode/templates/changelog/changelog.html:43
 msgid "Clear selection"
 msgstr "Wyczyść zaznaczenie"
 
-#: rhodecode/templates/changelog/changelog.html:42
+#: rhodecode/templates/changelog/changelog.html:47
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 msgstr "porównaj gałęzie %s"
 
-#: rhodecode/templates/changelog/changelog.html:42
-msgid "Compare fork with parent"
-msgstr "porównaj gałąź w rodzicem"
-
-#: rhodecode/templates/changelog/changelog.html:78
-#: rhodecode/templates/changelog/changelog_summary_data.html:28
-#, python-format
-msgid "Click to open associated pull request #%s"
-msgstr "Kliknij żeby otworzyć prośbę o połączenie gałęzi #%s"
-
-#: rhodecode/templates/changelog/changelog.html:102
-#: rhodecode/templates/summary/summary.html:403
-msgid "Show more"
-msgstr "Pokaż więcej"
-
-#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changelog/changelog.html:49
+#, python-format
+msgid "Compare fork with Parent(%s)"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:56
+msgid "Show"
+msgstr "Wyświetl"
+
+#: rhodecode/templates/changelog/changelog.html:82
+#: rhodecode/templates/changelog/changelog_summary_data.html:19
+#, python-format
+msgid ""
+"Changeset status: %s\n"
+"Click to open associated pull request #%s"
+msgstr "Status grupy zmian: %s⏎ Kliknij, aby otworzyć prośby pobrania #%s"
+
+#: rhodecode/templates/changelog/changelog.html:86
+#: rhodecode/templates/compare/compare_cs.html:18
+#, python-format
+msgid "Changeset status: %s"
+msgstr "Status grupy zmian: %s"
+
+#: rhodecode/templates/changelog/changelog.html:105
+#: rhodecode/templates/compare/compare_cs.html:36
+msgid "Expand commit message"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:114
+msgid "Changeset has comments"
+msgstr "Komentarze Grupy zmian"
+
+#: rhodecode/templates/changelog/changelog.html:124
 #: rhodecode/templates/changelog/changelog_summary_data.html:50
-#: rhodecode/templates/changeset/changeset.html:107
-#: rhodecode/templates/changeset/changeset_range.html:86
+#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset_range.html:93
 #, python-format
 msgid "Bookmark %s"
 msgstr "Zakładki %s"
 
-#: rhodecode/templates/changelog/changelog.html:121
+#: rhodecode/templates/changelog/changelog.html:130
 #: rhodecode/templates/changelog/changelog_summary_data.html:56
-#: rhodecode/templates/changeset/changeset.html:113
-#: rhodecode/templates/changeset/changeset_range.html:92
+#: rhodecode/templates/changeset/changeset.html:100
+#: rhodecode/templates/changeset/changeset_range.html:99
 #, python-format
 msgid "Tag %s"
 msgstr "Tagi %s"
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:135
 #: rhodecode/templates/changelog/changelog_summary_data.html:61
-#: rhodecode/templates/changeset/changeset.html:117
-#: rhodecode/templates/changeset/changeset_range.html:96
+#: rhodecode/templates/changeset/changeset.html:105
+#: rhodecode/templates/changeset/changeset_range.html:103
 #, python-format
 msgid "Branch %s"
 msgstr "Gałęzie %s"
 
-#: rhodecode/templates/changelog/changelog.html:286
+#: rhodecode/templates/changelog/changelog.html:299
 msgid "There are no changes yet"
 msgstr "Nie ma jeszcze zmian"
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:91
+#: rhodecode/templates/changeset/changeset.html:76
 msgid "Removed"
 msgstr "Usunięto"
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:92
+#: rhodecode/templates/changeset/changeset.html:77
 msgid "Changed"
 msgstr "Zmiana"
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset.html:78
 msgid "Added"
 msgstr "Dodana"
 
 #: rhodecode/templates/changelog/changelog_details.html:8
 #: rhodecode/templates/changelog/changelog_details.html:9
 #: rhodecode/templates/changelog/changelog_details.html:10
-#: rhodecode/templates/changeset/changeset.html:95
-#: rhodecode/templates/changeset/changeset.html:96
-#: rhodecode/templates/changeset/changeset.html:97
+#: rhodecode/templates/changeset/changeset.html:80
+#: rhodecode/templates/changeset/changeset.html:81
+#: rhodecode/templates/changeset/changeset.html:82
 #, python-format
 msgid "Affected %s files"
 msgstr "Zarażone pliki %s"
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:6
-#: rhodecode/templates/files/files_add.html:75
-#: rhodecode/templates/files/files_edit.html:61
+#: rhodecode/templates/files/files_add.html:65
+#: rhodecode/templates/files/files_delete.html:53
 msgid "Commit message"
 msgstr "Komentarz"
 
@@ -3711,10 +4716,9 @@
 msgstr "Dodaj lub prześlij pliki bezpośrednio przez stronę"
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:89
-#: rhodecode/templates/files/files_add.html:38
-#: rhodecode/templates/files/files_browser.html:31
-msgid "Add new file"
-msgstr "Dodaj nowy plik"
+#: rhodecode/templates/files/files_ypjax.html:9
+msgid "Add New File"
+msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:95
 msgid "Push new repo"
@@ -3729,36 +4733,38 @@
 msgid "%s Changeset"
 msgstr "%s Grupy zmian"
 
-#: rhodecode/templates/changeset/changeset.html:39
-msgid "No parents"
-msgstr "Brak rewizji"
-
-#: rhodecode/templates/changeset/changeset.html:49
-msgid "No children"
-msgstr "Brak dzieci"
-
-#: rhodecode/templates/changeset/changeset.html:62
-#: rhodecode/templates/changeset/changeset_file_comment.html:20
-#: rhodecode/templates/changeset/changeset_range.html:44
+#: rhodecode/templates/changeset/changeset.html:37
+msgid "parent rev."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:43
+msgid "child rev."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:51
+#: rhodecode/templates/changeset/changeset_file_comment.html:41
+#: rhodecode/templates/changeset/changeset_range.html:51
 msgid "Changeset status"
 msgstr "Status grupy zmian"
 
+#: rhodecode/templates/changeset/changeset.html:55
+#: rhodecode/templates/changeset/diff_block.html:27
+#: rhodecode/templates/files/diff_2way.html:52
+msgid "Raw diff"
+msgstr "Raw różnic"
+
+#: rhodecode/templates/changeset/changeset.html:58
+msgid "Patch diff"
+msgstr "Poprawka różnic"
+
+#: rhodecode/templates/changeset/changeset.html:61
+#: rhodecode/templates/changeset/diff_block.html:30
+#: rhodecode/templates/files/diff_2way.html:55
+msgid "Download diff"
+msgstr "Pobierz różnice"
+
 #: rhodecode/templates/changeset/changeset.html:67
-#: rhodecode/templates/changeset/diff_block.html:22
-msgid "Raw diff"
-msgstr "Raw różnic"
-
-#: rhodecode/templates/changeset/changeset.html:68
-msgid "Patch diff"
-msgstr "Poprawka różnic"
-
-#: rhodecode/templates/changeset/changeset.html:69
-#: rhodecode/templates/changeset/diff_block.html:23
-msgid "Download diff"
-msgstr "Pobierz różnice"
-
-#: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:103
+#: rhodecode/templates/changeset/changeset_file_comment.html:111
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -3766,8 +4772,8 @@
 msgstr[1] "%d komentarzy"
 msgstr[2] "%d komentarzy"
 
-#: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:103
+#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:111
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
@@ -3775,14 +4781,14 @@
 msgstr[1] "(%d linii)"
 msgstr[2] "(%d linii)"
 
-#: rhodecode/templates/changeset/changeset.html:103
-#: rhodecode/templates/changeset/changeset_range.html:82
+#: rhodecode/templates/changeset/changeset.html:88
+#: rhodecode/templates/changeset/changeset_range.html:89
 msgid "merge"
 msgstr "połącz"
 
-#: rhodecode/templates/changeset/changeset.html:126
-#: rhodecode/templates/compare/compare_diff.html:40
-#: rhodecode/templates/pullrequests/pullrequest_show.html:113
+#: rhodecode/templates/changeset/changeset.html:124
+#: rhodecode/templates/compare/compare_diff.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:160
 #, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
@@ -3790,9 +4796,9 @@
 msgstr[1] "%s pliki zostały zmienione"
 msgstr[2] "%s plików zostało zmienionych"
 
-#: rhodecode/templates/changeset/changeset.html:128
-#: rhodecode/templates/compare/compare_diff.html:42
-#: rhodecode/templates/pullrequests/pullrequest_show.html:115
+#: rhodecode/templates/changeset/changeset.html:126
+#: rhodecode/templates/compare/compare_diff.html:59
+#: rhodecode/templates/pullrequests/pullrequest_show.html:162
 #, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
@@ -3800,115 +4806,135 @@
 msgstr[1] "%s plików zostało zmienionych z %s inercjami i %s usunięciami"
 msgstr[2] "%s plików zostało zmienionych z %s inercjami i %s usunięciami"
 
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Showing a huge diff might take some time and resources"
 msgstr "Pokazuje pełną edycję, może zająć to trochę czasu i zasobów"
 
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Show full diff"
 msgstr "Pokaż pełną historię"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:30
-#, python-format
-msgid "Status change on pull request #%s"
-msgstr "Wszystkie prośby połączenia gałęzi %s"
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:32
+#: rhodecode/templates/changeset/changeset.html:214
+#: rhodecode/templates/changeset/changeset.html:251
+msgid "no revisions"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:23
+#, python-format
+msgid "Vote on pull request #%s"
+msgstr "Głosowanie do grupy zmian #%s"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:25
 #, python-format
 msgid "Comment on pull request #%s"
 msgstr "Komentarz połączenia gałęzi %s"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:55
+#: rhodecode/templates/changeset/changeset_file_comment.html:30
+msgid "Status change on changeset"
+msgstr "Zmiana statusu w grupie zmian"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:32
+msgid "Comment on changeset"
+msgstr "Skomentuj grupę zmian"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:63
 msgid "Submitting..."
 msgstr "Przesyłanie..."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:58
+#: rhodecode/templates/changeset/changeset_file_comment.html:66
 msgid "Commenting on line {1}."
 msgstr "Komentując linię {1}."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:59
-#: rhodecode/templates/changeset/changeset_file_comment.html:145
+#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:153
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
 msgstr "Komentarze analizowane za pomocą %s składni od %s wsparcia."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:61
-#: rhodecode/templates/changeset/changeset_file_comment.html:147
+#: rhodecode/templates/changeset/changeset_file_comment.html:69
+#: rhodecode/templates/changeset/changeset_file_comment.html:155
 msgid ""
 "Use @username inside this text to send notification to this RhodeCode user"
 msgstr "Użyj @username wewnątrz tego tekstu, aby wysłać powiadomienie do użytkownika strony"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:65
-#: rhodecode/templates/changeset/changeset_file_comment.html:152
+#: rhodecode/templates/changeset/changeset_file_comment.html:73
+#: rhodecode/templates/changeset/changeset_file_comment.html:166
 msgid "Preview"
 msgstr "Podgląd"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:72
-#: rhodecode/templates/changeset/changeset_file_comment.html:170
+#: rhodecode/templates/changeset/changeset_file_comment.html:80
+#: rhodecode/templates/changeset/changeset_file_comment.html:189
 msgid "Comment preview"
 msgstr "Podgląd komentarza"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:80
-#: rhodecode/templates/changeset/changeset_file_comment.html:177
-#: rhodecode/templates/email_templates/changeset_comment.html:16
+#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:196
+#: rhodecode/templates/email_templates/changeset_comment.html:11
 #: rhodecode/templates/email_templates/pull_request_comment.html:16
 msgid "Comment"
 msgstr "Komentarz"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:81
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:96
 msgid "You need to be logged in to comment."
 msgstr "Musisz być zalogowany żeby komentarz."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:96
 msgid "Login now"
 msgstr "Zaloguj się teraz"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:92
+#: rhodecode/templates/changeset/changeset_file_comment.html:100
 msgid "Hide"
 msgstr "Ukryj"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:149
-msgid "Change status"
-msgstr "Zmień status"
+#: rhodecode/templates/changeset/changeset_file_comment.html:159
+msgid "Vote for pull request status"
+msgstr "Zagłosuj na żądanie na grupę zmian"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:161
+msgid "Change changeset status"
+msgstr "Zmiana statusu grupy zmian"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:179
-msgid "Comment and close"
-msgstr "Skomentuj i zamknij"
+msgid "Close (when approved or rejected)"
+msgstr "Zamknij (po zatwierdzeniu lub odrzuceniu)"
 
 #: rhodecode/templates/changeset/changeset_range.html:5
 #, python-format
 msgid "%s Changesets"
 msgstr "%s Zestawienie zmian"
 
-#: rhodecode/templates/changeset/changeset_range.html:52
+#: rhodecode/templates/changeset/changeset_range.html:59
 msgid "Files affected"
 msgstr "Pliki naruszone"
 
 #: rhodecode/templates/changeset/diff_block.html:21
+#: rhodecode/templates/files/diff_2way.html:46
 msgid "Show full diff for this file"
 msgstr "Pokaż pełną edycję tego pliku"
 
-#: rhodecode/templates/changeset/diff_block.html:29
+#: rhodecode/templates/changeset/diff_block.html:24
+#: rhodecode/templates/changeset/diff_block.html:68
+#: rhodecode/templates/files/diff_2way.html:49
+msgid "Show full side-by-side diff for this file"
+msgstr "Pokaż pełną listę zmian i różnic obok siebie"
+
+#: rhodecode/templates/changeset/diff_block.html:38
 msgid "Show inline comments"
 msgstr "Pokaż online komentarz"
 
-#: rhodecode/templates/changeset/diff_block.html:53
+#: rhodecode/templates/changeset/diff_block.html:62
 msgid "Show file at latest version in this repo"
 msgstr "Pokaż plik w najnowszej wersji, w tym repo"
 
-#: rhodecode/templates/changeset/diff_block.html:54
+#: rhodecode/templates/changeset/diff_block.html:64
 msgid "Show file at initial version in this repo"
 msgstr "Pokaż plik w pierwotnej wersji w repo"
 
@@ -3916,21 +4942,34 @@
 msgid "No changesets"
 msgstr "Brak zestawienia zmian"
 
-#: rhodecode/templates/compare/compare_cs.html:32
+#: rhodecode/templates/compare/compare_cs.html:8
 msgid "Ancestor"
 msgstr "Przodek"
 
-#: rhodecode/templates/compare/compare_diff.html:5
+#: rhodecode/templates/compare/compare_diff.html:6
+#: rhodecode/templates/compare/compare_diff.html:8
 #, python-format
 msgid "%s Compare"
 msgstr "%s Porównaj"
 
-#: rhodecode/templates/compare/compare_diff.html:9
+#: rhodecode/templates/compare/compare_diff.html:16
 msgid "Compare revisions"
 msgstr "Porównaj wersje"
 
-#: rhodecode/templates/compare/compare_diff.html:33
-#: rhodecode/templates/pullrequests/pullrequest_show.html:106
+#: rhodecode/templates/compare/compare_diff.html:36
+msgid "Swap"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:38
+msgid "Compare Revisions"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:45
+msgid "Compare revisions, branches, bookmarks or tags."
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:50
+#: rhodecode/templates/pullrequests/pullrequest_show.html:153
 #, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
@@ -3938,69 +4977,53 @@
 msgstr[1] "Pokaż %s komentarze"
 msgstr[2] "Pokaż %s komentarze"
 
-#: rhodecode/templates/compare/compare_diff.html:48
-#: rhodecode/templates/pullrequests/pullrequest_show.html:121
+#: rhodecode/templates/compare/compare_diff.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:168
 msgid "No files"
 msgstr "Brak plików"
 
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-msgid "confirm to show potentially huge diff"
-msgstr "potwierdź pokazanie pełnej edycji"
-
-#: rhodecode/templates/data_table/_dt_elements.html:54
-#: rhodecode/templates/summary/summary.html:69
+#: rhodecode/templates/data_table/_dt_elements.html:63
 msgid "Mercurial repository"
 msgstr "Repozytorium mercurial"
 
-#: rhodecode/templates/data_table/_dt_elements.html:56
-#: rhodecode/templates/summary/summary.html:72
+#: rhodecode/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr "Repozytorium git"
 
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#, python-format
-msgid "Fork of %s"
-msgstr "Nazwa rozgałęzienia %s"
-
-#: rhodecode/templates/data_table/_dt_elements.html:88
+#: rhodecode/templates/data_table/_dt_elements.html:72
+msgid "Public repository"
+msgstr "Publiczne repozytorium"
+
+#: rhodecode/templates/data_table/_dt_elements.html:82
+msgid "Repository creating in progress..."
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr "Nie ma jeszcze zestawienia zmian"
 
-#: rhodecode/templates/data_table/_dt_elements.html:95
-#: rhodecode/templates/data_table/_dt_elements.html:97
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "Subskrybuj %s kanał rss"
 
-#: rhodecode/templates/data_table/_dt_elements.html:103
-#: rhodecode/templates/data_table/_dt_elements.html:105
+#: rhodecode/templates/data_table/_dt_elements.html:111
+#: rhodecode/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "Subskrybuj %s kanał atom"
 
-#: rhodecode/templates/data_table/_dt_elements.html:122
-#, python-format
-msgid "Confirm to delete this repository: %s"
-msgstr "Potwierdź usunięcie repozytorium: %s"
-
-#: rhodecode/templates/data_table/_dt_elements.html:137
-#, python-format
-msgid "Confirm to delete this user: %s"
-msgstr "Potwierdź usunięcie tego użytkownika: %s"
-
-#: rhodecode/templates/email_templates/changeset_comment.html:4
-#: rhodecode/templates/email_templates/pull_request.html:4
-#: rhodecode/templates/email_templates/pull_request_comment.html:4
-msgid "URL"
-msgstr "Adres URL"
+#: rhodecode/templates/data_table/_dt_elements.html:141
+msgid "Creating"
+msgstr ""
 
 #: rhodecode/templates/email_templates/changeset_comment.html:6
 #, python-format
 msgid "%s commented on a %s changeset."
 msgstr "%s komentarzy %s zestawów zmian."
 
-#: rhodecode/templates/email_templates/changeset_comment.html:14
+#: rhodecode/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
 msgstr "Status zestawienia zmian został zmieniony na"
 
@@ -4032,9 +5055,9 @@
 msgstr "%s zgłosił wniosek połączenia w repozytorium %s i chce żeby sprawdzić zmiany."
 
 #: rhodecode/templates/email_templates/pull_request.html:8
-#: rhodecode/templates/pullrequests/pullrequest.html:34
+#: rhodecode/templates/pullrequests/pullrequest.html:31
 #: rhodecode/templates/pullrequests/pullrequest_data.html:14
-#: rhodecode/templates/pullrequests/pullrequest_show.html:25
+#: rhodecode/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr "Tytuł"
 
@@ -4055,77 +5078,85 @@
 msgid "View this user here"
 msgstr "Zobacz tego użytkownika tutaj"
 
-#: rhodecode/templates/errors/error_document.html:55
+#: rhodecode/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr "Zostaniesz przekierowany do %s za %s sekund"
 
+#: rhodecode/templates/files/diff_2way.html:15
+#, python-format
+msgid "%s File side-by-side diff"
+msgstr "Pliki z listą zmian i różnic: %s"
+
+#: rhodecode/templates/files/diff_2way.html:22
+#: rhodecode/templates/files/file_diff.html:11
+msgid "File diff"
+msgstr "Pliki różnic"
+
+#: rhodecode/templates/files/diff_2way.html:58
+msgid "ignore white space"
+msgstr "ignoruj spacje"
+
+#: rhodecode/templates/files/diff_2way.html:59
+msgid "turn on edit mode"
+msgstr "włączyć tryb edycji"
+
 #: rhodecode/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr "%s Pliki różnic"
 
-#: rhodecode/templates/files/file_diff.html:8
-msgid "File diff"
-msgstr "Pliki różnic"
-
 #: rhodecode/templates/files/files.html:4
-#: rhodecode/templates/files/files.html:76
+#: rhodecode/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr "Pliki %s"
 
-#: rhodecode/templates/files/files.html:30
-#: rhodecode/templates/files/files_add.html:31
-#: rhodecode/templates/files/files_edit.html:31
-msgid "Branch"
-msgstr "gałąź"
-
 #: rhodecode/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr "Pliki %s"
 
-#: rhodecode/templates/files/files_add.html:19
-msgid "Add file"
-msgstr "Dodaj plik"
-
-#: rhodecode/templates/files/files_add.html:43
-msgid "File Name"
-msgstr "Nazwa Pliku"
-
-#: rhodecode/templates/files/files_add.html:47
-#: rhodecode/templates/files/files_add.html:56
-msgid "or"
-msgstr "lub"
-
-#: rhodecode/templates/files/files_add.html:47
-#: rhodecode/templates/files/files_add.html:52
-msgid "Upload file"
-msgstr "Dodaj plik"
-
-#: rhodecode/templates/files/files_add.html:56
-msgid "Create new file"
-msgstr "Utwórz nowy plik"
-
-#: rhodecode/templates/files/files_add.html:61
-#: rhodecode/templates/files/files_edit.html:37
+#: rhodecode/templates/files/files_add.html:25
+msgid "Add new file"
+msgstr "Dodaj nowy plik"
+
+#: rhodecode/templates/files/files_add.html:45
+#: rhodecode/templates/files/files_edit.html:43
 #: rhodecode/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "Położenie"
 
-#: rhodecode/templates/files/files_add.html:65
-msgid "use / to separate directories"
-msgstr "Użyj / do oddzielenia katalogów"
-
-#: rhodecode/templates/files/files_add.html:79
-#: rhodecode/templates/files/files_edit.html:65
+#: rhodecode/templates/files/files_add.html:47
+msgid "Enter filename..."
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:49
+#: rhodecode/templates/files/files_add.html:53
+msgid "or"
+msgstr "lub"
+
+#: rhodecode/templates/files/files_add.html:49
+msgid "Upload File"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:53
+msgid "Create New File"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:58
+msgid "New file mode"
+msgstr "Nowy tryb pliku"
+
+#: rhodecode/templates/files/files_add.html:69
+#: rhodecode/templates/files/files_delete.html:57
+#: rhodecode/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr "Zatwierdź zmiany"
 
 #: rhodecode/templates/files/files_browser.html:13
-msgid "View"
-msgstr "Widok"
+msgid "revision"
+msgstr "rewizja"
 
 #: rhodecode/templates/files/files_browser.html:14
 msgid "Previous revision"
@@ -4135,82 +5166,80 @@
 msgid "Next revision"
 msgstr "następna wersja"
 
-#: rhodecode/templates/files/files_browser.html:23
+#: rhodecode/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr "Obserwuj aktualną gałąź"
 
-#: rhodecode/templates/files/files_browser.html:27
-msgid "Search file list"
-msgstr "Lista szukanych plików"
-
-#: rhodecode/templates/files/files_browser.html:35
+#: rhodecode/templates/files/files_browser.html:25
+msgid "Search File List"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr "Wczytywanie listy plików..."
 
-#: rhodecode/templates/files/files_browser.html:48
+#: rhodecode/templates/files/files_browser.html:42
 msgid "Size"
 msgstr "Rozmiar"
 
-#: rhodecode/templates/files/files_browser.html:49
+#: rhodecode/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr "Typ MIME"
 
-#: rhodecode/templates/files/files_browser.html:50
+#: rhodecode/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr "Rewizja"
 
-#: rhodecode/templates/files/files_browser.html:51
+#: rhodecode/templates/files/files_browser.html:45
 msgid "Last modified"
 msgstr "Ostatnio modyfikowany"
 
-#: rhodecode/templates/files/files_browser.html:52
+#: rhodecode/templates/files/files_browser.html:46
 msgid "Last committer"
 msgstr "Autor"
 
+#: rhodecode/templates/files/files_delete.html:4
+#, python-format
+msgid "%s Files Delete"
+msgstr "%s Usuń Plik"
+
+#: rhodecode/templates/files/files_delete.html:25
+#: rhodecode/templates/files/files_delete.html:45
+msgid "Delete file"
+msgstr "Usuń plik"
+
 #: rhodecode/templates/files/files_edit.html:4
 #, python-format
-msgid "%s Files Edit"
-msgstr "Pliki %s"
-
-#: rhodecode/templates/files/files_edit.html:19
+msgid "%s File Edit"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:25
 msgid "Edit file"
 msgstr "Edytuj plik"
 
-#: rhodecode/templates/files/files_edit.html:47
-#: rhodecode/templates/files/files_source.html:23
-msgid "Show annotation"
-msgstr "pokaż adnotacje"
-
-#: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:26
-msgid "Download as raw"
-msgstr "Pobierz jako raw"
-
-#: rhodecode/templates/files/files_edit.html:52
+#: rhodecode/templates/files/files_edit.html:53
+#: rhodecode/templates/files/files_source.html:32
+msgid "Show Annotation"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:55
+#: rhodecode/templates/files/files_source.html:35
+msgid "Download as Raw"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:58
 msgid "Source"
 msgstr "Źródło"
 
-#: rhodecode/templates/files/files_edit.html:57
+#: rhodecode/templates/files/files_edit.html:63
 msgid "Editing file"
 msgstr "Edycja pliku"
 
+#: rhodecode/templates/files/files_edit.html:68
+msgid "Commit Message"
+msgstr ""
+
 #: rhodecode/templates/files/files_history_box.html:2
-msgid "History"
-msgstr "Historia"
-
-#: rhodecode/templates/files/files_history_box.html:9
-msgid "Diff to revision"
-msgstr "Różnice do rewizji"
-
-#: rhodecode/templates/files/files_history_box.html:10
-msgid "Show at revision"
-msgstr "Wskaż zmiany"
-
-#: rhodecode/templates/files/files_history_box.html:11
-msgid "Show full history"
-msgstr "Pokaż pełną historię"
-
-#: rhodecode/templates/files/files_history_box.html:16
 #, python-format
 msgid "%s author"
 msgid_plural "%s authors"
@@ -4218,33 +5247,49 @@
 msgstr[1] "%s autorzy"
 msgstr[2] "%s autorzy"
 
-#: rhodecode/templates/files/files_source.html:6
-msgid "Load file history"
-msgstr "Załaduj historię pliku"
-
-#: rhodecode/templates/files/files_source.html:21
-msgid "Show source"
+#: rhodecode/templates/files/files_source.html:7
+msgid "Diff to Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:8
+msgid "Show at Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:10
+msgid "Show Full History"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:11
+msgid "Show Authors"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:30
+msgid "Show Source"
 msgstr "Pokaż źródło"
 
-#: rhodecode/templates/files/files_source.html:29
-#, python-format
-msgid "Edit on branch:%s"
-msgstr "Usunięta gałąź: %s"
-
-#: rhodecode/templates/files/files_source.html:31
-msgid "Edit on branch:?"
-msgstr "Usunięta gałąź: %s"
-
-#: rhodecode/templates/files/files_source.html:31
+#: rhodecode/templates/files/files_source.html:38
+#, python-format
+msgid "Edit on Branch:%s"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:41
+msgid "Editing binary files not allowed"
+msgstr "Edycja plików binarnych jest zabroniona"
+
+#: rhodecode/templates/files/files_source.html:44
 msgid "Editing files allowed only when on branch head revision"
 msgstr "Edycja plików dozwolona tylko wtedy, gdy rewizja jest w trakcie rewizji głównej gałęzi"
 
-#: rhodecode/templates/files/files_source.html:46
+#: rhodecode/templates/files/files_source.html:45
+msgid "Deleting files allowed only when on branch head revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:61
 #, python-format
 msgid "Binary file (%s)"
 msgstr "Plik binarny (%s)"
 
-#: rhodecode/templates/files/files_source.html:55
+#: rhodecode/templates/files/files_source.html:71
 msgid "File is too big to display"
 msgstr "Plik jest za duży do wyświetlenia"
 
@@ -4252,11 +5297,11 @@
 msgid "annotation"
 msgstr "adnotacja"
 
-#: rhodecode/templates/files/files_ypjax.html:15
-msgid "Go back"
-msgstr "Idź wstecz"
-
-#: rhodecode/templates/files/files_ypjax.html:16
+#: rhodecode/templates/files/files_ypjax.html:23
+msgid "Go Back"
+msgstr "Wróć"
+
+#: rhodecode/templates/files/files_ypjax.html:24
 msgid "No files at given path"
 msgstr "Brak plików w danej ścieżce"
 
@@ -4265,9 +5310,9 @@
 msgid "%s Followers"
 msgstr "Obserwatorzy %s"
 
-#: rhodecode/templates/followers/followers.html:9
-#: rhodecode/templates/summary/summary.html:183
-#: rhodecode/templates/summary/summary.html:184
+#: rhodecode/templates/followers/followers.html:12
+#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/templates/summary/summary.html:150
 msgid "Followers"
 msgstr "Obserwuje"
 
@@ -4277,45 +5322,45 @@
 
 #: rhodecode/templates/forks/fork.html:5
 #, python-format
-msgid "%s Fork"
-msgstr "Gałęzi %s"
-
-#: rhodecode/templates/forks/fork.html:28
+msgid "Fork repository %s"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:30
 msgid "Fork name"
 msgstr "Nazwa rozgałęzienia"
 
-#: rhodecode/templates/forks/fork.html:65
+#: rhodecode/templates/forks/fork.html:71
 msgid "Private"
 msgstr "Prywatny"
 
-#: rhodecode/templates/forks/fork.html:74
+#: rhodecode/templates/forks/fork.html:80
 msgid "Copy permissions"
 msgstr "Skopiuj uprawnienia"
 
-#: rhodecode/templates/forks/fork.html:78
+#: rhodecode/templates/forks/fork.html:84
 msgid "Copy permissions from forked repository"
 msgstr "Skopiuj zezwolenia z rozwidlenia repozytorium"
 
-#: rhodecode/templates/forks/fork.html:84
+#: rhodecode/templates/forks/fork.html:90
 msgid "Update after clone"
 msgstr "Aktualizuj po klonowaniu"
 
-#: rhodecode/templates/forks/fork.html:88
+#: rhodecode/templates/forks/fork.html:94
 msgid "Checkout source after making a clone"
 msgstr "Sprawdź źródło po wykonaniu klonowania"
 
-#: rhodecode/templates/forks/fork.html:93
-msgid "Fork this repository"
-msgstr "Gałąź tego repozytorium"
+#: rhodecode/templates/forks/fork.html:99
+msgid "Fork this Repository"
+msgstr ""
 
 #: rhodecode/templates/forks/forks.html:5
 #, python-format
 msgid "%s Forks"
-msgstr "Gałęzi %s"
-
-#: rhodecode/templates/forks/forks.html:9
-#: rhodecode/templates/summary/summary.html:189
-#: rhodecode/templates/summary/summary.html:190
+msgstr "Gałąź %s"
+
+#: rhodecode/templates/forks/forks.html:12
+#: rhodecode/templates/summary/summary.html:155
+#: rhodecode/templates/summary/summary.html:156
 msgid "Forks"
 msgstr "Gałęzie"
 
@@ -4327,41 +5372,32 @@
 msgid "There are no forks yet"
 msgstr "Nie ma jeszcze gałęzi"
 
-#: rhodecode/templates/journal/journal.html:21
+#: rhodecode/templates/journal/journal.html:24
 msgid "ATOM journal feed"
 msgstr "Dziennik kanału ATOM"
 
-#: rhodecode/templates/journal/journal.html:22
+#: rhodecode/templates/journal/journal.html:25
 msgid "RSS journal feed"
 msgstr "Dziennik kanału RSS"
 
-#: rhodecode/templates/journal/journal.html:32
-msgid "Refresh"
-msgstr "Odśwież"
-
-#: rhodecode/templates/journal/journal.html:35
-#: rhodecode/templates/journal/public_journal.html:24
-msgid "ATOM feed"
-msgstr "Kanał ATOM"
-
-#: rhodecode/templates/journal/journal.html:51
-msgid "Watched"
-msgstr "Obserwowane"
+#: rhodecode/templates/journal/journal.html:57
+msgid "My repos"
+msgstr "Moje repo"
 
 #: rhodecode/templates/journal/journal_data.html:55
 msgid "No entries yet"
 msgstr "Brak wpisów jeszcze"
 
 #: rhodecode/templates/journal/public_journal.html:4
-#: rhodecode/templates/journal/public_journal.html:21
+#: rhodecode/templates/journal/public_journal.html:24
 msgid "Public Journal"
 msgstr "Dziennik Publiczny"
 
-#: rhodecode/templates/journal/public_journal.html:13
+#: rhodecode/templates/journal/public_journal.html:16
 msgid "ATOM public journal feed"
 msgstr "Publiczny dziennik kanału ATOM"
 
-#: rhodecode/templates/journal/public_journal.html:14
+#: rhodecode/templates/journal/public_journal.html:17
 msgid "RSS public journal feed"
 msgstr "Publiczny dziennik kanału RSS"
 
@@ -4370,46 +5406,42 @@
 msgid "New pull request"
 msgstr "Nowa prośba o połączenie gałęzi"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:25
-msgid "Create new pull request"
-msgstr "Stwórz nowe żądanie połączenia gałęzi"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:47
+#: rhodecode/templates/pullrequests/pullrequest.html:44
 msgid "Write a short description on this pull request"
 msgstr "Napisz krótki opis tego tego połączenia gałęzi"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:53
+#: rhodecode/templates/pullrequests/pullrequest.html:50
 msgid "Changeset flow"
 msgstr "Przepływ zestawienia zmian"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:60
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+#: rhodecode/templates/pullrequests/pullrequest.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:68
 msgid "Origin repository"
 msgstr "Repozytorium git"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:85
-msgid "Send pull request"
-msgstr "Wyślij prośbę o połączenie gałęzi"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:94
-#: rhodecode/templates/pullrequests/pullrequest_show.html:137
+#: rhodecode/templates/pullrequests/pullrequest.html:82
+msgid "Send Pull Request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:91
+#: rhodecode/templates/pullrequests/pullrequest_show.html:104
 msgid "Pull request reviewers"
 msgstr "Recenzje wniosków połączenia gałęzi"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:103
-#: rhodecode/templates/pullrequests/pullrequest_show.html:149
+#: rhodecode/templates/pullrequests/pullrequest.html:100
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
 msgid "owner"
 msgstr "właściciel"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:115
+#: rhodecode/templates/pullrequests/pullrequest.html:114
 msgid "Add reviewer to this pull request."
 msgstr "Pokarz wszystkie zmiany"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:129
+#: rhodecode/templates/pullrequests/pullrequest.html:128
 msgid "Detailed compare view"
 msgstr "Szczegółowe porównanie widoku"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:150
+#: rhodecode/templates/pullrequests/pullrequest.html:149
 msgid "Destination repository"
 msgstr "Repozytorium docelowe"
 
@@ -4418,19 +5450,20 @@
 msgid "%s Pull Request #%s"
 msgstr "%s Połączonych gałęzi #%s"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:35
+#: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Review status"
 msgstr "Nowy status"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:40
-msgid "Pull request status"
-msgstr "Żądanie statusu połączenia gałęzi"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:53
+#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:43
+msgid "Pull request status calculated from votes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:56
 msgid "Still not reviewed by"
 msgstr "Nie ma jeszcze recenzenta"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:60
 #, python-format
 msgid "%d reviewer"
 msgid_plural "%d reviewers"
@@ -4438,61 +5471,91 @@
 msgstr[1] "%d recenzenci"
 msgstr[2] "%d recenzentów"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:59
+#: rhodecode/templates/pullrequests/pullrequest_show.html:62
 msgid "Pull request was reviewed by all reviewers"
 msgstr "Połączenie gałęzi zostało zweryfikowane przez wszystkich recenzentów"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:89
-msgid "Created on"
-msgstr "Utworzono"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:102
+#: rhodecode/templates/pullrequests/pullrequest_show.html:77
+#: rhodecode/templates/pullrequests/pullrequest_show.html:79
+msgid "Pull changes"
+msgstr "Pobierz zmiany"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
+msgid "reviewer"
+msgstr "recenzent"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:133
+msgid "Add or remove reviewer to this pull request."
+msgstr "Pokarz wszystkie zmiany"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:137
+msgid "Save Changes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "Compare view"
 msgstr "Wyświetl porównanie"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:149
-msgid "reviewer"
-msgstr "recenzent"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:164
-msgid "Add or remove reviewer to this pull request."
-msgstr "Pokarz wszystkie zmiany"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:168
-msgid "Save changes"
-msgstr "Bez zmian"
-
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
 #, python-format
 msgid "%s Pull Requests"
 msgstr "%s Moje prośby połączenia gałęzi"
 
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
+#, python-format
+msgid "Pull requests from %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:14
+#, python-format
+msgid "Pull requests to %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:38
+#, python-format
+msgid "Show pull requests to %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:40
+#, python-format
+msgid "Show pull requests from %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:50
+msgid "Hide closed pull requests"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:52
+msgid "Show closed pull requests too"
+msgstr ""
+
 #: rhodecode/templates/search/search.html:6
-msgid "Search repository"
-msgstr "Szukaj w repozytorium: %s"
+#, python-format
+msgid "%s Search"
+msgstr ""
 
 #: rhodecode/templates/search/search.html:8
-#: rhodecode/templates/search/search.html:16
+#: rhodecode/templates/search/search.html:19
 msgid "Search in all repositories"
 msgstr "Szukaj we wszystkich repozytoriach"
 
-#: rhodecode/templates/search/search.html:50
+#: rhodecode/templates/search/search.html:53
 msgid "Search term"
 msgstr "Szukana fraza"
 
-#: rhodecode/templates/search/search.html:62
+#: rhodecode/templates/search/search.html:65
 msgid "Search in"
 msgstr "Szukaj w"
 
-#: rhodecode/templates/search/search.html:65
+#: rhodecode/templates/search/search.html:68
 msgid "File contents"
 msgstr "Zawartość pliku"
 
-#: rhodecode/templates/search/search.html:66
+#: rhodecode/templates/search/search.html:69
 msgid "Commit messages"
 msgstr "Komunikaty"
 
-#: rhodecode/templates/search/search.html:67
+#: rhodecode/templates/search/search.html:70
 msgid "File names"
 msgstr "Nazwy plików"
 
@@ -4502,6 +5565,75 @@
 msgid "Permission denied"
 msgstr "Brak uprawnień"
 
+#: rhodecode/templates/summary/statistics.html:4
+#, python-format
+msgid "%s Statistics"
+msgstr "%s Statystyki"
+
+#: rhodecode/templates/summary/statistics.html:19
+#: rhodecode/templates/summary/summary.html:42
+#, python-format
+msgid "%s ATOM feed"
+msgstr "%s ATOM"
+
+#: rhodecode/templates/summary/statistics.html:20
+#: rhodecode/templates/summary/summary.html:43
+#, python-format
+msgid "%s RSS feed"
+msgstr "%s RSS"
+
+#: rhodecode/templates/summary/statistics.html:39
+#: rhodecode/templates/summary/summary.html:107
+#: rhodecode/templates/summary/summary.html:123
+msgid "Enable"
+msgstr "Włącz"
+
+#: rhodecode/templates/summary/statistics.html:42
+msgid "Stats gathered: "
+msgstr "Statystyki zebrane: "
+
+#: rhodecode/templates/summary/statistics.html:91
+#: rhodecode/templates/summary/summary.html:354
+msgid "files"
+msgstr "pliki"
+
+#: rhodecode/templates/summary/statistics.html:115
+#: rhodecode/templates/summary/summary.html:378
+msgid "Show more"
+msgstr "Pokaż więcej"
+
+#: rhodecode/templates/summary/statistics.html:392
+msgid "commits"
+msgstr "komunikaty"
+
+#: rhodecode/templates/summary/statistics.html:393
+msgid "files added"
+msgstr "pliki dodane"
+
+#: rhodecode/templates/summary/statistics.html:394
+msgid "files changed"
+msgstr "pliki zmienione"
+
+#: rhodecode/templates/summary/statistics.html:395
+msgid "files removed"
+msgstr "pliki usunięte"
+
+#: rhodecode/templates/summary/statistics.html:397
+msgid "commit"
+msgstr "komunikaty"
+
+#: rhodecode/templates/summary/statistics.html:398
+msgid "file added"
+msgstr "plik dodany"
+
+#: rhodecode/templates/summary/statistics.html:399
+msgid "file changed"
+msgstr "plik zmieniony"
+
+#: rhodecode/templates/summary/statistics.html:400
+msgid "file removed"
+msgstr "plik usunięty"
+
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
 msgid "%s Summary"
@@ -4509,170 +5641,85 @@
 
 #: rhodecode/templates/summary/summary.html:16
 #, python-format
-msgid "%s ATOM feed"
-msgstr "%s ATOM"
-
-#: rhodecode/templates/summary/summary.html:17
-#, python-format
-msgid "%s RSS feed"
-msgstr "%s RSS"
-
-#: rhodecode/templates/summary/summary.html:62
-#, python-format
 msgid "Repository locked by %s"
 msgstr "Repozytorium zablokowane przez %s"
 
-#: rhodecode/templates/summary/summary.html:64
+#: rhodecode/templates/summary/summary.html:18
 msgid "Repository unlocked"
 msgstr "Repozytorium odblokowane"
 
-#: rhodecode/templates/summary/summary.html:83
-#, python-format
-msgid "Non changable ID %s"
-msgstr "Brak ID pełnej zmiany %s"
-
-#: rhodecode/templates/summary/summary.html:88
-msgid "Public"
-msgstr "Publiczny"
-
-#: rhodecode/templates/summary/summary.html:88
-#: rhodecode/templates/summary/summary.html:89
-msgid "Fork of"
-msgstr "Gałąź z"
-
-#: rhodecode/templates/summary/summary.html:97
-msgid "Remote clone"
-msgstr "zdalne klonowanie"
-
-#: rhodecode/templates/summary/summary.html:117
-msgid "Contact"
-msgstr "Kontakt"
-
-#: rhodecode/templates/summary/summary.html:131
+#: rhodecode/templates/summary/summary.html:76
 msgid "Clone url"
 msgstr "Url klonowania"
 
-#: rhodecode/templates/summary/summary.html:136
+#: rhodecode/templates/summary/summary.html:81
 msgid "Show by Name"
 msgstr "Pokaż nazwę"
 
-#: rhodecode/templates/summary/summary.html:137
+#: rhodecode/templates/summary/summary.html:82
 msgid "Show by ID"
 msgstr "Pokaż ID"
 
-#: rhodecode/templates/summary/summary.html:143
+#: rhodecode/templates/summary/summary.html:99
 msgid "Trending files"
 msgstr "Statystyki"
 
-#: rhodecode/templates/summary/summary.html:151
-#: rhodecode/templates/summary/summary.html:167
-msgid "Enable"
-msgstr "Włącz"
-
-#: rhodecode/templates/summary/summary.html:159
+#: rhodecode/templates/summary/summary.html:115
 msgid "Download"
 msgstr "Pobierz"
 
-#: rhodecode/templates/summary/summary.html:163
+#: rhodecode/templates/summary/summary.html:119
 msgid "There are no downloads yet"
 msgstr "Nie pobrano jeszcze plików"
 
-#: rhodecode/templates/summary/summary.html:165
+#: rhodecode/templates/summary/summary.html:121
 msgid "Downloads are disabled for this repository"
 msgstr "Pliki do pobrania są zostały wyłączone dla tego repozytorium"
 
-#: rhodecode/templates/summary/summary.html:170
+#: rhodecode/templates/summary/summary.html:127
 msgid "Download as zip"
 msgstr "Pobierz jako zip"
 
-#: rhodecode/templates/summary/summary.html:174
+#: rhodecode/templates/summary/summary.html:132
 msgid "Check this to download archive with subrepos"
 msgstr "Zaznacz tu żeby pobrać archiwum z subrepozytorium"
 
-#: rhodecode/templates/summary/summary.html:174
+#: rhodecode/templates/summary/summary.html:132
 msgid "with subrepos"
 msgstr "z subrepozytorium"
 
-#: rhodecode/templates/summary/summary.html:197
+#: rhodecode/templates/summary/summary.html:163
 msgid "Repository Size"
 msgstr "Rozmiar Repozytorium"
 
-#: rhodecode/templates/summary/summary.html:204
-#: rhodecode/templates/summary/summary.html:206
+#: rhodecode/templates/summary/summary.html:170
+#: rhodecode/templates/summary/summary.html:172
 msgid "Feed"
 msgstr "Kanał RSS"
 
-#: rhodecode/templates/summary/summary.html:224
-msgid "Commit activity by day / author"
-msgstr "komunikaty aktywne w ciągu dnia / autor"
-
-#: rhodecode/templates/summary/summary.html:232
-msgid "enable"
-msgstr "włącz"
-
-#: rhodecode/templates/summary/summary.html:235
-msgid "Stats gathered: "
-msgstr "Statystyki zebrane: "
-
-#: rhodecode/templates/summary/summary.html:256
+#: rhodecode/templates/summary/summary.html:193
 msgid "Latest changes"
 msgstr "Ostatnia aktywność"
 
-#: rhodecode/templates/summary/summary.html:258
+#: rhodecode/templates/summary/summary.html:195
 msgid "Quick start"
 msgstr "Szybki start"
 
-#: rhodecode/templates/summary/summary.html:272
-#, python-format
-msgid "Readme file from revision %s"
-msgstr "Plik Readme z wersji %s"
-
-#: rhodecode/templates/summary/summary.html:332
+#: rhodecode/templates/summary/summary.html:209
+#, python-format
+msgid "Readme file from revision %s:%s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:299
 #, python-format
 msgid "Download %s as %s"
 msgstr "Pobierz %s jak %s"
 
-#: rhodecode/templates/summary/summary.html:379
-msgid "files"
-msgstr "pliki"
-
-#: rhodecode/templates/summary/summary.html:689
-msgid "commits"
-msgstr "komunikaty"
-
-#: rhodecode/templates/summary/summary.html:690
-msgid "files added"
-msgstr "pliki dodane"
-
-#: rhodecode/templates/summary/summary.html:691
-msgid "files changed"
-msgstr "pliki zmienione"
-
-#: rhodecode/templates/summary/summary.html:692
-msgid "files removed"
-msgstr "pliki usunięte"
-
-#: rhodecode/templates/summary/summary.html:694
-msgid "commit"
-msgstr "komunikaty"
-
-#: rhodecode/templates/summary/summary.html:695
-msgid "file added"
-msgstr "plik dodany"
-
-#: rhodecode/templates/summary/summary.html:696
-msgid "file changed"
-msgstr "plik zmieniony"
-
-#: rhodecode/templates/summary/summary.html:697
-msgid "file removed"
-msgstr "plik usunięty"
-
 #: rhodecode/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr "Etykiety pliku %s"
 
-#: rhodecode/templates/tags/tags.html:26
+#: rhodecode/templates/tags/tags.html:29
 msgid "Compare tags"
 msgstr "Porównaj tagi"
--- a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po	Wed Jul 02 19:03:19 2014 -0400
+++ b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po	Wed Jul 02 19:03:20 2014 -0400
@@ -1,5 +1,5 @@
 # Translations template for RhodeCode.
-# Copyright (C) 2013 Marcin Kuzminski RhodeCode
+# Copyright (C) 2014 RhodeCode GmbH
 # This file is distributed under the same license as the RhodeCode project.
 # Translators:
 # Augusto Herrmann <augusto.herrmann@gmail.com>, 2012
@@ -7,10 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: RhodeCode\n"
-"Report-Msgid-Bugs-To: marcin@maq.io\n"
-"POT-Creation-Date: 2013-06-05 19:55+0200\n"
-"PO-Revision-Date: 2013-06-04 20:47+0000\n"
-"Last-Translator: gnustavo <gustavo@gnustavo.com>\n"
+"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
+"POT-Creation-Date: 2014-02-13 15:30+0100\n"
+"PO-Revision-Date: 2014-02-13 14:34+0000\n"
+"Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/RhodeCode/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,1297 +19,1644 @@
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: rhodecode/controllers/changelog.py:149
+#: rhodecode/controllers/changelog.py:88 rhodecode/controllers/compare.py:88
+#: rhodecode/controllers/pullrequests.py:263
+msgid "There are no changesets yet"
+msgstr "Não há nenhum changeset ainda"
+
+#: rhodecode/controllers/changelog.py:184
 msgid "All Branches"
 msgstr "Todos os Ramos"
 
-#: rhodecode/controllers/changeset.py:84
+#: rhodecode/controllers/changelog.py:187
+msgid "(closed)"
+msgstr "(fechado)"
+
+#: rhodecode/controllers/changeset.py:85
 msgid "Show white space"
 msgstr "Mostrar espaços em branco"
 
-#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
+#: rhodecode/controllers/changeset.py:92 rhodecode/controllers/changeset.py:99
 msgid "Ignore white space"
 msgstr "Ignorar espaços em branco"
 
-#: rhodecode/controllers/changeset.py:164
-#, python-format
-msgid "%s line context"
-msgstr "contexto de %s linhas"
-
-#: rhodecode/controllers/changeset.py:345
-#: rhodecode/controllers/pullrequests.py:478
+#: rhodecode/controllers/changeset.py:165
+#, python-format
+msgid "increase diff context to %(num)s lines"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:207 rhodecode/controllers/files.py:96
+#: rhodecode/controllers/files.py:119
+msgid "Such revision does not exist for this repository"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:353
+#: rhodecode/controllers/pullrequests.py:480
 #, python-format
 msgid "Status change -> %s"
 msgstr "Mudança de estado -> %s"
 
-#: rhodecode/controllers/changeset.py:376
+#: rhodecode/controllers/changeset.py:384
 msgid ""
 "Changing status on a changeset associated with a closed pull request is not "
 "allowed"
 msgstr "Mudar o estado de um changeset associado a um pull request não é permitido"
 
-#: rhodecode/controllers/compare.py:74
-#: rhodecode/controllers/pullrequests.py:256
-msgid "There are no changesets yet"
-msgstr "Não há nenhum changeset ainda"
-
-#: rhodecode/controllers/error.py:69
+#: rhodecode/controllers/compare.py:192 rhodecode/templates/base/root.html:67
+msgid "Select changeset"
+msgstr ""
+
+#: rhodecode/controllers/error.py:70
 msgid "Home page"
 msgstr "Página inicial"
 
-#: rhodecode/controllers/error.py:98
+#: rhodecode/controllers/error.py:99
 msgid ""
 "The request could not be understood by the server due to malformed syntax."
 msgstr "A requisição não pôde ser compreendida pelo servidor devido à sintaxe mal formada."
 
-#: rhodecode/controllers/error.py:101
+#: rhodecode/controllers/error.py:102
 msgid "Unauthorized access to resource"
 msgstr "Acesso não autorizado ao recurso"
 
-#: rhodecode/controllers/error.py:103
+#: rhodecode/controllers/error.py:104
 msgid "You don't have permission to view this page"
 msgstr "Você não tem permissão para ver esta página"
 
-#: rhodecode/controllers/error.py:105
+#: rhodecode/controllers/error.py:106
 msgid "The resource could not be found"
 msgstr "O recurso não pôde ser encontrado"
 
-#: rhodecode/controllers/error.py:107
+#: rhodecode/controllers/error.py:108
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr "O servidor encontrou uma condição inesperada que o impediu de satisfazer a requisição."
 
-#: rhodecode/controllers/feed.py:52
+#: rhodecode/controllers/feed.py:53
 #, python-format
 msgid "Changes on %s repository"
 msgstr "Modificações no repositório %s"
 
-#: rhodecode/controllers/feed.py:53
+#: rhodecode/controllers/feed.py:54
 #, python-format
 msgid "%s %s feed"
 msgstr "%s - feed %s"
 
-#: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/controllers/feed.py:87
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr "Conjunto de mudanças era grande demais e foi cortado..."
 
-#: rhodecode/controllers/feed.py:90
+#: rhodecode/controllers/feed.py:91
 #, python-format
 msgid "%s committed on %s"
 msgstr "%s commitados em %s"
 
-#: rhodecode/controllers/files.py:89
+#: rhodecode/controllers/files.py:90
 msgid "Click here to add new file"
 msgstr "Clique aqui para adicionar um novo arquivo"
 
-#: rhodecode/controllers/files.py:90
-#, python-format
-msgid "There are no files yet %s"
-msgstr "Ainda não há arquivos %s"
-
-#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339
+#: rhodecode/controllers/files.py:91
+#, python-format
+msgid "There are no files yet. %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:299 rhodecode/controllers/files.py:359
+#: rhodecode/controllers/files.py:426
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr "Este repositório foi travado por %s em %s"
 
-#: rhodecode/controllers/files.py:283
+#: rhodecode/controllers/files.py:311
+msgid "You can only delete files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:322
+#, python-format
+msgid "Deleted file %s via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:344
+#, python-format
+msgid "Successfully deleted file %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:348 rhodecode/controllers/files.py:414
+#: rhodecode/controllers/files.py:496
+msgid "Error occurred during commit"
+msgstr "Ocorreu um erro ao realizar commit"
+
+#: rhodecode/controllers/files.py:371
 msgid "You can only edit files with revision being a valid branch "
 msgstr "Só é possível editar arquivos quando a revisão é um ramo válido"
 
-#: rhodecode/controllers/files.py:297
+#: rhodecode/controllers/files.py:385
 #, python-format
 msgid "Edited file %s via RhodeCode"
 msgstr "Arquivo %s editado via RhodeCode"
 
-#: rhodecode/controllers/files.py:313
+#: rhodecode/controllers/files.py:401
 msgid "No changes"
 msgstr "Sem modificações"
 
-#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394
+#: rhodecode/controllers/files.py:410 rhodecode/controllers/files.py:485
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Commit realizado com sucesso para %s"
 
-#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405
-msgid "Error occurred during commit"
-msgstr "Ocorreu um erro ao realizar commit"
-
-#: rhodecode/controllers/files.py:351
+#: rhodecode/controllers/files.py:438
 msgid "Added file via RhodeCode"
 msgstr "Arquivo adicionado via RhodeCode"
 
-#: rhodecode/controllers/files.py:368
+#: rhodecode/controllers/files.py:459
 msgid "No content"
 msgstr "Nenhum conteúdo"
 
-#: rhodecode/controllers/files.py:372
+#: rhodecode/controllers/files.py:463
 msgid "No filename"
 msgstr "Nenhum nome de arquivo"
 
-#: rhodecode/controllers/files.py:397
+#: rhodecode/controllers/files.py:488
 msgid "Location must be relative path and must not contain .. in path"
 msgstr "O caminho deve ser relativo e não pode conter .."
 
-#: rhodecode/controllers/files.py:431
+#: rhodecode/controllers/files.py:522
 msgid "Downloads disabled"
 msgstr "Downloads desabilitados"
 
-#: rhodecode/controllers/files.py:442
+#: rhodecode/controllers/files.py:533
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Revisão desconhecida %s"
 
-#: rhodecode/controllers/files.py:444
+#: rhodecode/controllers/files.py:535
 msgid "Empty repository"
 msgstr "Repositório vazio"
 
-#: rhodecode/controllers/files.py:446
+#: rhodecode/controllers/files.py:537
 msgid "Unknown archive type"
 msgstr "Tipo de arquivo desconhecido"
 
-#: rhodecode/controllers/files.py:631
-#: rhodecode/templates/changeset/changeset_range.html:9
+#: rhodecode/controllers/files.py:773
+#: rhodecode/templates/changeset/changeset_range.html:12
 #: rhodecode/templates/email_templates/pull_request.html:12
-#: rhodecode/templates/pullrequests/pullrequest.html:124
+#: rhodecode/templates/pullrequests/pullrequest.html:123
 msgid "Changesets"
 msgstr "Conjuntos de mudanças"
 
-#: rhodecode/controllers/files.py:632
-#: rhodecode/controllers/pullrequests.py:149
-#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682
+#: rhodecode/controllers/files.py:774
+#: rhodecode/controllers/pullrequests.py:158
+#: rhodecode/controllers/summary.py:74 rhodecode/model/scm.py:816
 #: rhodecode/templates/switch_to_list.html:3
-#: rhodecode/templates/branches/branches.html:10
+#: rhodecode/templates/branches/branches.html:13
 msgid "Branches"
 msgstr "Ramos"
 
-#: rhodecode/controllers/files.py:633
-#: rhodecode/controllers/pullrequests.py:150
-#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693
-#: rhodecode/templates/switch_to_list.html:15
-#: rhodecode/templates/tags/tags.html:10
+#: rhodecode/controllers/files.py:775
+#: rhodecode/controllers/pullrequests.py:159
+#: rhodecode/controllers/summary.py:75 rhodecode/model/scm.py:827
+#: rhodecode/templates/switch_to_list.html:25
+#: rhodecode/templates/tags/tags.html:13
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: rhodecode/controllers/forks.py:176
-#, python-format
-msgid "Forked repository %s as %s"
-msgstr "Repositório %s bifurcado como %s"
-
-#: rhodecode/controllers/forks.py:190
+#: rhodecode/controllers/forks.py:189
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "Ocorreu um erro ao bifurcar o repositório %s"
 
-#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153
+#: rhodecode/controllers/home.py:81
+msgid "Groups"
+msgstr ""
+
+#: rhodecode/controllers/home.py:86
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:106
+#: rhodecode/templates/admin/repos/repo_add.html:15
+#: rhodecode/templates/admin/repos/repo_add.html:19
+#: rhodecode/templates/admin/users/user_edit_advanced.html:6
+#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:87
+#: rhodecode/templates/base/base.html:136
+#: rhodecode/templates/base/base.html:389
+#: rhodecode/templates/base/base.html:560
+msgid "Repositories"
+msgstr "Repositórios"
+
+#: rhodecode/controllers/home.py:127 rhodecode/templates/files/files.html:33
+#: rhodecode/templates/files/files_add.html:37
+#: rhodecode/templates/files/files_delete.html:37
+#: rhodecode/templates/files/files_edit.html:37
+msgid "Branch"
+msgstr "Ramo"
+
+#: rhodecode/controllers/home.py:133
+msgid "Tag"
+msgstr ""
+
+#: rhodecode/controllers/home.py:139
+msgid "Bookmark"
+msgstr ""
+
+#: rhodecode/controllers/journal.py:112 rhodecode/controllers/journal.py:155
 msgid "public journal"
 msgstr "diário público"
 
-#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157
-#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/controllers/journal.py:116 rhodecode/controllers/journal.py:159
+#: rhodecode/templates/journal/journal.html:15
 msgid "journal"
 msgstr "diário"
 
-#: rhodecode/controllers/login.py:138
+#: rhodecode/controllers/login.py:185 rhodecode/controllers/login.py:230
+msgid "bad captcha"
+msgstr ""
+
+#: rhodecode/controllers/login.py:191
 msgid "You have successfully registered into RhodeCode"
 msgstr "Você foi registrado no RhodeCode com sucesso"
 
-#: rhodecode/controllers/login.py:159
+#: rhodecode/controllers/login.py:235
 msgid "Your password reset link was sent"
 msgstr "Seu link de reinicialização de senha foi enviado"
 
-#: rhodecode/controllers/login.py:179
+#: rhodecode/controllers/login.py:255
 msgid ""
 "Your password reset was successful, new password has been sent to your email"
 msgstr "Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao seu e-mail"
 
-#: rhodecode/controllers/pullrequests.py:136
-#: rhodecode/templates/changeset/changeset.html:10
-#: rhodecode/templates/email_templates/changeset_comment.html:8
+#: rhodecode/controllers/pullrequests.py:138
+#: rhodecode/templates/changeset/changeset.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:15
 msgid "Changeset"
 msgstr "Conjunto de Mudanças"
 
-#: rhodecode/controllers/pullrequests.py:146
+#: rhodecode/controllers/pullrequests.py:155
 msgid "Special"
 msgstr "Especial"
 
-#: rhodecode/controllers/pullrequests.py:147
+#: rhodecode/controllers/pullrequests.py:156
 msgid "Peer branches"
 msgstr "Ramos pares"
 
-#: rhodecode/controllers/pullrequests.py:148 rhodecode/model/scm.py:688
-#: rhodecode/templates/switch_to_list.html:28
-#: rhodecode/templates/bookmarks/bookmarks.html:10
+#: rhodecode/controllers/pullrequests.py:157 rhodecode/model/scm.py:822
+#: rhodecode/templates/switch_to_list.html:38
+#: rhodecode/templates/bookmarks/bookmarks.html:13
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: rhodecode/controllers/pullrequests.py:321
+#: rhodecode/controllers/pullrequests.py:328
 msgid "Pull request requires a title with min. 3 chars"
 msgstr "O pull request requer um título com no mínimo três caracteres"
 
-#: rhodecode/controllers/pullrequests.py:323
-msgid "Error creating pull request"
-msgstr "Erro criando um pull request"
-
-#: rhodecode/controllers/pullrequests.py:343
+#: rhodecode/controllers/pullrequests.py:330
+#, python-format
+msgid "Error creating pull request: %s"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:352
 msgid "Successfully opened new pull request"
 msgstr "Novo pull request criado com sucesso"
 
-#: rhodecode/controllers/pullrequests.py:346
+#: rhodecode/controllers/pullrequests.py:355
 msgid "Error occurred during sending pull request"
 msgstr "Ocorreu um erro durante o envio do pull request"
 
-#: rhodecode/controllers/pullrequests.py:385
+#: rhodecode/controllers/pullrequests.py:395
 msgid "Successfully deleted pull request"
 msgstr "Pull request excluído com sucesso"
 
-#: rhodecode/controllers/pullrequests.py:481
+#: rhodecode/controllers/pullrequests.py:483
 msgid "Closing with"
 msgstr "Fechando com"
 
-#: rhodecode/controllers/pullrequests.py:518
+#: rhodecode/controllers/pullrequests.py:520
 msgid ""
 "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr "Não é permitido fechar um pull request em um estado diferente de rejeitado ou aprovado"
 
-#: rhodecode/controllers/search.py:132
+#: rhodecode/controllers/search.py:133
 msgid "Invalid search query. Try quoting it."
 msgstr "Consulta de busca inválida. Tente usar aspas."
 
-#: rhodecode/controllers/search.py:137
+#: rhodecode/controllers/search.py:138
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr "Não há índice onde pesquisa. Por favor execute o indexador whoosh"
 
-#: rhodecode/controllers/search.py:141
+#: rhodecode/controllers/search.py:142
 msgid "An error occurred during this search operation"
 msgstr "Ocorreu um erro durante essa operação de busca"
 
-#: rhodecode/controllers/summary.py:182
+#: rhodecode/controllers/summary.py:201
 msgid "No data loaded yet"
 msgstr "Ainda não há dados carregados"
 
-#: rhodecode/controllers/summary.py:188
-#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/controllers/summary.py:204
+#: rhodecode/templates/summary/summary.html:105
 msgid "Statistics are disabled for this repository"
 msgstr "As estatísticas estão desabillitadas para este repositório"
 
-#: rhodecode/controllers/admin/defaults.py:96
+#: rhodecode/controllers/admin/auth_settings.py:125
+msgid "Auth settings updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/auth_settings.py:136
+msgid "error occurred during update of auth settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/defaults.py:95
 msgid "Default settings updated successfully"
 msgstr "Configurações padrão atualizadas com sucesso"
 
-#: rhodecode/controllers/admin/defaults.py:110
+#: rhodecode/controllers/admin/defaults.py:109
 msgid "Error occurred during update of defaults"
 msgstr "Ocorreu um erro durnge a atualização dos padrões"
 
-#: rhodecode/controllers/admin/gists.py:56
+#: rhodecode/controllers/admin/gists.py:58
+#: rhodecode/controllers/admin/my_account.py:255
+#: rhodecode/controllers/admin/users.py:287
 msgid "forever"
 msgstr "para sempre"
 
-#: rhodecode/controllers/admin/gists.py:57
+#: rhodecode/controllers/admin/gists.py:59
+#: rhodecode/controllers/admin/my_account.py:256
+#: rhodecode/controllers/admin/users.py:288
 msgid "5 minutes"
 msgstr "cinco minutos"
 
-#: rhodecode/controllers/admin/gists.py:58
+#: rhodecode/controllers/admin/gists.py:60
+#: rhodecode/controllers/admin/my_account.py:257
+#: rhodecode/controllers/admin/users.py:289
 msgid "1 hour"
 msgstr "uma hora"
 
-#: rhodecode/controllers/admin/gists.py:59
+#: rhodecode/controllers/admin/gists.py:61
+#: rhodecode/controllers/admin/my_account.py:258
+#: rhodecode/controllers/admin/users.py:290
 msgid "1 day"
 msgstr "um dia"
 
-#: rhodecode/controllers/admin/gists.py:60
+#: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/my_account.py:259
+#: rhodecode/controllers/admin/users.py:291
 msgid "1 month"
 msgstr "um mês"
 
-#: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/gists.py:66
+#: rhodecode/controllers/admin/my_account.py:261
+#: rhodecode/controllers/admin/users.py:293
 msgid "Lifetime"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:127
+#: rhodecode/controllers/admin/gists.py:145
 msgid "Error occurred during gist creation"
 msgstr "Ocorreu um erro durante a criação de um gist"
 
-#: rhodecode/controllers/admin/gists.py:165
+#: rhodecode/controllers/admin/gists.py:183
 #, python-format
 msgid "Deleted gist %s"
 msgstr "Gist %s excluído"
 
-#: rhodecode/controllers/admin/ldap_settings.py:50
-msgid "BASE"
-msgstr "BASE"
-
-#: rhodecode/controllers/admin/ldap_settings.py:51
-msgid "ONELEVEL"
-msgstr "UMNÍVEL"
-
-#: rhodecode/controllers/admin/ldap_settings.py:52
-msgid "SUBTREE"
-msgstr "SUBÁRVORE"
-
-#: rhodecode/controllers/admin/ldap_settings.py:56
-msgid "NEVER"
-msgstr "NUNCA"
-
-#: rhodecode/controllers/admin/ldap_settings.py:57
-msgid "ALLOW"
-msgstr "PERMITIR"
-
-#: rhodecode/controllers/admin/ldap_settings.py:58
-msgid "TRY"
-msgstr "TENTAR"
-
-#: rhodecode/controllers/admin/ldap_settings.py:59
-msgid "DEMAND"
-msgstr "EXIGIR"
-
-#: rhodecode/controllers/admin/ldap_settings.py:60
-msgid "HARD"
-msgstr "DIFÍCIL"
-
-#: rhodecode/controllers/admin/ldap_settings.py:64
-msgid "No encryption"
-msgstr "Sem criptografia"
-
-#: rhodecode/controllers/admin/ldap_settings.py:65
-msgid "LDAPS connection"
-msgstr "Conexão LDAPS"
-
-#: rhodecode/controllers/admin/ldap_settings.py:66
-msgid "START_TLS on LDAP connection"
-msgstr "START_TLS na conexão LDAP"
-
-#: rhodecode/controllers/admin/ldap_settings.py:124
-msgid "LDAP settings updated successfully"
-msgstr "Configurações de LDAP atualizadas com sucesso"
-
-#: rhodecode/controllers/admin/ldap_settings.py:128
-msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
-msgstr "Não foi possível ativar LDAP. A biblioteca \"python-ldap\" está faltando."
-
-#: rhodecode/controllers/admin/ldap_settings.py:145
-msgid "Error occurred during update of ldap settings"
-msgstr "Ocorreu um erro durante a atualização das configurações de LDAP"
-
-#: rhodecode/controllers/admin/permissions.py:58
-#: rhodecode/controllers/admin/permissions.py:62
-#: rhodecode/controllers/admin/permissions.py:66
-msgid "None"
-msgstr "Nenhum"
-
-#: rhodecode/controllers/admin/permissions.py:59
-#: rhodecode/controllers/admin/permissions.py:63
-#: rhodecode/controllers/admin/permissions.py:67
-msgid "Read"
-msgstr "Ler"
+#: rhodecode/controllers/admin/gists.py:232
+msgid "unmodified"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:261
+msgid "Successfully updated gist content"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:266
+msgid "Successfully updated gist data"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:269
+#, python-format
+msgid "Error occurred during update of gist %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:68
+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/my_account.py:125
+msgid "Your account was updated successfully"
+msgstr "Sua conta foi atualizada com sucesso"
+
+#: rhodecode/controllers/admin/my_account.py:139
+#: rhodecode/controllers/admin/users.py:205
+#, python-format
+msgid "Error occurred during update of user %s"
+msgstr "Ocorreu um erro durante a atualização do usuário %s"
+
+#: rhodecode/controllers/admin/my_account.py:159
+msgid "Successfully updated password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:169
+msgid "Error occurred during update of user password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:211
+#: rhodecode/controllers/admin/users.py:430
+#, python-format
+msgid "Added email %s to user"
+msgstr "Email %s adicionado ao usuário"
+
+#: rhodecode/controllers/admin/my_account.py:217
+#: rhodecode/controllers/admin/users.py:436
+msgid "An error occurred during email saving"
+msgstr "Ocorreu um erro durante o salvamento do email"
+
+#: rhodecode/controllers/admin/my_account.py:226
+#: rhodecode/controllers/admin/users.py:447
+msgid "Removed email from user"
+msgstr "Email removido do usuário"
+
+#: rhodecode/controllers/admin/my_account.py:272
+#: rhodecode/controllers/admin/users.py:313
+msgid "Api key successfully created"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:284
+#: rhodecode/controllers/admin/users.py:329
+msgid "Api key successfully reset"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:288
+#: rhodecode/controllers/admin/users.py:333
+msgid "Api key successfully deleted"
+msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:60
 #: rhodecode/controllers/admin/permissions.py:64
 #: rhodecode/controllers/admin/permissions.py:68
-msgid "Write"
-msgstr "Gravar"
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:104
+msgid "None"
+msgstr "Nenhum"
 
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
 #: rhodecode/controllers/admin/permissions.py:69
-#: rhodecode/templates/admin/defaults/defaults.html:9
-#: rhodecode/templates/admin/ldap/ldap.html:9
-#: rhodecode/templates/admin/permissions/permissions.html:9
-#: rhodecode/templates/admin/repos/repo_add.html:10
-#: rhodecode/templates/admin/repos/repo_add.html:14
-#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:9
-#: rhodecode/templates/admin/users/user_add.html:8
-#: rhodecode/templates/admin/users/user_edit.html:9
-#: rhodecode/templates/admin/users/user_edit.html:133
-#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/admin/users_groups/users_group_add.html:8
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:9
-#: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:317
-#: rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:325
+msgid "Read"
+msgstr "Ler"
+
+#: rhodecode/controllers/admin/permissions.py:62
+#: rhodecode/controllers/admin/permissions.py:66
+#: rhodecode/controllers/admin/permissions.py:70
+msgid "Write"
+msgstr "Gravar"
+
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
+#: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/templates/admin/auth/auth_settings.html:12
+#: rhodecode/templates/admin/defaults/defaults.html:12
+#: rhodecode/templates/admin/permissions/permissions.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:17
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/settings/settings.html:12
+#: rhodecode/templates/admin/user_groups/user_group_add.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+#: rhodecode/templates/admin/users/user_add.html:11
+#: rhodecode/templates/admin/users/user_edit.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:114
+#: rhodecode/templates/admin/users/users.html:13
+#: rhodecode/templates/admin/users/users.html:58
+#: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:340
+#: rhodecode/templates/base/base.html:346
+#: rhodecode/templates/base/base.html:347
 msgid "Admin"
 msgstr "Administrador"
 
-#: rhodecode/controllers/admin/permissions.py:72
-#: rhodecode/controllers/admin/permissions.py:83
-#: rhodecode/controllers/admin/permissions.py:86
-#: rhodecode/controllers/admin/permissions.py:89
-#: rhodecode/controllers/admin/permissions.py:92
-msgid "Disabled"
-msgstr "Desabilitado"
-
 #: rhodecode/controllers/admin/permissions.py:74
+#: rhodecode/controllers/admin/permissions.py:85
+#: rhodecode/controllers/admin/permissions.py:90
+#: rhodecode/controllers/admin/permissions.py:93
+#: rhodecode/controllers/admin/permissions.py:96
+#: rhodecode/controllers/admin/permissions.py:99
+msgid "Disabled"
+msgstr "Desabilitado"
+
+#: rhodecode/controllers/admin/permissions.py:76
 msgid "Allowed with manual account activation"
 msgstr "Permitido com ativação manual de conta"
 
-#: rhodecode/controllers/admin/permissions.py:76
+#: rhodecode/controllers/admin/permissions.py:78
 msgid "Allowed with automatic account activation"
 msgstr "Permitido com ativação automática de conta"
 
-#: rhodecode/controllers/admin/permissions.py:79
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444
+#: rhodecode/controllers/admin/permissions.py:81
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1485
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1542
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1564
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1603
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1655
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1682 rhodecode/model/db.py:1692
 msgid "Manual activation of external account"
 msgstr "Ativação manual de conta externa"
 
-#: rhodecode/controllers/admin/permissions.py:80
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445
+#: rhodecode/controllers/admin/permissions.py:82
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1486
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1565
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1604
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1656
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1683 rhodecode/model/db.py:1693
 msgid "Automatic activation of external account"
 msgstr "Ativação automática de conta externa"
 
-#: rhodecode/controllers/admin/permissions.py:84
-#: rhodecode/controllers/admin/permissions.py:87
-#: rhodecode/controllers/admin/permissions.py:90
-#: rhodecode/controllers/admin/permissions.py:93
+#: rhodecode/controllers/admin/permissions.py:86
+#: rhodecode/controllers/admin/permissions.py:89
+#: rhodecode/controllers/admin/permissions.py:94
+#: rhodecode/controllers/admin/permissions.py:97
+#: rhodecode/controllers/admin/permissions.py:100
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: rhodecode/controllers/admin/permissions.py:138
-msgid "Default permissions updated successfully"
-msgstr "Permissões padrões atualizadas com sucesso"
-
-#: rhodecode/controllers/admin/permissions.py:152
+#: rhodecode/controllers/admin/permissions.py:123
+msgid "Global permissions updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:137
 msgid "Error occurred during update of permissions"
 msgstr "Ocorreu um erro durante a atualização das permissões"
 
-#: rhodecode/controllers/admin/repos.py:128
-msgid "--REMOVE FORK--"
-msgstr "--REMOVER BIFURCAÇÂO--"
-
-#: rhodecode/controllers/admin/repos.py:168
+#: rhodecode/controllers/admin/repo_groups.py:184
+#, python-format
+msgid "Created repository group %s"
+msgstr "Grupo de repositórios %s criado"
+
+#: rhodecode/controllers/admin/repo_groups.py:196
+#, python-format
+msgid "Error occurred during creation of repository group %s"
+msgstr "Ocorreu um erro durante a criação do grupo de repositórios %s"
+
+#: rhodecode/controllers/admin/repo_groups.py:254
+#, python-format
+msgid "Updated repository group %s"
+msgstr "Grupo de repositórios %s atualizado"
+
+#: rhodecode/controllers/admin/repo_groups.py:269
+#, python-format
+msgid "Error occurred during update of repository group %s"
+msgstr "Ocorreu um erro durante a atualização do grupo de repositórios %s"
+
+#: rhodecode/controllers/admin/repo_groups.py:287
+#, python-format
+msgid "This group contains %s repositores and cannot be deleted"
+msgstr "Esse grupo contém %s repositórios e não pode ser excluído"
+
+#: rhodecode/controllers/admin/repo_groups.py:294
+#, python-format
+msgid "This group contains %s subgroups and cannot be deleted"
+msgstr "Este grupo contém %s subgrupos e não pode ser excluído"
+
+#: rhodecode/controllers/admin/repo_groups.py:300
+#, python-format
+msgid "Removed repository group %s"
+msgstr "Grupo de repositórios %s excluído"
+
+#: rhodecode/controllers/admin/repo_groups.py:305
+#, python-format
+msgid "Error occurred during deletion of repository group %s"
+msgstr "Ocorreu um erro durante a exclusão do grupo de repositórios %s"
+
+#: rhodecode/controllers/admin/repo_groups.py:417
+#: rhodecode/controllers/admin/repo_groups.py:452
+#: rhodecode/controllers/admin/user_groups.py:335
+msgid "Cannot revoke permission for yourself as admin"
+msgstr "Você não pode revocar sua própria permissão de administrador"
+
+#: rhodecode/controllers/admin/repo_groups.py:432
+msgid "Repository Group permissions updated"
+msgstr "Permissões atualizadas do Grupo de Repositórios"
+
+#: rhodecode/controllers/admin/repo_groups.py:469
+#: rhodecode/controllers/admin/repos.py:424
+#: rhodecode/controllers/admin/user_groups.py:347
+msgid "An error occurred during revoking of permission"
+msgstr "Ocorreu um erro durante a revocação das permissões"
+
+#: rhodecode/controllers/admin/repos.py:160
+#, python-format
+msgid "Error creating repository %s"
+msgstr "Erro ao criar repositório %s"
+
+#: rhodecode/controllers/admin/repos.py:235
 #, python-format
 msgid "Created repository %s from %s"
 msgstr "Repositório %s criado de %s"
 
-#: rhodecode/controllers/admin/repos.py:174
+#: rhodecode/controllers/admin/repos.py:244
+#, python-format
+msgid "Forked repository %s as %s"
+msgstr "Repositório %s bifurcado como %s"
+
+#: rhodecode/controllers/admin/repos.py:247
 #, python-format
 msgid "Created repository %s"
 msgstr "Repositório %s criado"
 
-#: rhodecode/controllers/admin/repos.py:197
-#, python-format
-msgid "Error creating repository %s"
-msgstr "Erro ao criar repositório %s"
-
-#: rhodecode/controllers/admin/repos.py:270
+#: rhodecode/controllers/admin/repos.py:287
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "Repositório %s atualizado com sucesso"
 
-#: rhodecode/controllers/admin/repos.py:288
+#: rhodecode/controllers/admin/repos.py:305
 #, python-format
 msgid "Error occurred during update of repository %s"
 msgstr "Ocorreu um erro durante a atualização do repositório %s"
 
-#: rhodecode/controllers/admin/repos.py:315
+#: rhodecode/controllers/admin/repos.py:332
 #, python-format
 msgid "Detached %s forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:318
+#: rhodecode/controllers/admin/repos.py:335
 #, python-format
 msgid "Deleted %s forks"
 msgstr "%s bifurcações excluídas"
 
-#: rhodecode/controllers/admin/repos.py:323
+#: rhodecode/controllers/admin/repos.py:340
 #, python-format
 msgid "Deleted repository %s"
 msgstr "Repositório %s excluído"
 
-#: rhodecode/controllers/admin/repos.py:326
+#: rhodecode/controllers/admin/repos.py:343
 #, 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:331
+#: rhodecode/controllers/admin/repos.py:348
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "Ocorreu um erro durante a exclusão de %s"
 
-#: rhodecode/controllers/admin/repos.py:345
+#: rhodecode/controllers/admin/repos.py:400
 msgid "Repository permissions updated"
 msgstr "Permissões do repositório atualizadas"
 
-#: rhodecode/controllers/admin/repos.py:375
-#: rhodecode/controllers/admin/repos_groups.py:332
-#: rhodecode/controllers/admin/users_groups.py:312
-msgid "An error occurred during revoking of permission"
-msgstr "Ocorreu um erro durante a revocação das permissões"
-
-#: rhodecode/controllers/admin/repos.py:392
-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:409
-msgid "An error occurred during cache invalidation"
-msgstr "Ocorreu um erro ao invalidar o cache"
-
-#: rhodecode/controllers/admin/repos.py:429
 #: rhodecode/controllers/admin/repos.py:456
-msgid "An error occurred during unlocking"
-msgstr "Ocorreu um erro durante o destravamento"
-
-#: rhodecode/controllers/admin/repos.py:447
-msgid "Unlocked"
-msgstr "Destravado"
-
-#: rhodecode/controllers/admin/repos.py:450
-msgid "Locked"
-msgstr "Travado"
-
-#: rhodecode/controllers/admin/repos.py:452
-#, python-format
-msgid "Repository has been %s"
-msgstr "O repositório foi %s"
-
-#: rhodecode/controllers/admin/repos.py:476
+msgid "An error occurred during creation of field"
+msgstr "Ocorreu um erro durante a criação do campo"
+
+#: rhodecode/controllers/admin/repos.py:470
+msgid "An error occurred during removal of field"
+msgstr "Ocorreu um erro durante a remoção do campo"
+
+#: rhodecode/controllers/admin/repos.py:486
+msgid "-- Not a fork --"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:520
 msgid "Updated repository visibility in public journal"
 msgstr "Atualizada a visibilidade do repositório no diário público"
 
-#: rhodecode/controllers/admin/repos.py:480
+#: rhodecode/controllers/admin/repos.py:524
 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:485 rhodecode/model/validators.py:302
+#: rhodecode/controllers/admin/repos.py:529 rhodecode/model/validators.py:359
 msgid "Token mismatch"
 msgstr "Descompasso de Token"
 
-#: rhodecode/controllers/admin/repos.py:498
-msgid "Pulled from remote location"
-msgstr "Realizado pull de localização remota"
-
-#: rhodecode/controllers/admin/repos.py:501
-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:517
+#: rhodecode/controllers/admin/repos.py:544
 msgid "Nothing"
 msgstr "Nada"
 
-#: rhodecode/controllers/admin/repos.py:519
+#: rhodecode/controllers/admin/repos.py:546
 #, 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:523
+#: rhodecode/controllers/admin/repos.py:553
 msgid "An error occurred during this operation"
 msgstr "Ocorreu um erro durante essa operação"
 
-#: rhodecode/controllers/admin/repos.py:562
-msgid "An error occurred during creation of field"
-msgstr "Ocorreu um erro durante a criação do campo"
-
-#: rhodecode/controllers/admin/repos.py:576
-msgid "An error occurred during removal of field"
-msgstr "Ocorreu um erro durante a remoção do campo"
-
-#: rhodecode/controllers/admin/repos_groups.py:147
-#, python-format
-msgid "Created repository group %s"
-msgstr "Grupo de repositórios %s criado"
-
-#: rhodecode/controllers/admin/repos_groups.py:159
-#, python-format
-msgid "Error occurred during creation of repository group %s"
-msgstr "Ocorreu um erro durante a criação do grupo de repositórios %s"
-
-#: rhodecode/controllers/admin/repos_groups.py:217
-#, python-format
-msgid "Updated repository group %s"
-msgstr "Grupo de repositórios %s atualizado"
-
-#: rhodecode/controllers/admin/repos_groups.py:232
-#, python-format
-msgid "Error occurred during update of repository group %s"
-msgstr "Ocorreu um erro durante a atualização do grupo de repositórios %s"
-
-#: rhodecode/controllers/admin/repos_groups.py:250
-#, python-format
-msgid "This group contains %s repositores and cannot be deleted"
-msgstr "Esse grupo contém %s repositórios e não pode ser excluído"
-
-#: rhodecode/controllers/admin/repos_groups.py:257
-#, python-format
-msgid "This group contains %s subgroups and cannot be deleted"
-msgstr "Este grupo contém %s subgrupos e não pode ser excluído"
-
-#: rhodecode/controllers/admin/repos_groups.py:263
-#, python-format
-msgid "Removed repository group %s"
-msgstr "Grupo de repositórios %s excluído"
-
-#: rhodecode/controllers/admin/repos_groups.py:268
-#, python-format
-msgid "Error occurred during deletion of repository group %s"
-msgstr "Ocorreu um erro durante a exclusão do grupo de repositórios %s"
-
-#: rhodecode/controllers/admin/repos_groups.py:279
-#: rhodecode/controllers/admin/repos_groups.py:314
-#: rhodecode/controllers/admin/users_groups.py:300
-msgid "Cannot revoke permission for yourself as admin"
-msgstr "Você não pode revocar sua própria permissão de administrador"
-
-#: rhodecode/controllers/admin/repos_groups.py:294
-msgid "Repository Group permissions updated"
-msgstr "Permissões atualizadas do Grupo de Repositórios"
-
-#: rhodecode/controllers/admin/settings.py:123
+#: rhodecode/controllers/admin/repos.py:569
+msgid "Locked repository"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:572
+msgid "Unlocked repository"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:575
+#: rhodecode/controllers/admin/repos.py:602
+msgid "An error occurred during unlocking"
+msgstr "Ocorreu um erro durante o destravamento"
+
+#: rhodecode/controllers/admin/repos.py:593
+msgid "Unlocked"
+msgstr "Destravado"
+
+#: rhodecode/controllers/admin/repos.py:596
+msgid "Locked"
+msgstr "Travado"
+
+#: rhodecode/controllers/admin/repos.py:598
+#, python-format
+msgid "Repository has been %s"
+msgstr "O repositório foi %s"
+
+#: rhodecode/controllers/admin/repos.py:616
+msgid "Cache invalidation successful"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:620
+msgid "An error occurred during cache invalidation"
+msgstr "Ocorreu um erro ao invalidar o cache"
+
+#: rhodecode/controllers/admin/repos.py:635
+msgid "Pulled from remote location"
+msgstr "Realizado pull de localização remota"
+
+#: rhodecode/controllers/admin/repos.py:638
+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:671
+msgid "An error occurred during deletion of repository stats"
+msgstr "Ocorreu um erro ao excluir estatísticas de repositório"
+
+#: rhodecode/controllers/admin/settings.py:171
+msgid "Updated VCS settings"
+msgstr "Configurações de VCS atualizadas"
+
+#: rhodecode/controllers/admin/settings.py:175
+msgid ""
+"Unable to activate hgsubversion support. The \"hgsubversion\" library is "
+"missing"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:181
+#: rhodecode/controllers/admin/settings.py:273
+msgid "Error occurred during updating application settings"
+msgstr "Ocorreu um erro durante a atualização das configurações da aplicação"
+
+#: rhodecode/controllers/admin/settings.py:214
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr "Repositórios varridos com sucesso adicionados: %s ; removidos: %s"
 
-#: rhodecode/controllers/admin/settings.py:132
-msgid "Whoosh reindex task scheduled"
-msgstr "Tarefa de reindexação do whoosh agendada"
-
-#: rhodecode/controllers/admin/settings.py:163
+#: rhodecode/controllers/admin/settings.py:269
 msgid "Updated application settings"
 msgstr "Configurações da aplicação atualizadas"
 
-#: rhodecode/controllers/admin/settings.py:167
-#: rhodecode/controllers/admin/settings.py:304
-msgid "Error occurred during updating application settings"
-msgstr "Ocorreu um erro durante a atualização das configurações da aplicação"
-
-#: rhodecode/controllers/admin/settings.py:219
+#: rhodecode/controllers/admin/settings.py:326
 msgid "Updated visualisation settings"
 msgstr "Configurações de visualização atualizadas"
 
-#: rhodecode/controllers/admin/settings.py:224
+#: rhodecode/controllers/admin/settings.py:331
 msgid "Error occurred during updating visualisation settings"
 msgstr "Ocorreu um erro durante a atualização das configurações de visualização"
 
-#: rhodecode/controllers/admin/settings.py:300
-msgid "Updated VCS settings"
-msgstr "Configurações de VCS atualizadas"
-
-#: rhodecode/controllers/admin/settings.py:314
+#: rhodecode/controllers/admin/settings.py:357
+msgid "Please enter email address"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:369
+msgid "Send email task created"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:399
 msgid "Added new hook"
 msgstr "Adicionado novo gancho"
 
-#: rhodecode/controllers/admin/settings.py:326
+#: rhodecode/controllers/admin/settings.py:413
 msgid "Updated hooks"
 msgstr "Atualizados os ganchos"
 
-#: rhodecode/controllers/admin/settings.py:330
+#: rhodecode/controllers/admin/settings.py:417
 msgid "Error occurred during hook creation"
 msgstr "Ocorreu um erro durante a criação do hook"
 
-#: rhodecode/controllers/admin/settings.py:349
-msgid "Email task created"
-msgstr "Tarefa de e-mail criada"
-
-#: rhodecode/controllers/admin/settings.py:413
-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:455
-msgid "Your account was updated successfully"
-msgstr "Sua conta foi atualizada com sucesso"
-
-#: rhodecode/controllers/admin/settings.py:470
-#: rhodecode/controllers/admin/users.py:198
-#, python-format
-msgid "Error occurred during update of user %s"
-msgstr "Ocorreu um erro durante a atualização do usuário %s"
-
-#: rhodecode/controllers/admin/users.py:130
+#: rhodecode/controllers/admin/settings.py:443
+msgid "Whoosh reindex task scheduled"
+msgstr "Tarefa de reindexação do whoosh agendada"
+
+#: rhodecode/controllers/admin/settings.py:535
+msgid "Updated license information"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:540
+msgid "Error occurred during updating license info"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:563
+#, python-format
+msgid ""
+"Your license will expire on %s, please contact support to extend your "
+"license."
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:566
+#, python-format
+msgid ""
+"Your license has expired on %s, please contact support to extend your "
+"license."
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:571
+msgid ""
+"Unexpected error while reading license key. Please make sure your license "
+"token and key are correct"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:148
+#, python-format
+msgid "Created user group %s"
+msgstr "Grupo de usuários %s criado"
+
+#: rhodecode/controllers/admin/user_groups.py:159
+#, python-format
+msgid "Error occurred during creation of user group %s"
+msgstr "Ocorreu um erro durante a criação do grupo de usuários %s"
+
+#: rhodecode/controllers/admin/user_groups.py:197
+#, python-format
+msgid "Updated user group %s"
+msgstr "Grupo de usuários %s atualizado"
+
+#: rhodecode/controllers/admin/user_groups.py:219
+#, python-format
+msgid "Error occurred during update of user group %s"
+msgstr "Ocorreu um erro durante a atualização do grupo de usuários %s"
+
+#: rhodecode/controllers/admin/user_groups.py:237
+msgid "Successfully deleted user group"
+msgstr "Grupo de usuários excluído com sucesso"
+
+#: rhodecode/controllers/admin/user_groups.py:242
+msgid "An error occurred during deletion of user group"
+msgstr "Ocorreu um erro durante a exclusão do grupo de usuários"
+
+#: rhodecode/controllers/admin/user_groups.py:309
+msgid "Target group cannot be the same"
+msgstr "O grupo destino não pode ser o mesmo"
+
+#: rhodecode/controllers/admin/user_groups.py:315
+msgid "User Group permissions updated"
+msgstr "Permissões do Grupo de Usuários atualizadas"
+
+#: rhodecode/controllers/admin/user_groups.py:435
+#: rhodecode/controllers/admin/users.py:395
+msgid "Updated permissions"
+msgstr "Permissões atualizadas"
+
+#: rhodecode/controllers/admin/user_groups.py:439
+#: rhodecode/controllers/admin/users.py:399
+msgid "An error occurred during permissions saving"
+msgstr "Ocorreu um erro durante o salvamento das permissões"
+
+#: rhodecode/controllers/admin/users.py:133
 #, python-format
 msgid "Created user %s"
 msgstr "Usuário %s criado"
 
-#: rhodecode/controllers/admin/users.py:142
+#: rhodecode/controllers/admin/users.py:147
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr "Ocorreu um erro durante a criação do usuário %s"
 
-#: rhodecode/controllers/admin/users.py:176
+#: rhodecode/controllers/admin/users.py:186
 msgid "User updated successfully"
 msgstr "Usuário atualizado com sucesso"
 
-#: rhodecode/controllers/admin/users.py:214
+#: rhodecode/controllers/admin/users.py:221
 msgid "Successfully deleted user"
 msgstr "Usuário excluído com sucesso"
 
-#: rhodecode/controllers/admin/users.py:219
+#: rhodecode/controllers/admin/users.py:226
 msgid "An error occurred during deletion of user"
 msgstr "Ocorreu um erro ao excluir o usuário"
 
-#: rhodecode/controllers/admin/users.py:234
+#: rhodecode/controllers/admin/users.py:240
+#: rhodecode/controllers/admin/users.py:258
+#: rhodecode/controllers/admin/users.py:281
+#: rhodecode/controllers/admin/users.py:306
+#: rhodecode/controllers/admin/users.py:319
+#: rhodecode/controllers/admin/users.py:343
+#: rhodecode/controllers/admin/users.py:406
+#: rhodecode/controllers/admin/users.py:453
 msgid "You can't edit this user"
 msgstr "Você não pode editar esse usuário"
 
-#: rhodecode/controllers/admin/users.py:293
-#: rhodecode/controllers/admin/users_groups.py:372
-msgid "Updated permissions"
-msgstr "Permissões atualizadas"
-
-#: rhodecode/controllers/admin/users.py:297
-#: rhodecode/controllers/admin/users_groups.py:376
-msgid "An error occurred during permissions saving"
-msgstr "Ocorreu um erro durante o salvamento das permissões"
-
-#: rhodecode/controllers/admin/users.py:311
-#, python-format
-msgid "Added email %s to user"
-msgstr "Email %s adicionado ao usuário"
-
-#: rhodecode/controllers/admin/users.py:317
-msgid "An error occurred during email saving"
-msgstr "Ocorreu um erro durante o salvamento do email"
-
-#: rhodecode/controllers/admin/users.py:327
-msgid "Removed email from user"
-msgstr "Email removido do usuário"
-
-#: rhodecode/controllers/admin/users.py:340
-#, python-format
-msgid "Added ip %s to user"
-msgstr "IP %s adicionado ao usuário"
-
-#: rhodecode/controllers/admin/users.py:346
+#: rhodecode/controllers/admin/users.py:481
+#, python-format
+msgid "Added ip %s to user whitelist"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:487
 msgid "An error occurred during ip saving"
 msgstr "Ocorreu um erro durante o salvamento do IP"
 
-#: rhodecode/controllers/admin/users.py:358
-msgid "Removed ip from user"
-msgstr "IP removido do usuário"
-
-#: rhodecode/controllers/admin/users_groups.py:162
-#, python-format
-msgid "Created user group %s"
-msgstr "Grupo de usuários %s criado"
-
-#: rhodecode/controllers/admin/users_groups.py:173
-#, python-format
-msgid "Error occurred during creation of user group %s"
-msgstr "Ocorreu um erro durante a criação do grupo de usuários %s"
-
-#: rhodecode/controllers/admin/users_groups.py:210
-#, python-format
-msgid "Updated user group %s"
-msgstr "Grupo de usuários %s atualizado"
-
-#: rhodecode/controllers/admin/users_groups.py:232
-#, python-format
-msgid "Error occurred during update of user group %s"
-msgstr "Ocorreu um erro durante a atualização do grupo de usuários %s"
-
-#: rhodecode/controllers/admin/users_groups.py:250
-msgid "Successfully deleted user group"
-msgstr "Grupo de usuários excluído com sucesso"
-
-#: rhodecode/controllers/admin/users_groups.py:255
-msgid "An error occurred during deletion of user group"
-msgstr "Ocorreu um erro durante a exclusão do grupo de usuários"
-
-#: rhodecode/controllers/admin/users_groups.py:274
-msgid "Target group cannot be the same"
-msgstr "O grupo destino não pode ser o mesmo"
-
-#: rhodecode/controllers/admin/users_groups.py:280
-msgid "User Group permissions updated"
-msgstr "Permissões do Grupo de Usuários atualizadas"
-
-#: rhodecode/lib/auth.py:544
+#: rhodecode/controllers/admin/users.py:501
+msgid "Removed ip address from user whitelist"
+msgstr ""
+
+#: rhodecode/lib/auth.py:746
 #, python-format
 msgid "IP %s not allowed"
 msgstr "IP %s não permitido"
 
-#: rhodecode/lib/auth.py:593
+#: rhodecode/lib/auth.py:807
 msgid "You need to be a registered user to perform this action"
 msgstr "Você precisa ser um usuário registrado para realizar essa ação"
 
-#: rhodecode/lib/auth.py:634
+#: rhodecode/lib/auth.py:844
 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:66
+#: rhodecode/lib/diffs.py:64
 msgid "Binary file"
 msgstr "Arquivo binário"
 
-#: rhodecode/lib/diffs.py:82
+#: rhodecode/lib/diffs.py:80
 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:92
+#: rhodecode/lib/diffs.py:90
 msgid "No changes detected"
 msgstr "Nenhuma alteração detectada"
 
-#: rhodecode/lib/helpers.py:539
-msgid "True"
-msgstr "Verdadeiro"
-
-#: rhodecode/lib/helpers.py:542
-msgid "False"
-msgstr "Falso"
-
-#: rhodecode/lib/helpers.py:580
+#: rhodecode/lib/helpers.py:598
 #, python-format
 msgid "Deleted branch: %s"
 msgstr "Excluído ramo: %s"
 
-#: rhodecode/lib/helpers.py:583
+#: rhodecode/lib/helpers.py:601
 #, python-format
 msgid "Created tag: %s"
 msgstr "Tag criada: %s"
 
-#: rhodecode/lib/helpers.py:596
+#: rhodecode/lib/helpers.py:614
 msgid "Changeset not found"
 msgstr "Conjunto de alterações não encontrado"
 
-#: rhodecode/lib/helpers.py:646
+#: rhodecode/lib/helpers.py:664
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "Ver todos os conjuntos de mudanças combinados %s->%s"
 
-#: rhodecode/lib/helpers.py:652
+#: rhodecode/lib/helpers.py:670
 msgid "compare view"
 msgstr "comparar exibir"
 
-#: rhodecode/lib/helpers.py:672
+#: rhodecode/lib/helpers.py:690
 msgid "and"
 msgstr "e"
 
-#: rhodecode/lib/helpers.py:673
+#: rhodecode/lib/helpers.py:691
 #, python-format
 msgid "%s more"
 msgstr "%s mais"
 
-#: rhodecode/lib/helpers.py:674
-#: rhodecode/templates/changelog/changelog.html:53
+#: rhodecode/lib/helpers.py:692
+#: rhodecode/templates/changelog/changelog.html:58
 msgid "revisions"
 msgstr "revisões"
 
-#: rhodecode/lib/helpers.py:698
+#: rhodecode/lib/helpers.py:716
 #, python-format
 msgid "fork name %s"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:715
-#: rhodecode/templates/pullrequests/pullrequest_show.html:8
+msgstr "nome da bifurcação %s"
+
+#: rhodecode/lib/helpers.py:733
+#: rhodecode/templates/pullrequests/pullrequest_show.html:11
 #, python-format
 msgid "Pull request #%s"
 msgstr "Pull request #%s"
 
-#: rhodecode/lib/helpers.py:725
+#: rhodecode/lib/helpers.py:743
 msgid "[deleted] repository"
 msgstr "repositório [excluído]"
 
-#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739
+#: rhodecode/lib/helpers.py:745 rhodecode/lib/helpers.py:757
 msgid "[created] repository"
 msgstr "repositório [criado]"
 
-#: rhodecode/lib/helpers.py:729
+#: rhodecode/lib/helpers.py:747
 msgid "[created] repository as fork"
 msgstr "repositório [criado] como uma bifurcação"
 
-#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741
+#: rhodecode/lib/helpers.py:749 rhodecode/lib/helpers.py:759
 msgid "[forked] repository"
 msgstr "repositório [bifurcado]"
 
-#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743
+#: rhodecode/lib/helpers.py:751 rhodecode/lib/helpers.py:761
 msgid "[updated] repository"
 msgstr "repositório [atualizado]"
 
-#: rhodecode/lib/helpers.py:735
+#: rhodecode/lib/helpers.py:753
 msgid "[downloaded] archive from repository"
 msgstr "[baixado] archive do repositório"
 
-#: rhodecode/lib/helpers.py:737
+#: rhodecode/lib/helpers.py:755
 msgid "[delete] repository"
 msgstr "[excluir] repositório"
 
-#: rhodecode/lib/helpers.py:745
+#: rhodecode/lib/helpers.py:763
 msgid "[created] user"
 msgstr "usuário [criado]"
 
-#: rhodecode/lib/helpers.py:747
+#: rhodecode/lib/helpers.py:765
 msgid "[updated] user"
 msgstr "usuário [atualizado]"
 
-#: rhodecode/lib/helpers.py:749
+#: rhodecode/lib/helpers.py:767
 msgid "[created] user group"
 msgstr "[criado] grupo de usuários"
 
-#: rhodecode/lib/helpers.py:751
+#: rhodecode/lib/helpers.py:769
 msgid "[updated] user group"
 msgstr "[atualizado] grupo de usuários"
 
-#: rhodecode/lib/helpers.py:753
+#: rhodecode/lib/helpers.py:771
 msgid "[commented] on revision in repository"
 msgstr "[comentado] em revisão no repositório"
 
-#: rhodecode/lib/helpers.py:755
+#: rhodecode/lib/helpers.py:773
 msgid "[commented] on pull request for"
 msgstr "[comentado] no pull request para"
 
-#: rhodecode/lib/helpers.py:757
+#: rhodecode/lib/helpers.py:775
 msgid "[closed] pull request for"
 msgstr "[fechado] pull request para"
 
-#: rhodecode/lib/helpers.py:759
+#: rhodecode/lib/helpers.py:777
 msgid "[pushed] into"
 msgstr "[realizado push] para"
 
-#: rhodecode/lib/helpers.py:761
+#: rhodecode/lib/helpers.py:779
 msgid "[committed via RhodeCode] into repository"
 msgstr "[commitado via RhodeCode] no repositório"
 
-#: rhodecode/lib/helpers.py:763
+#: rhodecode/lib/helpers.py:781
 msgid "[pulled from remote] into repository"
 msgstr "[pulled do remote] no repositório"
 
-#: rhodecode/lib/helpers.py:765
+#: rhodecode/lib/helpers.py:783
 msgid "[pulled] from"
 msgstr "[realizado pull] a partir de"
 
-#: rhodecode/lib/helpers.py:767
+#: rhodecode/lib/helpers.py:785
 msgid "[started following] repository"
 msgstr "[passou a seguir] o repositório"
 
-#: rhodecode/lib/helpers.py:769
+#: rhodecode/lib/helpers.py:787
 msgid "[stopped following] repository"
 msgstr "[parou de seguir] o repositório"
 
-#: rhodecode/lib/helpers.py:1088
+#: rhodecode/lib/helpers.py:1102
 #, python-format
 msgid " and %s more"
 msgstr " e mais %s"
 
-#: rhodecode/lib/helpers.py:1092
+#: rhodecode/lib/helpers.py:1106
 msgid "No Files"
 msgstr "Nenhum Arquivo"
 
-#: rhodecode/lib/helpers.py:1158
+#: rhodecode/lib/helpers.py:1172
 msgid "new file"
 msgstr "novo arquivo"
 
-#: rhodecode/lib/helpers.py:1161
+#: rhodecode/lib/helpers.py:1175
 msgid "mod"
 msgstr "mod"
 
-#: rhodecode/lib/helpers.py:1164
+#: rhodecode/lib/helpers.py:1178
 msgid "del"
 msgstr "excluir"
 
-#: rhodecode/lib/helpers.py:1167
+#: rhodecode/lib/helpers.py:1181
 msgid "rename"
 msgstr "renomear"
 
-#: rhodecode/lib/helpers.py:1172
+#: rhodecode/lib/helpers.py:1186
 msgid "chmod"
 msgstr "chmod"
 
-#: rhodecode/lib/helpers.py:1404
+#: rhodecode/lib/helpers.py:1418
 #, 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 "O repositório %s não está mapeado ao BD. Talvez ele tenha sido criado ou renomeado a partir do sistema de arquivos. Por favor, execute a aplicação outra vez para varrer novamente por repositórios"
 
-#: rhodecode/lib/unionrepo.py:193
-msgid "cannot create new union repository"
-msgstr "não é possível criar novo repositório de união"
-
-#: rhodecode/lib/utils2.py:410
+#: rhodecode/lib/utils2.py:413
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d ano"
 msgstr[1] "%d anos"
 
-#: rhodecode/lib/utils2.py:411
+#: rhodecode/lib/utils2.py:414
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mês"
 msgstr[1] "%d meses"
 
-#: rhodecode/lib/utils2.py:412
+#: rhodecode/lib/utils2.py:415
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: rhodecode/lib/utils2.py:413
+#: rhodecode/lib/utils2.py:416
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: rhodecode/lib/utils2.py:414
+#: rhodecode/lib/utils2.py:417
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: rhodecode/lib/utils2.py:415
+#: rhodecode/lib/utils2.py:418
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: rhodecode/lib/utils2.py:431
+#: rhodecode/lib/utils2.py:434
 #, python-format
 msgid "in %s"
 msgstr "em %s"
 
-#: rhodecode/lib/utils2.py:433
+#: rhodecode/lib/utils2.py:436
 #, python-format
 msgid "%s ago"
 msgstr "%s atrás"
 
-#: rhodecode/lib/utils2.py:435
+#: rhodecode/lib/utils2.py:438
 #, python-format
 msgid "in %s and %s"
 msgstr "em %s e %s"
 
-#: rhodecode/lib/utils2.py:438
+#: rhodecode/lib/utils2.py:441
 #, python-format
 msgid "%s and %s ago"
 msgstr "%s e %s atrás"
 
-#: rhodecode/lib/utils2.py:441
+#: rhodecode/lib/utils2.py:444
 msgid "just now"
 msgstr "agora há pouco"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1454
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1511
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1572
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1622
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1649 rhodecode/model/db.py:1659
 msgid "Repository no access"
 msgstr "Nenhum acesso ao repositório"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1455
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1573
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1623
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1650 rhodecode/model/db.py:1660
 msgid "Repository read access"
 msgstr "Acesso de leitura ao repositório"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1456
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1574
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1651 rhodecode/model/db.py:1661
 msgid "Repository write access"
 msgstr "Acesso de escrita ao repositório"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1167
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1457
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1515
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1575
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1652 rhodecode/model/db.py:1662
 msgid "Repository admin access"
 msgstr "Acesso administrativo ao repositório"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308
 msgid "Repositories Group no access"
 msgstr "Nenhum acesso ao Grupo de Repositórios"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309
 msgid "Repositories Group read access"
 msgstr "Acesso de leitura ao Grupo de Repositórios"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310
 msgid "Repositories Group write access"
 msgstr "Acesso de escrita ao Grupo de Repositórios"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311
 msgid "Repositories Group admin access"
 msgstr "Acesso administrativo ao Grupo de Repositórios"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1452
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1509
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1510
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1570
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1620
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1647 rhodecode/model/db.py:1657
 msgid "RhodeCode Administrator"
 msgstr "Administrador do RhodeCode"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1475
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1532
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1554
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1593
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1670 rhodecode/model/db.py:1680
 msgid "Repository creation disabled"
 msgstr "Criação de repositórios desabilitada"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1476
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1555
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1594
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1671 rhodecode/model/db.py:1681
 msgid "Repository creation enabled"
 msgstr "Criação de repositórios habilitada"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1478
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1557
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1596
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1648
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1675 rhodecode/model/db.py:1685
 msgid "Repository forking disabled"
 msgstr "Bifurcação de repositórios desabilitada"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1479
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1537
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1558
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1597
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1649
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1676 rhodecode/model/db.py:1686
 msgid "Repository forking enabled"
 msgstr "Bifurcação de repositórios habilitada"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1403
 msgid "Register disabled"
 msgstr "Registro desabilitado"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1180
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1404
 msgid "Register new user with RhodeCode with manual activation"
 msgstr "Registro de novo usuário no RhodeCode com ativação manual"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1183
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1407
 msgid "Register new user with RhodeCode with auto activation"
 msgstr "Registro de novo usuário no RhodeCode com auto-ativação"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1651
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1980
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2040
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2062
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2101
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2154
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2200 rhodecode/model/db.py:2210
 msgid "Not Reviewed"
 msgstr "Não Revisado"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1652
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1981
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2063
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2102
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2155
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2201 rhodecode/model/db.py:2211
 msgid "Approved"
 msgstr "Aprovado"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1653
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1982
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2064
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2103
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2156
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2202 rhodecode/model/db.py:2212
 msgid "Rejected"
 msgstr "Rejeitado"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1654
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1983
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2044
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2065
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2104
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2157
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2203 rhodecode/model/db.py:2213
 msgid "Under Review"
 msgstr "Sob Revisão"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1300
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1357
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1358
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1379
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1471
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1498 rhodecode/model/db.py:1508
 msgid "top level"
-msgstr ""
+msgstr "nível superior"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1459
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1516
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1577
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1654 rhodecode/model/db.py:1664
 msgid "Repository group no access"
 msgstr "Sem acesso ao grupo de repositórios"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1460
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1578
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1628
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1655 rhodecode/model/db.py:1665
 msgid "Repository group read access"
 msgstr "Acesso de leitura ao grupo de repositórios"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1461
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1579
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1629
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1656 rhodecode/model/db.py:1666
 msgid "Repository group write access"
 msgstr "Acesso de escrita ao grupo de repositórios"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1462
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1520
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1580
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1630
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1657 rhodecode/model/db.py:1667
 msgid "Repository group admin access"
 msgstr "Acesso administrativo ao grupo de repositórios"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1464
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1521
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1582
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1632
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1659 rhodecode/model/db.py:1669
 msgid "User group no access"
 msgstr "Sem acesso ao grupo de usuários"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1465
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1583
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1633
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1660 rhodecode/model/db.py:1670
 msgid "User group read access"
 msgstr "Acesso de leitura ao grupo de usuários"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1466
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1545
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1584
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1634
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1661 rhodecode/model/db.py:1671
 msgid "User group write access"
 msgstr "Acesso de escrita ao grupo de usuários"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1467
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1525
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1546
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1585
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1635
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1662 rhodecode/model/db.py:1672
 msgid "User group admin access"
 msgstr "Acesso administrativo ao grupo de usuários"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1469
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1526
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1548
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1587
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1637
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1664 rhodecode/model/db.py:1674
 msgid "Repository Group creation disabled"
 msgstr "Criação de Grupo de Repositórios desatilibada"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1470
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1528
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1549
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1588
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1638
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1665 rhodecode/model/db.py:1675
 msgid "Repository Group creation enabled"
 msgstr "Criação de Grupo de Repositórios habilitada"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1472
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1529
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1551
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1590
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1640
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1667 rhodecode/model/db.py:1677
 msgid "User Group creation disabled"
 msgstr "Criação de Grupo de Usuários desabilitada"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1473
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1552
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1591
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1641
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1668 rhodecode/model/db.py:1678
 msgid "User Group creation enabled"
 msgstr "Criação de Grupo de Usuários habilitada"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1481
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1560
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1599
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1651
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1678 rhodecode/model/db.py:1688
 msgid "Registration disabled"
 msgstr "Registro desatilitado"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1482
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1561
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1600
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1652
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1679 rhodecode/model/db.py:1689
 msgid "User Registration with manual account activation"
 msgstr "Registro de Usuário com ativação manual de conta"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1483
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1562
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1601
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1653
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1680 rhodecode/model/db.py:1690
 msgid "User Registration with automatic account activation"
 msgstr "Registro de Usuário com ativação automática de conta"
 
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1672 rhodecode/model/db.py:1682
+msgid ""
+"Repository creation enabled with write permission to a repository group"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1673 rhodecode/model/db.py:1683
+msgid ""
+"Repository creation disabled with write permission to a repository group"
+msgstr ""
+
 #: rhodecode/model/comment.py:75
 #, python-format
 msgid "on line %s"
@@ -1319,470 +1666,487 @@
 msgid "[Mention]"
 msgstr "[Menção]"
 
-#: rhodecode/model/forms.py:43
+#: rhodecode/model/forms.py:57
 msgid "Please enter a login"
 msgstr "Por favor entre um login"
 
-#: rhodecode/model/forms.py:44
+#: rhodecode/model/forms.py:58
 #, 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:52
+#: rhodecode/model/forms.py:66
 msgid "Please enter a password"
 msgstr "Por favor entre com uma senha"
 
-#: rhodecode/model/forms.py:53
+#: rhodecode/model/forms.py:67
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr "Entre com %(min)i caracteres ou mais"
 
-#: rhodecode/model/notification.py:228
+#: rhodecode/model/forms.py:156
+msgid "Name must not contain only digits"
+msgstr ""
+
+#: rhodecode/model/notification.py:229
 #, python-format
 msgid "%(user)s commented on changeset at %(when)s"
 msgstr "%(user)s comentou no changeset em %(when)s"
 
-#: rhodecode/model/notification.py:229
+#: rhodecode/model/notification.py:230
 #, python-format
 msgid "%(user)s sent message at %(when)s"
 msgstr "%(user)s enviou mensagem em %(when)s"
 
-#: rhodecode/model/notification.py:230
+#: rhodecode/model/notification.py:231
 #, python-format
 msgid "%(user)s mentioned you at %(when)s"
 msgstr "%(user)s mencionou-o em %(when)s"
 
-#: rhodecode/model/notification.py:231
+#: rhodecode/model/notification.py:232
 #, python-format
 msgid "%(user)s registered in RhodeCode at %(when)s"
 msgstr "%(user)s registrou-se no RhodeCode em %(when)s"
 
-#: rhodecode/model/notification.py:232
+#: rhodecode/model/notification.py:233
 #, python-format
 msgid "%(user)s opened new pull request at %(when)s"
 msgstr "%(user)s abriu um novo pull request em %(when)s"
 
-#: rhodecode/model/notification.py:233
+#: rhodecode/model/notification.py:234
 #, python-format
 msgid "%(user)s commented on pull request at %(when)s"
 msgstr "%(user)s comentou no pull request em %(when)s"
 
-#: rhodecode/model/pull_request.py:98
+#: rhodecode/model/pull_request.py:105
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr "%(user)s solicita sua revisão no pull request $%(pr_id)s: %(pr_title)s"
 
-#: rhodecode/model/scm.py:674
+#: rhodecode/model/scm.py:808
 msgid "latest tip"
 msgstr "tip mais recente"
 
-#: rhodecode/model/user.py:232
+#: rhodecode/model/user.py:196
 msgid "New user registration"
 msgstr "Novo registro de usuário"
 
-#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
+#: rhodecode/model/user.py:220 rhodecode/model/user.py:245
 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:303
+#: rhodecode/model/user.py:268
 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:309
+#: rhodecode/model/user.py:274
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch owners "
 "or remove those repositories. %s"
 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/user.py:334
+#: rhodecode/model/user.py:302
 msgid "Password reset link"
 msgstr "Link para trocar senha"
 
-#: rhodecode/model/user.py:366
+#: rhodecode/model/user.py:331
 msgid "Your new password"
 msgstr "Sua nova senha"
 
-#: rhodecode/model/user.py:367
+#: rhodecode/model/user.py:332
 #, python-format
 msgid "Your new RhodeCode password:%s"
 msgstr "Sua nova senha no RhodeCode: %s"
 
-#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39
+#: rhodecode/model/validators.py:82 rhodecode/model/validators.py:83
 msgid "Value cannot be an empty list"
 msgstr "O valor não pode ser uma lista vazia"
 
-#: rhodecode/model/validators.py:85
+#: rhodecode/model/validators.py:120
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "O username \\\"%(username)s\\\" já existe"
 
-#: rhodecode/model/validators.py:87
+#: rhodecode/model/validators.py:122
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr "O username \\\"%(username)s\\\" é proibido"
 
-#: rhodecode/model/validators.py:89
+#: rhodecode/model/validators.py:124
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or "
 "dashes and must begin with alphanumeric character or underscore"
 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:117
+#: rhodecode/model/validators.py:151
+msgid "The input is not valid"
+msgstr ""
+
+#: rhodecode/model/validators.py:158
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr "O username \"%(username)s\" não é válido"
 
-#: rhodecode/model/validators.py:136
+#: rhodecode/model/validators.py:177
 msgid "Invalid user group name"
 msgstr "Nome inválido de grupo de usuários"
 
-#: rhodecode/model/validators.py:137
+#: rhodecode/model/validators.py:178
 #, python-format
 msgid "User group \"%(usergroup)s\" already exists"
 msgstr "O grupo de usuários \"%(usergroup)s\" já existe"
 
-#: rhodecode/model/validators.py:139
+#: rhodecode/model/validators.py:180
 msgid ""
 "user group name may only contain alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr "O nome de um grupo de usuários só pode conter characters alfa-numéricos, underscores, pontos ou hífens, e deve começar om um caractere alfa-numérico"
 
-#: rhodecode/model/validators.py:177
+#: rhodecode/model/validators.py:218
 msgid "Cannot assign this group as parent"
 msgstr "Não é possível associar esse grupo como progenitor"
 
-#: rhodecode/model/validators.py:178
+#: rhodecode/model/validators.py:219
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "O grupo \\\"%(group_name)s\\\" já existe"
 
-#: rhodecode/model/validators.py:180
+#: rhodecode/model/validators.py:221
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "Um repositório com o nome \"%(group_name)s\" já existe"
 
-#: rhodecode/model/validators.py:238
+#: rhodecode/model/validators.py:279
 msgid "Invalid characters (non-ascii) in password"
 msgstr "Caracteres inválidos (não-ascii) na senha"
 
-#: rhodecode/model/validators.py:253
+#: rhodecode/model/validators.py:294
+msgid "Invalid old password"
+msgstr ""
+
+#: rhodecode/model/validators.py:310
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: rhodecode/model/validators.py:270
+#: rhodecode/model/validators.py:327
 msgid "invalid password"
 msgstr "senha inválida"
 
-#: rhodecode/model/validators.py:271
+#: rhodecode/model/validators.py:328
 msgid "invalid user name"
 msgstr "nome de usuário inválido"
 
-#: rhodecode/model/validators.py:272
+#: rhodecode/model/validators.py:329
 msgid "Your account is disabled"
 msgstr "Sua conta está desabilitada"
 
-#: rhodecode/model/validators.py:316
+#: rhodecode/model/validators.py:373
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr "O nome de repositório %(repo)s não é permitido"
 
-#: rhodecode/model/validators.py:318
+#: rhodecode/model/validators.py:375
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "Um repositório chamado %(repo)s já existe"
 
-#: rhodecode/model/validators.py:319
+#: rhodecode/model/validators.py:376
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "Um repositório \"%(repo)s\" já existe no grupo \"%(group)s\""
 
-#: rhodecode/model/validators.py:321
+#: rhodecode/model/validators.py:378
 #, python-format
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr "Um Grupo de Repositórios chamado \"%(repo)s\" já existe"
 
-#: rhodecode/model/validators.py:438
+#: rhodecode/model/validators.py:493
 msgid "invalid clone url"
 msgstr "URL de clonagem inválida"
 
-#: rhodecode/model/validators.py:439
+#: rhodecode/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr "URL inválida, por favor, forneça uma URL de clone http(s)/svn+http(s)"
 
-#: rhodecode/model/validators.py:464
+#: rhodecode/model/validators.py:519
 msgid "Fork have to be the same type as parent"
 msgstr "A bifurcação deve ser do mesmo tipo que o pai"
 
-#: rhodecode/model/validators.py:479
+#: rhodecode/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr "Você não tem permissão para criar um repositório neste grupo"
 
-#: rhodecode/model/validators.py:481
+#: rhodecode/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr "você não tem permissão para criar um repositório na raiz"
 
-#: rhodecode/model/validators.py:518
+#: rhodecode/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
 msgstr "Você não tem permissão para criar um grupo neste local"
 
-#: rhodecode/model/validators.py:559
+#: rhodecode/model/validators.py:626
 msgid "This username or user group name is not valid"
 msgstr "Este nome de usuário ou de grupo de usuários não é válido"
 
-#: rhodecode/model/validators.py:652
+#: rhodecode/model/validators.py:719
 msgid "This is not a valid path"
 msgstr "Esse não é um caminho válido"
 
-#: rhodecode/model/validators.py:667
+#: rhodecode/model/validators.py:734
 msgid "This e-mail address is already taken"
 msgstr "Esse endereço de e-mail já está tomado"
 
-#: rhodecode/model/validators.py:687
+#: rhodecode/model/validators.py:754
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "o e-mail \"%(email)s\" não existe."
 
-#: rhodecode/model/validators.py:724
+#: rhodecode/model/validators.py:791
 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/model/validators.py:737
+#: rhodecode/model/validators.py:804
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
-msgstr ""
-
-#: rhodecode/model/validators.py:769
+msgstr "As revisões %(revs)s já fazem parte de um pull request ou já setaram o estado"
+
+#: rhodecode/model/validators.py:836
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr "Por favor, forneça um endereço válido IPv4 ou IPv6"
 
-#: rhodecode/model/validators.py:770
+#: rhodecode/model/validators.py:837
 #, python-format
 msgid ""
 "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr "O tamanho da rede (bits) deve estar no intervalo 0-32 (não %(bits)r)"
 
-#: rhodecode/model/validators.py:803
+#: rhodecode/model/validators.py:870
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr "O nome da chave só pode conter letras, underscore, hífen ou dígitos"
 
-#: rhodecode/model/validators.py:817
+#: rhodecode/model/validators.py:884
 msgid "Filename cannot be inside a directory"
 msgstr "O nome de arquivo não pode estar dentro de um diretório"
 
+#: rhodecode/model/validators.py:900
+#, python-format
+msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
+msgstr ""
+
 #: rhodecode/templates/index.html:5
 msgid "Dashboard"
 msgstr "Painel de Controle"
 
 #: rhodecode/templates/index_base.html:6
-#: rhodecode/templates/repo_switcher_list.html:4
-#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/users/user_edit_my_account.html:31
-#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/bookmarks/bookmarks.html:9
-#: rhodecode/templates/branches/branches.html:9
-#: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:46
-#: rhodecode/templates/journal/journal.html:47
-#: rhodecode/templates/tags/tags.html:9
+#: rhodecode/templates/admin/my_account/my_account_repos.html:3
+#: rhodecode/templates/admin/my_account/my_account_watched.html:3
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:12
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:12
+#: rhodecode/templates/admin/users/users.html:12
+#: rhodecode/templates/bookmarks/bookmarks.html:12
+#: rhodecode/templates/branches/branches.html:12
+#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:50
+#: rhodecode/templates/tags/tags.html:12
 msgid "quick filter..."
 msgstr "filtro rápido..."
 
 #: rhodecode/templates/index_base.html:6
-#: rhodecode/templates/admin/repos/repos.html:9
+#: rhodecode/templates/admin/repos/repos.html:12
 msgid "repositories"
 msgstr "repositórios"
 
-#: rhodecode/templates/index_base.html:13
-#: rhodecode/templates/index_base.html:18
-#: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repos.html:22
-msgid "Add repository"
-msgstr "Adicionar repositório"
-
-#: rhodecode/templates/index_base.html:15
 #: rhodecode/templates/index_base.html:20
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31
-msgid "Add group"
-msgstr "Adicionar grupo"
-
+#: rhodecode/templates/index_base.html:25
+#: rhodecode/templates/admin/repos/repo_add.html:22
+#: rhodecode/templates/admin/repos/repos.html:25
+msgid "Add Repository"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:22
 #: rhodecode/templates/index_base.html:27
-msgid "Edit group"
-msgstr "Editar grupo"
-
-#: rhodecode/templates/index_base.html:27
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:16
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:29
+msgid "Add Repository Group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:32
 msgid "You have admin right to this group, and can edit it"
 msgstr "Você tem direitos de administrador neste grupo e pode editá-lo"
 
-#: rhodecode/templates/index_base.html:40
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43
-#: rhodecode/templates/admin/users_groups/users_group_add.html:32
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:33
-#: rhodecode/templates/admin/users_groups/users_groups.html:37
-msgid "Group name"
-msgstr "Nome do grupo"
-
-#: rhodecode/templates/index_base.html:41
-#: rhodecode/templates/index_base.html:123
-#: rhodecode/templates/admin/repos/repo_add_base.html:56
-#: rhodecode/templates/admin/repos/repo_edit.html:68
-#: rhodecode/templates/admin/repos/repos.html:75
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44
-#: rhodecode/templates/email_templates/changeset_comment.html:9
+#: rhodecode/templates/index_base.html:32
+msgid "Edit Repository Group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:45
+msgid "Group Name"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:46
+#: rhodecode/templates/index_base.html:128
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:64
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:45
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:17
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:32
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:72
+#: rhodecode/templates/admin/repos/repos.html:51
+#: rhodecode/templates/admin/user_groups/user_group_add.html:43
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:51
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:64
+#: rhodecode/templates/email_templates/changeset_comment.html:16
 #: rhodecode/templates/email_templates/pull_request.html:9
-#: rhodecode/templates/forks/fork.html:56
-#: rhodecode/templates/pullrequests/pullrequest.html:43
-#: rhodecode/templates/pullrequests/pullrequest_show.html:81
-#: rhodecode/templates/summary/summary.html:106
+#: rhodecode/templates/forks/fork.html:41
+#: rhodecode/templates/pullrequests/pullrequest.html:40
+#: rhodecode/templates/pullrequests/pullrequest_show.html:86
+#: rhodecode/templates/summary/summary.html:88
 msgid "Description"
 msgstr "Descrição"
 
-#: rhodecode/templates/index_base.html:51
-#: rhodecode/templates/admin/permissions/permissions.html:55
-#: rhodecode/templates/admin/repos/repo_add_base.html:29
-#: rhodecode/templates/admin/repos/repo_edit.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57
-#: rhodecode/templates/forks/fork.html:47
-msgid "Repository group"
-msgstr "Grupo de repositórios"
-
-#: rhodecode/templates/index_base.html:121
+#: rhodecode/templates/index_base.html:126
+#: rhodecode/templates/admin/my_account/my_account_repos.html:46
+#: rhodecode/templates/admin/my_account/my_account_watched.html:46
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:50
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
-#: rhodecode/templates/admin/repos/repo_edit.html:32
-#: rhodecode/templates/admin/repos/repos.html:73
-#: rhodecode/templates/admin/users/user_edit_my_account.html:172
-#: rhodecode/templates/base/perms_summary.html:37
-#: rhodecode/templates/bookmarks/bookmarks.html:48
-#: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:47
-#: rhodecode/templates/branches/branches_data.html:6
-#: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:193
-#: rhodecode/templates/journal/journal.html:283
-#: rhodecode/templates/summary/summary.html:55
-#: rhodecode/templates/summary/summary.html:124
-#: rhodecode/templates/tags/tags.html:48
-#: rhodecode/templates/tags/tags_data.html:6
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:7
+#: rhodecode/templates/admin/repos/repos.html:50
+#: rhodecode/templates/admin/user_groups/user_groups.html:50
+#: rhodecode/templates/base/perms_summary.html:53
+#: rhodecode/templates/bookmarks/bookmarks.html:51
+#: rhodecode/templates/bookmarks/bookmarks_data.html:7
+#: rhodecode/templates/branches/branches.html:50
+#: rhodecode/templates/branches/branches_data.html:7
+#: rhodecode/templates/files/files_browser.html:41
+#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/journal/journal.html:288
+#: rhodecode/templates/tags/tags.html:51
+#: rhodecode/templates/tags/tags_data.html:7
 msgid "Name"
 msgstr "Nome"
 
-#: rhodecode/templates/index_base.html:124
+#: rhodecode/templates/index_base.html:129
 msgid "Last Change"
 msgstr "Última Alteração"
 
-#: rhodecode/templates/index_base.html:126
-#: rhodecode/templates/admin/repos/repos.html:76
-#: rhodecode/templates/admin/users/user_edit_my_account.html:174
-#: rhodecode/templates/journal/journal.html:195
-#: rhodecode/templates/journal/journal.html:285
+#: rhodecode/templates/index_base.html:131
+#: rhodecode/templates/admin/my_account/my_account_repos.html:48
+#: rhodecode/templates/admin/my_account/my_account_watched.html:48
+#: rhodecode/templates/admin/repos/repos.html:52
+#: rhodecode/templates/journal/journal.html:199
+#: rhodecode/templates/journal/journal.html:290
 msgid "Tip"
 msgstr "Ponta"
 
-#: rhodecode/templates/index_base.html:128
-#: rhodecode/templates/admin/repos/repo_edit.html:114
-#: rhodecode/templates/admin/repos/repos.html:78
+#: rhodecode/templates/index_base.html:133
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:10
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:53
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:60
+#: rhodecode/templates/admin/repos/repos.html:53
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:8
+#: rhodecode/templates/admin/user_groups/user_groups.html:54
+#: rhodecode/templates/summary/summary.html:141
 msgid "Owner"
 msgstr "Dono"
 
-#: rhodecode/templates/index_base.html:136
-#: rhodecode/templates/admin/repos/repos.html:86
-#: rhodecode/templates/admin/users/user_edit_my_account.html:183
-#: rhodecode/templates/admin/users/users.html:107
-#: rhodecode/templates/bookmarks/bookmarks.html:74
-#: rhodecode/templates/branches/branches.html:73
-#: rhodecode/templates/journal/journal.html:204
-#: rhodecode/templates/journal/journal.html:294
-#: rhodecode/templates/tags/tags.html:74
+#: rhodecode/templates/index_base.html:141
+#: rhodecode/templates/admin/my_account/my_account_repos.html:57
+#: rhodecode/templates/admin/my_account/my_account_watched.html:57
+#: rhodecode/templates/base/root.html:69
+#: rhodecode/templates/bookmarks/bookmarks.html:81
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:208
+#: rhodecode/templates/journal/journal.html:299
+#: rhodecode/templates/tags/tags.html:81
 msgid "Click to sort ascending"
 msgstr "Clique para ordenar em ordem crescente"
 
-#: rhodecode/templates/index_base.html:137
-#: rhodecode/templates/admin/repos/repos.html:87
-#: rhodecode/templates/admin/users/user_edit_my_account.html:184
-#: rhodecode/templates/admin/users/users.html:108
-#: rhodecode/templates/bookmarks/bookmarks.html:75
-#: rhodecode/templates/branches/branches.html:74
-#: rhodecode/templates/journal/journal.html:205
-#: rhodecode/templates/journal/journal.html:295
-#: rhodecode/templates/tags/tags.html:75
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/admin/my_account/my_account_repos.html:58
+#: rhodecode/templates/admin/my_account/my_account_watched.html:58
+#: rhodecode/templates/base/root.html:70
+#: rhodecode/templates/bookmarks/bookmarks.html:82
+#: rhodecode/templates/branches/branches.html:81
+#: rhodecode/templates/journal/journal.html:209
+#: rhodecode/templates/journal/journal.html:300
+#: rhodecode/templates/tags/tags.html:82
 msgid "Click to sort descending"
 msgstr "Clique para ordenar em ordem descrescente"
 
-#: rhodecode/templates/index_base.html:138
+#: rhodecode/templates/index_base.html:143
 msgid "No repositories found."
 msgstr "Nenhum repositório encontrado."
 
-#: rhodecode/templates/index_base.html:139
-#: rhodecode/templates/admin/repos/repos.html:89
-#: rhodecode/templates/admin/users/user_edit_my_account.html:186
-#: rhodecode/templates/admin/users/users.html:110
-#: rhodecode/templates/bookmarks/bookmarks.html:77
-#: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:207
-#: rhodecode/templates/journal/journal.html:297
-#: rhodecode/templates/tags/tags.html:77
+#: rhodecode/templates/index_base.html:144
+#: rhodecode/templates/admin/my_account/my_account_repos.html:60
+#: rhodecode/templates/admin/my_account/my_account_watched.html:60
+#: rhodecode/templates/base/root.html:72
+#: rhodecode/templates/bookmarks/bookmarks.html:84
+#: rhodecode/templates/branches/branches.html:83
+#: rhodecode/templates/journal/journal.html:211
+#: rhodecode/templates/journal/journal.html:302
+#: rhodecode/templates/tags/tags.html:84
 msgid "Data error."
 msgstr "Erro de dados."
 
-#: rhodecode/templates/index_base.html:140
-#: rhodecode/templates/admin/repos/repos.html:90
-#: rhodecode/templates/admin/users/user_edit_my_account.html:58
-#: rhodecode/templates/admin/users/user_edit_my_account.html:187
-#: rhodecode/templates/admin/users/users.html:111
-#: rhodecode/templates/bookmarks/bookmarks.html:78
-#: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:208
-#: rhodecode/templates/journal/journal.html:298
-#: rhodecode/templates/tags/tags.html:78
+#: rhodecode/templates/index_base.html:145
+#: rhodecode/templates/admin/my_account/my_account_repos.html:61
+#: rhodecode/templates/admin/my_account/my_account_watched.html:61
+#: rhodecode/templates/base/base.html:148
+#: rhodecode/templates/base/root.html:73
+#: rhodecode/templates/bookmarks/bookmarks.html:85
+#: rhodecode/templates/branches/branches.html:84
+#: rhodecode/templates/journal/journal.html:212
+#: rhodecode/templates/journal/journal.html:303
+#: rhodecode/templates/tags/tags.html:85
 msgid "Loading..."
 msgstr "Carregando..."
 
-#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239
+#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:32
+#: rhodecode/templates/base/base.html:267
 msgid "Log In"
 msgstr "Entrar"
 
-#: rhodecode/templates/login.html:21
+#: rhodecode/templates/login.html:30
 #, python-format
 msgid "Log In to %s"
 msgstr "Log in em %s"
 
-#: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
+#: rhodecode/templates/login.html:43 rhodecode/templates/register.html:40
 #: rhodecode/templates/admin/admin_log.html:5
-#: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:57
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31
-#: rhodecode/templates/admin/users/users.html:77
-#: rhodecode/templates/base/base.html:215
-#: rhodecode/templates/summary/summary.html:123
+#: rhodecode/templates/admin/my_account/my_account_profile.html:30
+#: rhodecode/templates/admin/users/user_add.html:35
+#: rhodecode/templates/admin/users/user_edit_profile.html:33
+#: rhodecode/templates/admin/users/users.html:53
+#: rhodecode/templates/base/base.html:243
 msgid "Username"
 msgstr "Nome de usuário"
 
-#: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
-#: rhodecode/templates/admin/ldap/ldap.html:46
-#: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:224
+#: rhodecode/templates/login.html:52 rhodecode/templates/register.html:49
+#: rhodecode/templates/admin/my_account/my_account.html:39
+#: rhodecode/templates/admin/users/user_add.html:44
+#: rhodecode/templates/base/base.html:252
 msgid "Password"
 msgstr "Senha"
 
-#: rhodecode/templates/login.html:50
+#: rhodecode/templates/login.html:62
 msgid "Remember me"
 msgstr "Lembre-se de mim"
 
-#: rhodecode/templates/login.html:54
+#: rhodecode/templates/login.html:66
 msgid "Sign In"
 msgstr "Entrar"
 
-#: rhodecode/templates/login.html:60
+#: rhodecode/templates/login.html:72
 msgid "Forgot your password ?"
 msgstr "Esqueceu sua senha ?"
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235
+#: rhodecode/templates/login.html:75 rhodecode/templates/base/base.html:263
 msgid "Don't have an account ?"
 msgstr "Não possui uma conta ?"
 
@@ -1790,111 +2154,112 @@
 msgid "Password Reset"
 msgstr "Senha Trocada"
 
-#: rhodecode/templates/password_reset.html:11
-msgid "Reset your password to"
-msgstr "Reinicializar sua senha para"
-
-#: rhodecode/templates/password_reset.html:21
-msgid "Email address"
-msgstr "Endereço de e-mail"
-
-#: rhodecode/templates/password_reset.html:30
-msgid "Reset my password"
-msgstr "Reinicializar minha senha"
+#: rhodecode/templates/password_reset.html:29
+#, python-format
+msgid "Reset your Password to %s"
+msgstr ""
 
 #: rhodecode/templates/password_reset.html:31
+msgid "Reset your Password"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:42
+msgid "Email Address"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:52
+#: rhodecode/templates/register.html:95
+msgid "Captcha"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:63
+msgid "Send password reset email"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:64
 msgid "Password reset link will be send to matching email address"
 msgstr "Link de reinicialização de senha será enviado ao endereço de e-mail correspondente"
 
-#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74
+#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:30
+#: rhodecode/templates/register.html:106
 msgid "Sign Up"
 msgstr "Inscrever-se"
 
-#: rhodecode/templates/register.html:11
-msgid "Sign Up to"
-msgstr "Inscrever-se em"
-
-#: rhodecode/templates/register.html:38
+#: rhodecode/templates/register.html:28
+#, python-format
+msgid "Sign Up to %s"
+msgstr ""
+
+#: rhodecode/templates/register.html:58
 msgid "Re-enter password"
 msgstr "Repita a senha"
 
-#: rhodecode/templates/register.html:47
-#: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
+#: rhodecode/templates/register.html:67
+#: rhodecode/templates/admin/my_account/my_account_profile.html:41
+#: rhodecode/templates/admin/users/user_add.html:62
+#: rhodecode/templates/admin/users/user_edit_profile.html:87
 msgid "First Name"
 msgstr "Primeiro Nome"
 
-#: rhodecode/templates/register.html:56
-#: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:106
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
+#: rhodecode/templates/register.html:76
+#: rhodecode/templates/admin/my_account/my_account_profile.html:50
+#: rhodecode/templates/admin/users/user_add.html:71
+#: rhodecode/templates/admin/users/user_edit_profile.html:96
 msgid "Last Name"
 msgstr "Último Nome"
 
-#: rhodecode/templates/register.html:65
-#: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:115
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/summary/summary.html:125
+#: rhodecode/templates/register.html:85
+#: rhodecode/templates/admin/my_account/my_account_profile.html:59
+#: rhodecode/templates/admin/settings/settings.html:44
+#: rhodecode/templates/admin/users/user_add.html:80
+#: rhodecode/templates/admin/users/user_edit_profile.html:42
 msgid "Email"
 msgstr "E-mail"
 
-#: rhodecode/templates/register.html:76
+#: rhodecode/templates/register.html:108
 msgid "Your account will be activated right after registration"
 msgstr "Sua conta será ativada logo após o registro ser concluído"
 
-#: rhodecode/templates/register.html:78
+#: rhodecode/templates/register.html:110
 msgid "Your account must wait for activation by administrator"
 msgstr "Sua conta precisa esperar ativação por um administrador"
 
-#: rhodecode/templates/repo_switcher_list.html:10
-#: rhodecode/templates/admin/defaults/defaults.html:44
-#: rhodecode/templates/admin/repos/repo_add_base.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:78
-#: rhodecode/templates/data_table/_dt_elements.html:61
-#: rhodecode/templates/summary/summary.html:77
-msgid "Private repository"
-msgstr "Repositório privado"
-
-#: rhodecode/templates/repo_switcher_list.html:12
-#: rhodecode/templates/data_table/_dt_elements.html:63
-#: rhodecode/templates/summary/summary.html:79
-msgid "Public repository"
-msgstr "Repositório público"
-
 #: rhodecode/templates/switch_to_list.html:10
-#: rhodecode/templates/branches/branches_data.html:57
+#: rhodecode/templates/branches/branches_data.html:67
 msgid "There are no branches yet"
 msgstr "Ainda não há ramos"
 
-#: rhodecode/templates/switch_to_list.html:22
-#: rhodecode/templates/tags/tags_data.html:38
+#: rhodecode/templates/switch_to_list.html:16
+msgid "Closed Branches"
+msgstr "Ramos Fechados"
+
+#: rhodecode/templates/switch_to_list.html:32
+#: rhodecode/templates/tags/tags_data.html:44
 msgid "There are no tags yet"
 msgstr "Ainda não há etiquetas"
 
-#: rhodecode/templates/switch_to_list.html:35
-#: rhodecode/templates/bookmarks/bookmarks_data.html:37
+#: rhodecode/templates/switch_to_list.html:45
+#: rhodecode/templates/bookmarks/bookmarks_data.html:43
 msgid "There are no bookmarks yet"
 msgstr "Ainda não há marcadores"
 
 #: rhodecode/templates/admin/admin.html:5
-#: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/base/base.html:73
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/base/base.html:69
 msgid "Admin journal"
 msgstr "Diário do administrador"
 
-#: rhodecode/templates/admin/admin.html:10
+#: rhodecode/templates/admin/admin.html:13
 msgid "journal filter..."
 msgstr "filtro de diário..."
 
-#: rhodecode/templates/admin/admin.html:12
-#: rhodecode/templates/journal/journal.html:11
+#: rhodecode/templates/admin/admin.html:15
+#: rhodecode/templates/journal/journal.html:14
 msgid "filter"
 msgstr "filtro"
 
-#: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/journal/journal.html:15
 #, python-format
 msgid "%s entry"
 msgid_plural "%s entries"
@@ -1902,28 +2267,30 @@
 msgstr[1] "%s entradas"
 
 #: rhodecode/templates/admin/admin_log.html:6
-#: rhodecode/templates/admin/repos/repos.html:79
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
-#: rhodecode/templates/admin/users/user_edit_my_account.html:176
-#: rhodecode/templates/admin/users/users.html:87
-#: rhodecode/templates/admin/users_groups/users_groups.html:40
-#: rhodecode/templates/journal/journal.html:197
-#: rhodecode/templates/journal/journal.html:287
+#: rhodecode/templates/admin/my_account/my_account_repos.html:50
+#: rhodecode/templates/admin/my_account/my_account_watched.html:50
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:54
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:8
+#: rhodecode/templates/admin/repos/repos.html:55
+#: rhodecode/templates/admin/user_groups/user_groups.html:55
+#: rhodecode/templates/admin/users/users.html:60
+#: rhodecode/templates/journal/journal.html:201
+#: rhodecode/templates/journal/journal.html:292
 msgid "Action"
 msgstr "Ação"
 
 #: rhodecode/templates/admin/admin_log.html:7
-#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/permissions/permissions_globals.html:18
 msgid "Repository"
 msgstr "Repositório"
 
 #: rhodecode/templates/admin/admin_log.html:8
-#: rhodecode/templates/bookmarks/bookmarks.html:49
-#: rhodecode/templates/bookmarks/bookmarks_data.html:7
-#: rhodecode/templates/branches/branches.html:48
-#: rhodecode/templates/branches/branches_data.html:7
-#: rhodecode/templates/tags/tags.html:49
-#: rhodecode/templates/tags/tags_data.html:7
+#: rhodecode/templates/bookmarks/bookmarks.html:53
+#: rhodecode/templates/bookmarks/bookmarks_data.html:9
+#: rhodecode/templates/branches/branches.html:52
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/tags/tags.html:53
+#: rhodecode/templates/tags/tags_data.html:9
 msgid "Date"
 msgstr "Data"
 
@@ -1935,309 +2302,598 @@
 msgid "No actions yet"
 msgstr "Ainda não há ações"
 
+#: rhodecode/templates/admin/auth/auth_settings.html:5
+msgid "Authentication Settings"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:14
+#: rhodecode/templates/base/base.html:75
+msgid "Authentication"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:31
+msgid "Authentication Plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:34
+msgid "Enabled Plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:36
+msgid ""
+"Comma separated list of plugins. Order of plugins is also order in which "
+"RhodeCode will try to authenticate user"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:37
+msgid "Available built-in plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:65
+msgid "enabled"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:66
+msgid "disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:51
+#: rhodecode/templates/admin/defaults/defaults.html:87
+#: rhodecode/templates/admin/my_account/my_account_password.html:33
+#: rhodecode/templates/admin/my_account/my_account_profile.html:68
+#: rhodecode/templates/admin/permissions/permissions_globals.html:108
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:72
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:114
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:101
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:134
+#: rhodecode/templates/admin/settings/settings_hooks.html:53
+#: rhodecode/templates/admin/user_groups/user_group_add.html:60
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:104
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:67
+#: rhodecode/templates/admin/users/user_add.html:99
+#: rhodecode/templates/admin/users/user_edit_profile.html:122
+#: rhodecode/templates/base/default_perms_box.html:64
+msgid "Save"
+msgstr "Salvar"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:57
+msgid "Plugin"
+msgstr ""
+
 #: rhodecode/templates/admin/defaults/defaults.html:5
-#: rhodecode/templates/admin/defaults/defaults.html:25
+#: rhodecode/templates/admin/defaults/defaults.html:28
 msgid "Repositories defaults"
 msgstr "Padrões de repositórios"
 
-#: rhodecode/templates/admin/defaults/defaults.html:11
-#: rhodecode/templates/base/base.html:80
+#: rhodecode/templates/admin/defaults/defaults.html:14
+#: rhodecode/templates/base/base.html:76
 msgid "Defaults"
 msgstr "Padrões"
 
-#: rhodecode/templates/admin/defaults/defaults.html:35
-#: rhodecode/templates/admin/repos/repo_add_base.html:38
+#: rhodecode/templates/admin/defaults/defaults.html:38
+#: rhodecode/templates/admin/repos/repo_add_base.html:59
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:7
 msgid "Type"
 msgstr "Tipo"
 
-#: rhodecode/templates/admin/defaults/defaults.html:48
-#: rhodecode/templates/admin/repos/repo_add_base.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:82
-#: rhodecode/templates/forks/fork.html:69
+#: rhodecode/templates/admin/defaults/defaults.html:47
+#: rhodecode/templates/admin/repos/repo_add_base.html:77
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:82
+#: rhodecode/templates/data_table/_dt_elements.html:70
+msgid "Private repository"
+msgstr "Repositório privado"
+
+#: rhodecode/templates/admin/defaults/defaults.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:81
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:86
+#: rhodecode/templates/forks/fork.html:75
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
 msgstr "Repositórios privados são visíveis somente por pessoas explicitamente adicionadas como colaboradores."
 
-#: rhodecode/templates/admin/defaults/defaults.html:55
-#: rhodecode/templates/admin/repos/repo_edit.html:87
+#: rhodecode/templates/admin/defaults/defaults.html:58
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:91
 msgid "Enable statistics"
 msgstr "Habilitar estatísticas"
 
-#: rhodecode/templates/admin/defaults/defaults.html:59
-#: rhodecode/templates/admin/repos/repo_edit.html:91
+#: rhodecode/templates/admin/defaults/defaults.html:62
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:95
 msgid "Enable statistics window on summary page."
 msgstr "Habilitar janela de estatísticas na página de sumário."
 
-#: rhodecode/templates/admin/defaults/defaults.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:96
+#: rhodecode/templates/admin/defaults/defaults.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:100
 msgid "Enable downloads"
 msgstr "Habilitar downloads"
 
-#: rhodecode/templates/admin/defaults/defaults.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:100
+#: rhodecode/templates/admin/defaults/defaults.html:72
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:104
 msgid "Enable download menu on summary page."
 msgstr "Habilitar menu de descarregar na página de sumário."
 
-#: rhodecode/templates/admin/defaults/defaults.html:75
-#: rhodecode/templates/admin/repos/repo_edit.html:105
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64
+#: rhodecode/templates/admin/defaults/defaults.html:78
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:34
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:109
 msgid "Enable locking"
 msgstr "Habilitar travas"
 
-#: rhodecode/templates/admin/defaults/defaults.html:79
-#: rhodecode/templates/admin/repos/repo_edit.html:109
+#: rhodecode/templates/admin/defaults/defaults.html:82
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:113
 msgid "Enable lock-by-pulling on repository."
 msgstr "Habilitar trava-por-pulling no repositório."
 
-#: rhodecode/templates/admin/defaults/defaults.html:84
-#: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/permissions/permissions.html:122
-#: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos/repo_edit.html:166
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96
-#: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_add.html:94
-#: rhodecode/templates/admin/users/user_edit.html:140
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88
-#: rhodecode/templates/admin/users_groups/users_group_add.html:49
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:143
-#: rhodecode/templates/base/default_perms_box.html:53
-msgid "Save"
-msgstr "Salvar"
-
-#: rhodecode/templates/admin/gists/index.html:5
-#: rhodecode/templates/base/base.html:299
-msgid "Gists"
-msgstr "Gists"
-
-#: rhodecode/templates/admin/gists/index.html:10
+#: rhodecode/templates/admin/gists/edit.html:5
+#: rhodecode/templates/admin/gists/edit.html:22
+msgid "Edit Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:40
+#, python-format
+msgid ""
+"Gist was update since you started editing. Copy your changes and click "
+"%(here)s to reload new version."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:59
+#: rhodecode/templates/admin/gists/new.html:43
+msgid "Gist description ..."
+msgstr "Descrição do gist ..."
+
+#: rhodecode/templates/admin/gists/edit.html:61
+#: rhodecode/templates/admin/gists/new.html:45
+msgid "Gist lifetime"
+msgstr "Tempo de vida do Gist"
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/edit.html:67
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/index.html:62
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/gists/show.html:52
+msgid "Expires"
+msgstr "Expira"
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+msgid "never"
+msgstr "nunca"
+
+#: rhodecode/templates/admin/gists/edit.html:80
+#: rhodecode/templates/admin/gists/new.html:52
+#: rhodecode/templates/files/files_add.html:59
+#: rhodecode/templates/files/files_edit.html:64
+msgid "plain"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:147
+msgid "Update Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:148
+#: rhodecode/templates/changeset/changeset_file_comment.html:89
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: rhodecode/templates/admin/gists/index.html:6
+#: rhodecode/templates/admin/gists/index.html:19
 #, python-format
 msgid "Private Gists for user %s"
 msgstr "Gists privados do usuário %s"
 
-#: rhodecode/templates/admin/gists/index.html:12
+#: rhodecode/templates/admin/gists/index.html:8
+#: rhodecode/templates/admin/gists/index.html:21
 #, python-format
 msgid "Public Gists for user %s"
 msgstr "Gists públicos do usuário %s"
 
-#: rhodecode/templates/admin/gists/index.html:14
+#: rhodecode/templates/admin/gists/index.html:10
+#: rhodecode/templates/admin/gists/index.html:23
 msgid "Public Gists"
 msgstr "Gists Públicos"
 
-#: rhodecode/templates/admin/gists/index.html:31
-#: rhodecode/templates/admin/gists/show.html:24
-#: rhodecode/templates/base/base.html:302
-msgid "Create new gist"
-msgstr "Criar novo gist"
-
-#: rhodecode/templates/admin/gists/index.html:48
+#: rhodecode/templates/admin/gists/index.html:40
+#: rhodecode/templates/admin/gists/show.html:28
+msgid "Create New Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:57
+#: rhodecode/templates/data_table/_dt_elements.html:143
 msgid "Created"
 msgstr "Criado"
 
-#: rhodecode/templates/admin/gists/index.html:51
-#: rhodecode/templates/admin/gists/index.html:53
-#: rhodecode/templates/admin/gists/show.html:43
-#: rhodecode/templates/admin/gists/show.html:45
-msgid "Expires"
-msgstr "Expira"
-
-#: rhodecode/templates/admin/gists/index.html:51
-#: rhodecode/templates/admin/gists/show.html:43
-msgid "never"
-msgstr "nunca"
-
-#: rhodecode/templates/admin/gists/index.html:68
+#: rhodecode/templates/admin/gists/index.html:77
 msgid "There are no gists yet"
 msgstr "Não há nenhum gist ainda"
 
 #: rhodecode/templates/admin/gists/new.html:5
-#: rhodecode/templates/admin/gists/new.html:16
-msgid "New gist"
-msgstr "Novo gist"
-
-#: rhodecode/templates/admin/gists/new.html:37
-msgid "Gist description ..."
-msgstr "Descrição do gist ..."
-
-#: rhodecode/templates/admin/gists/new.html:52
-msgid "Create private gist"
-msgstr "Criar gist privado"
-
-#: rhodecode/templates/admin/gists/new.html:53
-msgid "Create public gist"
-msgstr "Criar gist público"
-
-#: rhodecode/templates/admin/gists/new.html:54
-#: rhodecode/templates/admin/permissions/permissions.html:123
-#: rhodecode/templates/admin/permissions/permissions.html:185
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos/repo_edit.html:167
-#: rhodecode/templates/admin/repos/repo_edit.html:381
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97
-#: rhodecode/templates/admin/settings/settings.html:115
-#: rhodecode/templates/admin/settings/settings.html:196
-#: rhodecode/templates/admin/settings/settings.html:288
-#: rhodecode/templates/admin/users/user_edit.html:141
-#: rhodecode/templates/admin/users/user_edit.html:198
-#: rhodecode/templates/admin/users/user_edit.html:246
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:144
-#: rhodecode/templates/base/default_perms_box.html:54
-#: rhodecode/templates/files/files_add.html:80
-#: rhodecode/templates/files/files_edit.html:66
-#: rhodecode/templates/pullrequests/pullrequest.html:86
+#: rhodecode/templates/admin/gists/new.html:22
+msgid "New Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:51
+msgid "name this file..."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:60
+msgid "Create Private Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:61
+msgid "Create Public Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:62
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:70
+#: rhodecode/templates/admin/my_account/my_account_emails.html:46
+#: rhodecode/templates/admin/my_account/my_account_password.html:34
+#: rhodecode/templates/admin/my_account/my_account_profile.html:69
+#: rhodecode/templates/admin/permissions/permissions_globals.html:109
+#: rhodecode/templates/admin/permissions/permissions_ips.html:41
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:115
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:43
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:59
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:102
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:135
+#: rhodecode/templates/admin/settings/settings_global.html:56
+#: rhodecode/templates/admin/settings/settings_license.html:43
+#: rhodecode/templates/admin/settings/settings_vcs.html:81
+#: rhodecode/templates/admin/settings/settings_visual.html:116
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:105
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:70
+#: rhodecode/templates/admin/users/user_edit_emails.html:46
+#: rhodecode/templates/admin/users/user_edit_ips.html:50
+#: rhodecode/templates/admin/users/user_edit_profile.html:123
+#: rhodecode/templates/base/default_perms_box.html:65
+#: rhodecode/templates/files/files_add.html:70
+#: rhodecode/templates/files/files_delete.html:58
+#: rhodecode/templates/files/files_edit.html:73
+#: rhodecode/templates/pullrequests/pullrequest.html:83
 msgid "Reset"
 msgstr "Limpar"
 
 #: rhodecode/templates/admin/gists/show.html:5
-msgid "gist"
-msgstr "gist"
-
-#: rhodecode/templates/admin/gists/show.html:9
+#: rhodecode/templates/admin/gists/show.html:12
 msgid "Gist"
 msgstr "Gist"
 
-#: rhodecode/templates/admin/gists/show.html:36
-msgid "Public gist"
-msgstr "Gist público"
-
-#: rhodecode/templates/admin/gists/show.html:38
-msgid "Private gist"
-msgstr "Gist privado"
-
-#: rhodecode/templates/admin/gists/show.html:54
-#: rhodecode/templates/admin/repos/repo_edit.html:299
-#: rhodecode/templates/changeset/changeset_file_comment.html:40
+#: rhodecode/templates/admin/gists/show.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:4
+#: rhodecode/templates/email_templates/pull_request.html:4
+#: rhodecode/templates/email_templates/pull_request_comment.html:4
+msgid "URL"
+msgstr "URL"
+
+#: rhodecode/templates/admin/gists/show.html:40
+msgid "Public Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:42
+msgid "Private Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:59
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:80
+#: rhodecode/templates/changeset/changeset_file_comment.html:48
+#: rhodecode/templates/files/files_source.html:39
+#: rhodecode/templates/files/files_source.html:42
+#: rhodecode/templates/files/files_source.html:45
 msgid "Delete"
 msgstr "Excluir"
 
-#: rhodecode/templates/admin/gists/show.html:54
-msgid "Confirm to delete this gist"
-msgstr "Confirme para excluir este gist"
-
-#: rhodecode/templates/admin/gists/show.html:63
-#: rhodecode/templates/admin/gists/show.html:84
-#: rhodecode/templates/files/files_edit.html:48
-#: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:55
-msgid "Show as raw"
-msgstr "Mostrar original"
-
-#: rhodecode/templates/admin/gists/show.html:71
+#: rhodecode/templates/admin/gists/show.html:59
+msgid "Confirm to delete this Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:66
+#: rhodecode/templates/changeset/changeset_file_comment.html:81
+#: rhodecode/templates/changeset/changeset_file_comment.html:190
+#: rhodecode/templates/data_table/_dt_elements.html:167
+#: rhodecode/templates/data_table/_dt_elements.html:183
+#: rhodecode/templates/files/files_source.html:41
+#: rhodecode/templates/files/files_source.html:44
+msgid "Edit"
+msgstr "Editar"
+
+#: rhodecode/templates/admin/gists/show.html:68
+#: rhodecode/templates/files/files_edit.html:54
+#: rhodecode/templates/files/files_source.html:34
+msgid "Show as Raw"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:76
 msgid "created"
 msgstr "criado"
 
-#: rhodecode/templates/admin/ldap/ldap.html:5
-msgid "LDAP administration"
-msgstr "Administração de LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:11
-#: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:79
-msgid "LDAP"
-msgstr "LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:28
-msgid "Connection settings"
-msgstr "Configurações de conexão"
-
-#: rhodecode/templates/admin/ldap/ldap.html:30
-msgid "Enable LDAP"
-msgstr "Habilitar LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:34
-msgid "Host"
-msgstr "Host"
-
-#: rhodecode/templates/admin/ldap/ldap.html:38
-msgid "Port"
-msgstr "Porta"
-
-#: rhodecode/templates/admin/ldap/ldap.html:42
-msgid "Account"
-msgstr "Conta"
-
-#: rhodecode/templates/admin/ldap/ldap.html:50
-msgid "Connection security"
-msgstr "Segurança da conexão"
-
-#: rhodecode/templates/admin/ldap/ldap.html:54
-msgid "Certificate Checks"
-msgstr "Verificações de Certificados"
-
-#: rhodecode/templates/admin/ldap/ldap.html:57
-msgid "Search settings"
-msgstr "Configurações de busca"
-
-#: rhodecode/templates/admin/ldap/ldap.html:59
-msgid "Base DN"
-msgstr "DN Base"
-
-#: rhodecode/templates/admin/ldap/ldap.html:63
-msgid "LDAP Filter"
-msgstr "Filtro LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:67
-msgid "LDAP Search Scope"
-msgstr "Escopo de Buscas LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:70
-msgid "Attribute mappings"
-msgstr "Mapeamento de atributos"
-
-#: rhodecode/templates/admin/ldap/ldap.html:72
-msgid "Login Attribute"
-msgstr "Atributo de Login"
-
-#: rhodecode/templates/admin/ldap/ldap.html:76
-msgid "First Name Attribute"
-msgstr "Atributo do Primeiro Nome"
-
-#: rhodecode/templates/admin/ldap/ldap.html:80
-msgid "Last Name Attribute"
-msgstr "Atributo do Último Nome"
-
-#: rhodecode/templates/admin/ldap/ldap.html:84
-msgid "E-mail Attribute"
-msgstr "Atributo de E-mail"
+#: rhodecode/templates/admin/gists/show.html:89
+#: rhodecode/templates/files/files_source.html:71
+msgid "Show as raw"
+msgstr "Mostrar original"
+
+#: rhodecode/templates/admin/my_account/my_account.html:5
+#: rhodecode/templates/base/base.html:282
+msgid "My account"
+msgstr "Minha conta"
+
+#: rhodecode/templates/admin/my_account/my_account.html:12
+msgid "My Account"
+msgstr "Minha Conta"
+
+#: rhodecode/templates/admin/my_account/my_account.html:38
+#: rhodecode/templates/admin/users/user_edit.html:42
+msgid "Profile"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:40
+#: rhodecode/templates/admin/users/user_edit.html:43
+msgid "API keys"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:41
+msgid "My Emails"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:42
+msgid "My Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:43
+#: rhodecode/templates/journal/journal.html:54
+msgid "Watched"
+msgstr "Seguindo"
+
+#: rhodecode/templates/admin/my_account/my_account.html:44
+msgid "Pull requests"
+msgstr "Pull requests"
+
+#: rhodecode/templates/admin/my_account/my_account.html:45
+msgid "My permissions"
+msgstr "Minhas permissões"
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:6
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:6
+msgid "Built-in"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:32
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:32
+msgid "expires"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:14
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:14
+#, python-format
+msgid "Confirm to reset this api key: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:15
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:15
+msgid "reset"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:30
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:30
+msgid "expired"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:40
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:40
+#, python-format
+msgid "Confirm to remove this api key: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:42
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:42
+msgid "remove"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:49
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:49
+msgid "No additional api keys specified"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:61
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:61
+msgid "New api key"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:69
+#: rhodecode/templates/admin/my_account/my_account_emails.html:45
+#: rhodecode/templates/admin/permissions/permissions_ips.html:40
+#: rhodecode/templates/admin/repos/repo_add_base.html:85
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:58
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:69
+#: rhodecode/templates/admin/users/user_edit_emails.html:45
+#: rhodecode/templates/admin/users/user_edit_ips.html:49
+msgid "Add"
+msgstr "Adicionar"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:7
+#: rhodecode/templates/admin/users/user_edit_emails.html:7
+msgid "Primary"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:19
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:24
+#: rhodecode/templates/admin/permissions/permissions_ips.html:14
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:18
+#: rhodecode/templates/admin/settings/settings_hooks.html:36
+#: rhodecode/templates/admin/users/user_edit_emails.html:19
+#: rhodecode/templates/admin/users/user_edit_ips.html:22
+#: rhodecode/templates/data_table/_dt_elements.html:131
+#: rhodecode/templates/data_table/_dt_elements.html:159
+#: rhodecode/templates/data_table/_dt_elements.html:175
+#: rhodecode/templates/data_table/_dt_elements.html:191
+msgid "delete"
+msgstr "excluir"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:20
+#: rhodecode/templates/admin/users/user_edit_emails.html:20
+#, python-format
+msgid "Confirm to delete this email: %s"
+msgstr "Confirme para excluir este email: %s"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:26
+#: rhodecode/templates/admin/users/user_edit_emails.html:26
+msgid "No additional emails specified"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:38
+#: rhodecode/templates/admin/users/user_edit_emails.html:38
+msgid "New email address"
+msgstr "Novo endereço de email"
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:1
+msgid "Change your account password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:7
+msgid "Current password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:16
+#: rhodecode/templates/admin/users/user_edit_profile.html:69
+msgid "New password"
+msgstr "Nova senha"
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:25
+msgid "Confirm new password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:9
+msgid "Change your avatar at"
+msgstr "Altere o seu avatar em"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:10
+#: rhodecode/templates/admin/users/user_edit_profile.html:9
+msgid "Using"
+msgstr "Usando"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:11
+msgid "Avatars are disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:13
+msgid "Missing email, please update your user email address."
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:14
+#: rhodecode/templates/admin/users/user_edit_profile.html:15
+msgid "current IP"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:26
+msgid ""
+"Your user is in an external Source of Record; some details cannot be managed"
+" here"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:2
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:4
+msgid "Show closed pull requests"
+msgstr "Mostrar pull requests fechados"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:6
+msgid "Opened by me"
+msgstr "Abertos por mim"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:15
+#, python-format
+msgid "Pull request #%s opened on %s"
+msgstr "Pull request $%s aberto em %s"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:17
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:47
+#: rhodecode/templates/pullrequests/pullrequest_data.html:11
+#: rhodecode/templates/pullrequests/pullrequest_show.html:30
+#: rhodecode/templates/pullrequests/pullrequest_show.html:45
+msgid "Closed"
+msgstr "Fechado"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:25
+msgid "Confirm to delete this pull request"
+msgstr "Confirme para excluir este pull request"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:32
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:53
+msgid "Nothing here yet"
+msgstr "Não há nada aqui ainda"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:36
+msgid "I participate in"
+msgstr "Eu participo em"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:44
+#: rhodecode/templates/pullrequests/pullrequest_data.html:8
+#, python-format
+msgid "Pull request #%s opened by %s on %s"
+msgstr "Pull request #%s aberto por %s em %s"
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:1
+msgid "Repositories you are owner of"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:59
+#: rhodecode/templates/admin/my_account/my_account_watched.html:59
+#: rhodecode/templates/base/root.html:71
+#: rhodecode/templates/bookmarks/bookmarks.html:83
+#: rhodecode/templates/branches/branches.html:82
+#: rhodecode/templates/journal/journal.html:210
+#: rhodecode/templates/journal/journal.html:301
+#: rhodecode/templates/tags/tags.html:83
+msgid "No records found."
+msgstr "Nenhum registro encontrado."
+
+#: rhodecode/templates/admin/my_account/my_account_watched.html:1
+msgid "Repositories you are watching"
+msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:5
-#: rhodecode/templates/admin/notifications/notifications.html:9
+#: rhodecode/templates/admin/notifications/notifications.html:12
 msgid "My Notifications"
 msgstr "Minhas Notificações"
 
-#: rhodecode/templates/admin/notifications/notifications.html:29
+#: rhodecode/templates/admin/notifications/notifications.html:32
 msgid "All"
 msgstr "Todos"
 
-#: rhodecode/templates/admin/notifications/notifications.html:30
+#: rhodecode/templates/admin/notifications/notifications.html:33
 msgid "Comments"
 msgstr "Comentários"
 
-#: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
-msgid "Pull requests"
-msgstr "Pull requests"
-
-#: rhodecode/templates/admin/notifications/notifications.html:35
+#: rhodecode/templates/admin/notifications/notifications.html:34
+#: rhodecode/templates/base/base.html:193
+msgid "Pull Requests"
+msgstr "Pull Requests"
+
+#: rhodecode/templates/admin/notifications/notifications.html:38
 msgid "Mark all read"
 msgstr "Marcar tudo como lido"
 
-#: rhodecode/templates/admin/notifications/notifications_data.html:39
+#: rhodecode/templates/admin/notifications/notifications_data.html:40
 msgid "No notifications here yet"
 msgstr "Ainda não há notificações aqui"
 
 #: rhodecode/templates/admin/notifications/show_notification.html:5
-#: rhodecode/templates/admin/notifications/show_notification.html:11
+#: rhodecode/templates/admin/notifications/show_notification.html:14
 msgid "Show notification"
 msgstr "Mostrar notificação"
 
-#: rhodecode/templates/admin/notifications/show_notification.html:9
-#: rhodecode/templates/base/base.html:253
+#: rhodecode/templates/admin/notifications/show_notification.html:12
+#: rhodecode/templates/base/base.html:281
 msgid "Notifications"
 msgstr "Notificações"
 
@@ -2245,1301 +2901,1642 @@
 msgid "Permissions administration"
 msgstr "Administração de permissões"
 
-#: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:151
-#: rhodecode/templates/admin/repos/repo_edit.html:158
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88
-#: rhodecode/templates/admin/users/user_edit.html:150
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:129
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/base/base.html:78
+#: rhodecode/templates/admin/permissions/permissions.html:14
+#: rhodecode/templates/admin/permissions/permissions.html:37
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:55
+#: rhodecode/templates/admin/repos/repo_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:45
+#: rhodecode/templates/base/base.html:74
 msgid "Permissions"
 msgstr "Permissões"
 
-#: rhodecode/templates/admin/permissions/permissions.html:24
-msgid "Default permissions"
-msgstr "Permissões padrão"
-
-#: rhodecode/templates/admin/permissions/permissions.html:31
+#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/settings/settings.html:42
+msgid "Global"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:42
+msgid "IP whitelist"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:43
+msgid "Overview"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:7
 msgid "Anonymous access"
 msgstr "Acesso anônimo"
 
-#: rhodecode/templates/admin/permissions/permissions.html:49
+#: rhodecode/templates/admin/permissions/permissions_globals.html:13
+#, python-format
+msgid ""
+"Allow access to RhodeCode without need to log in. Anonymous users use %s "
+"user permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:26
 msgid ""
 "All default permissions on each repository will be reset to chosen "
 "permission, note that all custom default permission on repositories will be "
 "lost"
 msgstr "Todas as permissões padrão em cada repositório serão modificadas para a permissão escolhida, note que todas as permissões padrão customizadas nos repositórios serão perdidas"
 
-#: rhodecode/templates/admin/permissions/permissions.html:50
-#: rhodecode/templates/admin/permissions/permissions.html:63
-#: rhodecode/templates/admin/permissions/permissions.html:77
+#: rhodecode/templates/admin/permissions/permissions_globals.html:27
+#: rhodecode/templates/admin/permissions/permissions_globals.html:40
+#: rhodecode/templates/admin/permissions/permissions_globals.html:54
 msgid "Overwrite existing settings"
 msgstr "Sobrescrever as configurações existentes"
 
-#: rhodecode/templates/admin/permissions/permissions.html:62
+#: rhodecode/templates/admin/permissions/permissions_globals.html:32
+#: rhodecode/templates/admin/repos/repo_add_base.html:41
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:42
+#: rhodecode/templates/data_table/_dt_elements.html:204
+#: rhodecode/templates/forks/fork.html:51
+msgid "Repository group"
+msgstr "Grupo de repositórios"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:39
 msgid ""
 "All default permissions on each repository group will be reset to chosen "
 "permission, note that all custom default permission on repository groups "
 "will be lost"
 msgstr "Todas as permissões padrão em cada grupo de repositórios serão modificadas para a permissão escolhida, note que todas as permissões padrão customizadas em grupos de repositórios serão perdidas"
 
-#: rhodecode/templates/admin/permissions/permissions.html:69
+#: rhodecode/templates/admin/permissions/permissions_globals.html:46
+#: rhodecode/templates/data_table/_dt_elements.html:211
 msgid "User group"
 msgstr "Grupo de usuários"
 
-#: rhodecode/templates/admin/permissions/permissions.html:76
+#: rhodecode/templates/admin/permissions/permissions_globals.html:53
 msgid ""
 "All default permissions on each user group will be reset to chosen "
 "permission, note that all custom default permission on repository groups "
 "will be lost"
 msgstr "Todas as permissões padrão em cada repositório serão reinicializadas para as permissões escolhidas. Note que todas as permissões padrão customizadas nos repositórios serão perdidas"
 
-#: rhodecode/templates/admin/permissions/permissions.html:83
+#: rhodecode/templates/admin/permissions/permissions_globals.html:60
 msgid "Repository creation"
 msgstr "Criação de repositório"
 
-#: rhodecode/templates/admin/permissions/permissions.html:91
+#: rhodecode/templates/admin/permissions/permissions_globals.html:68
+msgid "Repository creation with group write access"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:72
+msgid ""
+"Write permission to repository groups allows creating repositories inside "
+"that group"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:77
 msgid "User group creation"
 msgstr "Criação de grupo de usuários"
 
-#: rhodecode/templates/admin/permissions/permissions.html:99
+#: rhodecode/templates/admin/permissions/permissions_globals.html:85
 msgid "Repository forking"
 msgstr "Bifurcação de repositório"
 
-#: rhodecode/templates/admin/permissions/permissions.html:107
+#: rhodecode/templates/admin/permissions/permissions_globals.html:93
 msgid "Registration"
 msgstr "Registro"
 
-#: rhodecode/templates/admin/permissions/permissions.html:115
+#: rhodecode/templates/admin/permissions/permissions_globals.html:101
 msgid "External auth account activation"
 msgstr "Ativação de autenticação de conta externa"
 
-#: rhodecode/templates/admin/permissions/permissions.html:133
-msgid "Default User Permissions"
-msgstr "Permissões Padrão de Usuários"
-
-#: rhodecode/templates/admin/permissions/permissions.html:144
-#: rhodecode/templates/admin/users/user_edit.html:207
-msgid "Allowed IP addresses"
-msgstr "Endereços IP permitidos"
-
-#: rhodecode/templates/admin/permissions/permissions.html:158
-#: rhodecode/templates/admin/repos/repo_edit.html:340
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
-#: rhodecode/templates/admin/users/user_edit.html:175
-#: rhodecode/templates/admin/users/user_edit.html:220
-#: rhodecode/templates/admin/users_groups/users_groups.html:54
-#: rhodecode/templates/data_table/_dt_elements.html:122
-#: rhodecode/templates/data_table/_dt_elements.html:136
-msgid "delete"
-msgstr "excluir"
-
-#: rhodecode/templates/admin/permissions/permissions.html:159
-#: rhodecode/templates/admin/users/user_edit.html:221
+#: rhodecode/templates/admin/permissions/permissions_ips.html:1
+msgid "Default ip whitelist for all users"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_ips.html:15
+#: rhodecode/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr "Confirme para excluir este IP: %s"
 
-#: rhodecode/templates/admin/permissions/permissions.html:165
-#: rhodecode/templates/admin/users/user_edit.html:227
+#: rhodecode/templates/admin/permissions/permissions_ips.html:21
+#: rhodecode/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed"
 msgstr "Todos os endereços IP são permitidos"
 
-#: rhodecode/templates/admin/permissions/permissions.html:176
-#: rhodecode/templates/admin/users/user_edit.html:238
+#: rhodecode/templates/admin/permissions/permissions_ips.html:32
+#: rhodecode/templates/admin/users/user_edit_ips.html:42
 msgid "New ip address"
 msgstr "Novo endereço IP"
 
-#: rhodecode/templates/admin/permissions/permissions.html:184
-#: rhodecode/templates/admin/repos/repo_add_base.html:73
-#: rhodecode/templates/admin/repos/repo_edit.html:380
-#: rhodecode/templates/admin/users/user_edit.html:197
-#: rhodecode/templates/admin/users/user_edit.html:245
-msgid "Add"
-msgstr "Adicionar"
-
-#: rhodecode/templates/admin/repos/repo_add.html:12
-#: rhodecode/templates/admin/repos/repo_add.html:16
-#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88
-#: rhodecode/templates/base/base.html:116
-#: rhodecode/templates/base/base.html:275
-msgid "Repositories"
-msgstr "Repositórios"
-
-#: rhodecode/templates/admin/repos/repo_add.html:19
-msgid "Add new"
-msgstr "Adicionar novo"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:96
-#: rhodecode/templates/summary/summary.html:97
-msgid "Clone from"
-msgstr "Clonar de"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:24
-#: rhodecode/templates/admin/repos/repo_edit.html:45
-msgid "Optional http[s] url from which repository should be cloned."
-msgstr "URL opcional http[s] da qual o repositório deve ser clonado."
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:33
-#: rhodecode/templates/forks/fork.html:51
-msgid "Optionaly select a group to put this repository into."
-msgstr "Opcionalmente, selecione um grupo no qual colocar este repositório"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:42
-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:59
-#: rhodecode/templates/forks/fork.html:38
-msgid "Landing revision"
-msgstr "Revisão de pouso"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:51
-#: rhodecode/templates/admin/repos/repo_edit.html:63
-#: rhodecode/templates/forks/fork.html:42
-msgid "Default revision for files page, downloads, whoosh and readme"
-msgstr "Revisão padrão para página de arquivos, downloads, whoosh e readme"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:60
-#: rhodecode/templates/admin/repos/repo_edit.html:72
-#: rhodecode/templates/forks/fork.html:60
-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_edit.html:8
-msgid "Edit repository"
-msgstr "Editar repositório"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:12
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:11
-#: rhodecode/templates/base/base.html:81
-#: rhodecode/templates/base/base.html:134
-#: rhodecode/templates/summary/summary.html:212
+#: rhodecode/templates/admin/permissions/permissions_perms.html:1
+msgid "Default user permissions overview"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:5
+msgid "Add repository group"
+msgstr "Adicionar grupo de repositórios"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:14
+#: rhodecode/templates/base/base.html:71 rhodecode/templates/base/base.html:90
+msgid "Repository groups"
+msgstr "Grupo de repositórios"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:36
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:8
+#: rhodecode/templates/admin/user_groups/user_group_add.html:35
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:7
+msgid "Group name"
+msgstr "Nome do grupo"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:54
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:26
+msgid "Group parent"
+msgstr "Progenitor do grupo"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:63
+#: rhodecode/templates/admin/repos/repo_add_base.html:50
+msgid "Copy parent group permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:67
+#: rhodecode/templates/admin/repos/repo_add_base.html:54
+msgid "Copy permission set from parent repository group."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:5
+#, python-format
+msgid "%s Repository group settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:105
+msgid "Repository Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:24
+msgid "Add Child Group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:53
+#: rhodecode/templates/admin/repos/repo_edit.html:15
+#: rhodecode/templates/admin/repos/repo_edit.html:43
+#: rhodecode/templates/admin/settings/settings.html:14
+#: rhodecode/templates/admin/settings/settings.html:36
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:42
+#: rhodecode/templates/base/base.html:77
+#: rhodecode/templates/base/base.html:159
 msgid "Settings"
 msgstr "Configurações"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:36
-msgid "Non-changeable id"
-msgstr "ID inalterável"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:41
-msgid "Clone uri"
-msgstr "URI de clonagem"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:54
-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:119
-msgid "Change owner of this repository."
-msgstr "Mudar o dono desse repositório."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:177
-msgid "Advanced settings"
-msgstr "Configurações avançadas"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:180
-msgid "Statistics"
-msgstr "Estatísticas"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Reset current statistics"
-msgstr "Reinicializar estatísticas atuais"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Confirm to remove current statistics"
-msgstr "Confirma remover atuais estatísticas"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:187
-msgid "Fetched to rev"
-msgstr "Trazida à rev"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:188
-msgid "Stats gathered"
-msgstr "Estatísticas coletadas"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:196
-msgid "Remote"
-msgstr "Remoto"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:200
-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:200
-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:211
-msgid "Cache"
-msgstr "Cache"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:215
-msgid "Invalidate repository cache"
-msgstr "Invalidar cache do repositório"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:215
-msgid "Confirm to invalidate repository cache"
-msgstr "Confirma invalidar cache do repositório"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:218
-msgid ""
-"Manually invalidate cache for this repository. On first access repository "
-"will be cached again"
-msgstr "Invalidar manualmente o cache deste repositório. No próximo acesso o repositório será cacheado novamente"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:223
-msgid "List of cached values"
-msgstr "Lista de valores cacheados"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:226
-msgid "Prefix"
-msgstr "Prefixo"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:227
-msgid "Key"
-msgstr "Chave"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:228
-#: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:124
-#: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/admin/users_groups/users_group_add.html:41
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-#: rhodecode/templates/admin/users_groups/users_groups.html:39
-msgid "Active"
-msgstr "Ativo"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:243
-#: rhodecode/templates/base/base.html:292
-#: rhodecode/templates/base/base.html:293
-msgid "Public journal"
-msgstr "Diário público"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:249
-msgid "Remove from public journal"
-msgstr "Remover do diário público"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:251
-msgid "Add to public journal"
-msgstr "Adicionar ao diário público"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:256
-msgid ""
-"All actions made on this repository will be accessible to everyone in public"
-" journal"
-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:263
-msgid "Locking"
-msgstr "Travamento"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
-msgid "Unlock locked repo"
-msgstr "Destravar repo travado"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
-msgid "Confirm to unlock repository"
-msgstr "Confirme para destravar repositório"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:271
-msgid "Lock repo"
-msgstr "Travar repo"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:271
-msgid "Confirm to lock repository"
-msgstr "Confirme para travar repositório"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:272
-msgid "Repository is not locked"
-msgstr "Repositório não está travado"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:277
-msgid ""
-"Force locking on repository. Works only when anonymous access is disabled"
-msgstr "Forçar travamento no repositório. Só funciona quando o acesso anônimo está desabilitado"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:284
-msgid "Set as fork of"
-msgstr "Marque como bifurcação de"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:289
-msgid "Set"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:293
-msgid "Manually set this repository as a fork of another from the list"
-msgstr "Marque manualmente este repositório como uma bifurcação de um outro da lista"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:308
-msgid "Remove this repository"
-msgstr "Remover deste repositório"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:308
-msgid "Confirm to delete this repository"
-msgstr "Confirma excluir este repositório"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:310
-#, python-format
-msgid "this repository has %s fork"
-msgid_plural "this repository has %s forks"
-msgstr[0] "este repositório tem %s bifurcação"
-msgstr[1] "este repositório tem %s bifurcações"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:311
-msgid "Detach forks"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:312
-msgid "Delete forks"
-msgstr "Excluir bifurcações"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:315
-msgid ""
-"This repository will be renamed in a special way in order to be unaccesible "
-"for RhodeCode and VCS systems. If you need to fully delete it from file "
-"system please do it manually"
-msgstr "Este repositório será renomeado de um modo especial para não ser mais acessívei pelo RhodeCode ou outros sistemas VCS. Se você precisa excluí-lo totalmente do sistema de arquivos, por favor, faça-o manualmente"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:329
-msgid "Extra fields"
-msgstr "Campos extras"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:341
-#, python-format
-msgid "Confirm to delete this field: %s"
-msgstr "Confirme para excluir este campo: %s"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:355
-msgid "New field key"
-msgstr "Próxima chave de campo"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:363
-msgid "New field label"
-msgstr "Próximo rótulo de campo"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:366
-msgid "Enter short label"
-msgstr "Entre com o rótulo curto"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:372
-msgid "New field description"
-msgstr "Nova descrição de campo"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:375
-msgid "Enter description of a field"
-msgstr "Entre com a descrição de um campo"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:3
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3
-msgid "none"
-msgstr "nenhum"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:4
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4
-msgid "read"
-msgstr "ler"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:5
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5
-msgid "write"
-msgstr "escrever"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:6
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6
-msgid "admin"
-msgstr "administrador"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:7
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7
-msgid "member"
-msgstr "membro"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-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:20
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35
-msgid "default"
-msgstr "padrão"
-
-#: 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:25
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:55
-msgid "revoke"
-msgstr "revogar"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:83
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81
-msgid "Add another member"
-msgstr "Adicionar outro membro"
-
-#: rhodecode/templates/admin/repos/repos.html:5
-msgid "Repositories administration"
-msgstr "Administração de repositórios"
-
-#: rhodecode/templates/admin/repos/repos.html:88
-#: rhodecode/templates/admin/users/user_edit_my_account.html:185
-#: rhodecode/templates/admin/users/users.html:109
-#: rhodecode/templates/bookmarks/bookmarks.html:76
-#: rhodecode/templates/branches/branches.html:75
-#: rhodecode/templates/journal/journal.html:206
-#: rhodecode/templates/journal/journal.html:296
-#: rhodecode/templates/tags/tags.html:76
-msgid "No records found."
-msgstr "Nenhum registro encontrado."
-
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
-msgid "apply to children"
-msgstr "aplicar aos filhos"
-
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88
-msgid ""
-"Set or revoke permission to all children of that group, including non-"
-"private repositories and other groups"
-msgstr "Dar ou revocar permissão de todos os filhos daquele grupo, incluindo repositórios públicos e outros grupos"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
-#, python-format
-msgid "%s Group Dashboard"
-msgstr "Dashboard de Grupo %s"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:9
-msgid "Home"
-msgstr "Início"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:13
-msgid "with"
-msgstr "com"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
-msgid "Add repository group"
-msgstr "Adicionar grupo de repositórios"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16
-#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91
-msgid "Repository groups"
-msgstr "Grupo de repositórios"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13
-msgid "Add new repository group"
-msgstr "Adicionar novo grupo de repositórios"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56
-msgid "Group parent"
-msgstr "Progenitor do grupo"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59
-msgid "save"
-msgstr "salvar"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
-msgid "Edit repository group"
-msgstr "Editar grupo de repositórios"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13
-#, python-format
-msgid "Edit repository group %s"
-msgstr "Editar grupo de repositórios %s"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27
-msgid "Add child group"
-msgstr "Adicionar grupo filho"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68
-msgid ""
-"Enable lock-by-pulling on group. This option will be applied to all other "
-"groups and repositories inside"
-msgstr "Habilitar trava-por-pulling no grupo. Esta opção será aplicada a todos os outros grupos e repositórios dentro deles"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
-msgid "Repository groups administration"
-msgstr "Administração de grupos de repositórios"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45
-msgid "Number of toplevel repositories"
-msgstr "Número de repositórios de nível superior"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64
-#: rhodecode/templates/admin/users_groups/users_groups.html:48
-#: rhodecode/templates/changeset/changeset_file_comment.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:171
-msgid "Edit"
-msgstr "Editar"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65
-#: rhodecode/templates/admin/users_groups/users_groups.html:49
-#: rhodecode/templates/base/perms_summary.html:29
-#: rhodecode/templates/base/perms_summary.html:60
-#: rhodecode/templates/base/perms_summary.html:62
-#: rhodecode/templates/data_table/_dt_elements.html:116
-#: rhodecode/templates/data_table/_dt_elements.html:117
-#: rhodecode/templates/data_table/_dt_elements.html:130
-#: rhodecode/templates/data_table/_dt_elements.html:131
-msgid "edit"
-msgstr "editar"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:54
+#: rhodecode/templates/admin/repos/repo_edit.html:49
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:43
+#: rhodecode/templates/admin/users/user_edit.html:44
+msgid "Advanced"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:1
+#, python-format
+msgid "Repository Group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:6
+msgid "Top level repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:7
+msgid "Total repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:8
+msgid "Children groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_advanced.html:8
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+msgid "Created on"
+msgstr "Criado em"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:192
 #, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
 msgstr[0] "Confirme para excluir este grupo: %s com %s repositório"
 msgstr[1] "Confirme para excluir este grupo: %s com %s repositórios"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78
-msgid "There are no repository groups yet"
-msgstr "Não há nenhum grupo de repositório ainda"
-
-#: rhodecode/templates/admin/settings/hooks.html:5
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:25
+msgid "Delete this repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:7
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:8
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:7
+#: rhodecode/templates/base/perms_summary.html:14
+msgid "none"
+msgstr "nenhum"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:8
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:8
+#: rhodecode/templates/base/perms_summary.html:15
+msgid "read"
+msgstr "ler"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:9
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:10
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:9
+#: rhodecode/templates/base/perms_summary.html:16
+msgid "write"
+msgstr "escrever"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:10
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:10
+#: rhodecode/templates/base/perms_summary.html:17
+msgid "admin"
+msgstr "administrador"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:11
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:12
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:11
+msgid "user/user group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:28
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:45
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:24
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:37
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:28
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:45
+msgid "default"
+msgstr "padrão"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:34
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:71
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:43
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:68
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:34
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:71
+msgid "revoke"
+msgstr "revogar"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:47
+msgid "delegated admin"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:97
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:94
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:97
+msgid "Add new"
+msgstr "Adicionar novo"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:103
+msgid "apply to children"
+msgstr "aplicar aos filhos"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:107
+msgid "Both"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:108
+msgid ""
+"Set or revoke permission to all children of that group, including non-"
+"private repositories and other groups if selected."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:38
+msgid ""
+"Enable lock-by-pulling on group. This option will be applied to all other "
+"groups and repositories inside"
+msgstr "Habilitar trava-por-pulling no grupo. Esta opção será aplicada a todos os outros grupos e repositórios dentro deles"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:4
+#, python-format
+msgid "%s Repository group dashboard"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:12
+msgid "Home"
+msgstr "Início"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:16
+msgid "with"
+msgstr "com"
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:5
+msgid "Repository groups administration"
+msgstr "Administração de grupos de repositórios"
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+msgid "repository groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:52
+msgid "Number of toplevel repositories"
+msgstr "Número de repositórios de nível superior"
+
+#: rhodecode/templates/admin/repos/repo_add.html:5
+msgid "Add repository"
+msgstr "Adicionar repositório"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:14
+msgid "Import existing repository ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:23
+#: rhodecode/templates/summary/summary.html:32
+msgid "Clone from"
+msgstr "Clonar de"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:27
+msgid "Optional http[s] url from which repository should be cloned."
+msgstr "URL opcional http[s] da qual o repositório deve ser clonado."
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:36
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:76
+#: rhodecode/templates/forks/fork.html:45
+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:45
+#: rhodecode/templates/forks/fork.html:55
+msgid "Optionaly select a group to put this repository into."
+msgstr "Opcionalmente, selecione um grupo no qual colocar este repositório"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:63
+msgid "Type of repository to create."
+msgstr "Tipo de repositório a criar."
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:51
+#: rhodecode/templates/forks/fork.html:61
+msgid "Landing revision"
+msgstr "Revisão de pouso"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:72
+msgid ""
+"Default revision for files page, downloads, full text search index and "
+"readme generation"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:9
+#, python-format
+msgid "%s Creating repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:16
+msgid "Creating repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:30
+#, python-format
+msgid ""
+"Repository \"%(repo_name)s\" is beeing created, you will be redirected when "
+"this process is finished.repo_name"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:42
+msgid ""
+"We're sorry but error occured during this operation. Please check your "
+"RhodeCode server logs, or contact administrator."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:8
+#, python-format
+msgid "%s repository settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:52
+msgid "Extra fields"
+msgstr "Campos extras"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:55
+msgid "Caches"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:58
+msgid "Remote"
+msgstr "Remoto"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:61
+#: rhodecode/templates/summary/statistics.html:11
+#: rhodecode/templates/summary/summary.html:178
+#: rhodecode/templates/summary/summary.html:179
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:1
+#: rhodecode/templates/summary/summary.html:25
+msgid "Fork of"
+msgstr "Bifurcação de"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:6
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:5
+msgid "Set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:10
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:9
+msgid "Manually set this repository as a fork of another from the list"
+msgstr "Marque manualmente este repositório como uma bifurcação de um outro da lista"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:24
+msgid "Public journal visibility"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:32
+msgid "Remove from public journal"
+msgstr "Remover do diário público"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:37
+msgid "Add to public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:43
+msgid ""
+"All actions made on this repository will be accessible to everyone in public"
+" journal"
+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_advanced.html:49
+msgid "Change locking"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:56
+msgid "Confirm to unlock repository"
+msgstr "Confirme para destravar repositório"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:58
+msgid "Unlock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:64
+msgid "Confirm to lock repository"
+msgstr "Confirme para travar repositório"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:66
+msgid "Lock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:68
+msgid "Repository is not locked"
+msgstr "Repositório não está travado"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:73
+msgid ""
+"Force locking on repository. Works only when anonymous access is disabled. "
+"Trigering a pull locks repository by user who pulled, only the same user can"
+" unlock by doing a push"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:83
+#: rhodecode/templates/data_table/_dt_elements.html:132
+#, python-format
+msgid "Confirm to delete this repository: %s"
+msgstr "Confirma excluir esse repositório: %s"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:85
+msgid "Delete this repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:88
+#, python-format
+msgid "this repository has %s fork"
+msgid_plural "this repository has %s forks"
+msgstr[0] "este repositório tem %s bifurcação"
+msgstr[1] "este repositório tem %s bifurcações"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:89
+msgid "Detach forks"
+msgstr "Desassociar bifurcações"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:90
+msgid "Delete forks"
+msgstr "Excluir bifurcações"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:94
+msgid ""
+"This repository will be renamed in a special way in order to be unaccesible "
+"for RhodeCode and VCS systems. If you need to fully delete it from file "
+"system please do it manually"
+msgstr "Este repositório será renomeado de um modo especial para não ser mais acessívei pelo RhodeCode ou outros sistemas VCS. Se você precisa excluí-lo totalmente do sistema de arquivos, por favor, faça-o manualmente"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Invalidate repository cache"
+msgstr "Invalidar cache do repositório"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Confirm to invalidate repository cache"
+msgstr "Confirma invalidar cache do repositório"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:7
+msgid ""
+"Manually invalidate cache for this repository. On first access repository "
+"will be cached again"
+msgstr "Invalidar manualmente o cache deste repositório. No próximo acesso o repositório será cacheado novamente"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:12
+msgid "List of cached values"
+msgstr "Lista de valores cacheados"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:15
+msgid "Prefix"
+msgstr "Prefixo"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:16
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:6
+msgid "Key"
+msgstr "Chave"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:17
+#: rhodecode/templates/admin/user_groups/user_group_add.html:52
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:24
+#: rhodecode/templates/admin/user_groups/user_groups.html:53
+#: rhodecode/templates/admin/users/user_add.html:91
+#: rhodecode/templates/admin/users/user_edit_profile.html:105
+#: rhodecode/templates/admin/users/users.html:57
+msgid "Active"
+msgstr "Ativo"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:5
+msgid "Label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:19
+#, python-format
+msgid "Confirm to delete this field: %s"
+msgstr "Confirme para excluir este campo: %s"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:33
+msgid "New field key"
+msgstr "Próxima chave de campo"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:41
+msgid "New field label"
+msgstr "Próximo rótulo de campo"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:44
+msgid "Enter short label"
+msgstr "Entre com o rótulo curto"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:50
+msgid "New field description"
+msgstr "Nova descrição de campo"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:53
+msgid "Enter description of a field"
+msgstr "Entre com a descrição de um campo"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:66
+msgid "Extra fields are disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:21
+msgid "private repository"
+msgstr "repositório privado"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:3
+msgid "Remote url"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+msgid "Pull changes from remote location"
+msgstr "Realizar pull de alterações a partir de localização remota"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+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_remote.html:14
+msgid "This repository does not have any remote url set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "Non-changeable id"
+msgstr "ID inalterável"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "what is that ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:13
+msgid "URL by id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:14
+msgid ""
+"In case this repository is renamed or moved into another group the repository url changes.\n"
+"                               Using above url guarantees that this repository will allways be accessible under such url.\n"
+"                               Usefull for CI systems, or any other cases that you need to hardcode the url into 3rd party service."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:21
+msgid "Clone uri"
+msgstr "URI de clonagem"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:27
+#: rhodecode/templates/base/perms_summary.html:43
+#: rhodecode/templates/base/perms_summary.html:79
+#: rhodecode/templates/base/perms_summary.html:81
+#: rhodecode/templates/data_table/_dt_elements.html:124
+#: rhodecode/templates/data_table/_dt_elements.html:125
+#: rhodecode/templates/data_table/_dt_elements.html:152
+#: rhodecode/templates/data_table/_dt_elements.html:153
+#: rhodecode/templates/data_table/_dt_elements.html:169
+#: rhodecode/templates/data_table/_dt_elements.html:185
+msgid "edit"
+msgstr "editar"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:30
+msgid "new value"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:37
+msgid "http[s] url used for doing remote pulls."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:46
+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_settings.html:55
+#: rhodecode/templates/forks/fork.html:65
+msgid "Default revision for files page, downloads, whoosh and readme"
+msgstr "Revisão padrão para página de arquivos, downloads, whoosh e readme"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:65
+msgid "Change owner of this repository."
+msgstr "Mudar o dono desse repositório."
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:6
+msgid "Processed commits"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:7
+msgid "Processed progress"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Reset statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Confirm to remove current statistics"
+msgstr "Confirma remover atuais estatísticas"
+
+#: rhodecode/templates/admin/repos/repos.html:5
+msgid "Repositories administration"
+msgstr "Administração de repositórios"
+
+#: rhodecode/templates/admin/repos/repos.html:54
+msgid "State"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings.html:5
 msgid "Settings administration"
 msgstr "Administração de configurações"
 
-#: rhodecode/templates/admin/settings/hooks.html:24
-msgid "Built in hooks - read only"
-msgstr "Ganchos pré-definidos - somente leitura"
-
-#: rhodecode/templates/admin/settings/hooks.html:40
-msgid "Custom hooks"
-msgstr "Ganchos customizados"
-
-#: rhodecode/templates/admin/settings/hooks.html:56
-msgid "remove"
-msgstr "remover"
-
-#: rhodecode/templates/admin/settings/hooks.html:88
-msgid "Failed to remove hook"
-msgstr "Falha ao remover gancho"
-
-#: rhodecode/templates/admin/settings/settings.html:26
-msgid "Remap and rescan repositories"
-msgstr "Remapear e varrer novamente repositórios"
-
-#: rhodecode/templates/admin/settings/settings.html:34
-msgid "Rescan option"
-msgstr "Opção de varredura"
-
 #: rhodecode/templates/admin/settings/settings.html:40
-msgid ""
-"In case a repository was deleted from filesystem and there are leftovers in "
-"the database check this option to scan obsolete data in database and remove "
-"it."
-msgstr "Caso um repositório tenha sido excluído do sistema de arquivos e haja restos no banco de dados, marque esta opção para varrer dados obsoletos no banco e removê-los."
+msgid "VCS"
+msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:41
-msgid "Destroy old data"
-msgstr "Destruir dados antigos"
+msgid "Remap and rescan"
+msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:43
-msgid ""
-"Rescan repositories location for new repositories. Also deletes obsolete if "
-"`destroy` flag is checked "
-msgstr "Local de varredura para novos repositórios. Também exclui obsoletos se a opção `destruir` estiver habilitada"
+msgid "Visual"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:45
+#: rhodecode/templates/admin/settings/settings_vcs.html:19
+msgid "Hooks"
+msgstr "Ganchos"
+
+#: rhodecode/templates/admin/settings/settings.html:46
+msgid "Full text search"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:47
+msgid "System Info"
+msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:48
-msgid "Rescan repositories"
-msgstr "Varrer repositórios"
-
-#: rhodecode/templates/admin/settings/settings.html:54
-msgid "Whoosh indexing"
-msgstr "Indexação do Whoosh"
-
-#: rhodecode/templates/admin/settings/settings.html:62
-msgid "Index build option"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:67
-msgid "Build from scratch"
-msgstr "Construir do zero"
-
-#: rhodecode/templates/admin/settings/settings.html:73
-msgid "Reindex"
-msgstr "Reindexar"
-
-#: rhodecode/templates/admin/settings/settings.html:79
-msgid "Global application settings"
-msgstr "Configurações globais da aplicação"
-
-#: rhodecode/templates/admin/settings/settings.html:88
+msgid "License"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:4
+msgid "Email prefix"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:5
+msgid "RhodeCode email from"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:6
+msgid "Error email from"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:7
+msgid "Error email recipients"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:9
+msgid "SMTP server"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:10
+msgid "SMTP username"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:11
+msgid "SMTP password"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:12
+msgid "SMTP port"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:14
+msgid "SMTP use TLS"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:15
+msgid "SMTP use SSL"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:16
+msgid "SMTP auth"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:31
+msgid "Send test email to"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:39
+msgid "Send"
+msgstr "Enviar"
+
+#: rhodecode/templates/admin/settings/settings_global.html:8
 msgid "Site branding"
 msgstr "Marca do site"
 
-#: rhodecode/templates/admin/settings/settings.html:97
+#: rhodecode/templates/admin/settings/settings_global.html:12
+msgid "Set a custom title for your RhodeCode Service."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:18
 msgid "HTTP authentication realm"
 msgstr "Realm de autenticação HTTP"
 
-#: rhodecode/templates/admin/settings/settings.html:106
+#: rhodecode/templates/admin/settings/settings_global.html:27
 msgid "Google Analytics code"
 msgstr "Código do Google Analytics"
 
-#: rhodecode/templates/admin/settings/settings.html:114
-#: rhodecode/templates/admin/settings/settings.html:195
-#: rhodecode/templates/admin/settings/settings.html:287
+#: rhodecode/templates/admin/settings/settings_global.html:36
+msgid "ReCaptcha public key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:40
+msgid "Public key for reCaptcha system."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:46
+msgid "ReCaptcha private key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:50
+msgid ""
+"Private key for reCaptcha system. Setting this value will enable captcha on "
+"registration"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:55
+#: rhodecode/templates/admin/settings/settings_license.html:42
+#: rhodecode/templates/admin/settings/settings_vcs.html:80
+#: rhodecode/templates/admin/settings/settings_visual.html:115
 msgid "Save settings"
 msgstr "Salvar configurações"
 
-#: rhodecode/templates/admin/settings/settings.html:121
-msgid "Visualisation settings"
-msgstr "Configurações de visualização"
-
-#: rhodecode/templates/admin/settings/settings.html:129
-msgid "General"
-msgstr "Geral"
-
-#: rhodecode/templates/admin/settings/settings.html:134
-msgid "Use repository extra fields"
-msgstr "Usar campos extras do repositório"
-
-#: rhodecode/templates/admin/settings/settings.html:136
-msgid "Allows storing additional customized fields per repository."
-msgstr "Permite armazenar campos customizados adicionais por repositório."
-
-#: rhodecode/templates/admin/settings/settings.html:139
-msgid "Show RhodeCode version"
-msgstr "Mostrar versão do RhodeCode"
-
-#: rhodecode/templates/admin/settings/settings.html:141
-msgid "Shows or hides displayed version of RhodeCode in the footer"
-msgstr "Mostra ou esconde a versão do RhodeCode no rodapé"
-
-#: rhodecode/templates/admin/settings/settings.html:146
-msgid "Dashboard items"
-msgstr "Itens do dashboard"
-
-#: rhodecode/templates/admin/settings/settings.html:150
+#: rhodecode/templates/admin/settings/settings_hooks.html:1
+msgid "Built in Mercurial hooks - read only"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:15
+msgid ""
+"Hooks can be used to trigger actions on certain events such as push / pull. "
+"They can trigger Python functions or external applications."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:19
+msgid "Custom hooks"
+msgstr "Ganchos customizados"
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:69
+msgid "Failed to remove hook"
+msgstr "Falha ao remover gancho"
+
+#: rhodecode/templates/admin/settings/settings_license.html:2
+msgid "Currently you're using a free license, which is limited to 20 users."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:9
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "RhodeCode version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "License token"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "No license token"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:13
+msgid "License issued to"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:14
+msgid "License issued on"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "License users limit"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "unlimited"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:16
+msgid "License expires on"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:33
+msgid "License key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:37
+msgid "Paste your RhodeCode license key into that textarea."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:52
+msgid ""
+"Please enter following lines (if yet not present) into [app:main] section of"
+" your .ini file. The token below is autogenerated."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:6
+msgid "Rescan option"
+msgstr "Opção de varredura"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:11
+msgid "Destroy old data"
+msgstr "Destruir dados antigos"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:13
 msgid ""
-"Number of items displayed in lightweight dashboard before pagination is "
-"shown."
-msgstr "Número de itens apresentados no dashboard leve antes de mostrar a paginação."
-
-#: rhodecode/templates/admin/settings/settings.html:155
-msgid "Icons"
-msgstr "Ícones"
-
-#: rhodecode/templates/admin/settings/settings.html:160
-msgid "Show public repo icon on repositories"
-msgstr "Mostrar ícone de repositório público nos repositórios"
-
-#: rhodecode/templates/admin/settings/settings.html:164
-msgid "Show private repo icon on repositories"
-msgstr "Mostrar ícone de repositório privado nos repositórios"
-
-#: rhodecode/templates/admin/settings/settings.html:166
-msgid "Show public/private icons next to repositories names"
-msgstr "Mostrar ícones público/privado ao lado dos nomes dos repositórios"
-
-#: rhodecode/templates/admin/settings/settings.html:172
-msgid "Meta-Tagging"
-msgstr "Meta-Tagging"
-
-#: rhodecode/templates/admin/settings/settings.html:177
-msgid "Stylify recognised metatags:"
-msgstr "Estilizar as metatags reconhecidas:"
-
-#: rhodecode/templates/admin/settings/settings.html:204
-msgid "VCS settings"
-msgstr "Configurações de VCS"
-
-#: rhodecode/templates/admin/settings/settings.html:213
+"In case a repository was deleted from filesystem and it still exists in the "
+"database check this option to scan obsolete data in database and remove it."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:17
+msgid "Invalidate cache for all repositories"
+msgstr "Invalidar o cache para todos os repositórios"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:19
+msgid ""
+"Each cache data for repositories will be cleaned with this option selected. "
+"Use this to reload data and clear cache keys."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:23
+msgid "Install GIT hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:25
+msgid ""
+"Verify if RhodeCodes GIT hooks are installed for each repository. Current "
+"hooks will be updated to latest version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:32
+msgid "Rescan Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:7
+msgid "Index build option"
+msgstr "Opção de construção do índice"
+
+#: rhodecode/templates/admin/settings/settings_search.html:12
+msgid "Build from scratch"
+msgstr "Construir do zero"
+
+#: rhodecode/templates/admin/settings/settings_search.html:15
+msgid ""
+"This option completely reindex all the files within RhodeCode for proper "
+"fulltext search capabilities."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:21
+msgid "Reindex"
+msgstr "Reindexar"
+
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "check for updates"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:5
+msgid "Python version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:6
+msgid "Platform"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:7
+msgid "GIT version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:8
+msgid "GIT path"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Upgrade info endpoint"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Note: please make sure this server can access this url"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:14
+msgid "Checking for updates..."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:22
+msgid "Python packages"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr "Web"
 
-#: rhodecode/templates/admin/settings/settings.html:218
+#: rhodecode/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr "Requer SSL para operações de VCS"
 
-#: rhodecode/templates/admin/settings/settings.html:220
+#: rhodecode/templates/admin/settings/settings_vcs.html:13
 msgid ""
-"RhodeCode will require SSL for pushing or pulling. If SSL is missing it will"
-" return HTTP Error 406: Not Acceptable"
-msgstr "O RhodeCode vai requerer SSL para push ou pull. Conexões não-SSL vão retornar HTTP Error 406: Not Acceptable"
-
-#: rhodecode/templates/admin/settings/settings.html:226
-msgid "Hooks"
-msgstr "Ganchos"
-
-#: rhodecode/templates/admin/settings/settings.html:231
-msgid "Update repository after push (hg update)"
-msgstr "Atualizar repositório após realizar push (hg update)"
-
-#: rhodecode/templates/admin/settings/settings.html:235
+"Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
+"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr "Mostrar tamanho do repositório após o push"
 
-#: rhodecode/templates/admin/settings/settings.html:239
+#: rhodecode/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr "Armazenar registro de comandos de push dos usuários"
 
-#: rhodecode/templates/admin/settings/settings.html:243
+#: rhodecode/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
 msgstr "Armazenar registro de comandos de pull dos usuários"
 
-#: rhodecode/templates/admin/settings/settings.html:247
-msgid "Advanced setup"
-msgstr "Configuração avançada"
-
-#: rhodecode/templates/admin/settings/settings.html:252
+#: rhodecode/templates/admin/settings/settings_vcs.html:36
+msgid "Update repository after push (hg update)"
+msgstr "Atualizar repositório após realizar push (hg update)"
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:42
 msgid "Mercurial Extensions"
 msgstr "Extensões do Mercurial"
 
-#: rhodecode/templates/admin/settings/settings.html:257
+#: rhodecode/templates/admin/settings/settings_vcs.html:47
 msgid "Enable largefiles extension"
 msgstr "Habilitar extensão largefiles"
 
-#: rhodecode/templates/admin/settings/settings.html:261
+#: rhodecode/templates/admin/settings/settings_vcs.html:51
 msgid "Enable hgsubversion extension"
 msgstr "Habilitar extensão hgsubversion"
 
-#: rhodecode/templates/admin/settings/settings.html:263
+#: rhodecode/templates/admin/settings/settings_vcs.html:53
 msgid ""
-"Requires hgsubversion library installed. Allows cloning from svn remote "
-"locations"
-msgstr "Requer que a biblioteca hgsubversion estaja instalada. Permite clonagem de remotos SVN"
-
-#: rhodecode/templates/admin/settings/settings.html:274
+"Requires hgsubversion library to be installed. Allows cloning remote SVN "
+"repositories and migrates them to Mercurial type."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:64
 msgid "Repositories location"
 msgstr "Localização dos repositórios"
 
-#: rhodecode/templates/admin/settings/settings.html:279
+#: rhodecode/templates/admin/settings/settings_vcs.html:69
 msgid ""
 "Click to unlock. You must restart RhodeCode in order to make this setting "
 "take effect."
 msgstr "Clique para destravar. Você deve reiniciar o RhodeCode para que esta configuração tenha efeito."
 
-#: rhodecode/templates/admin/settings/settings.html:280
-#: rhodecode/templates/base/base.html:143
-msgid "Unlock"
-msgstr "Destravar"
-
-#: rhodecode/templates/admin/settings/settings.html:282
+#: rhodecode/templates/admin/settings/settings_vcs.html:72
+msgid ""
+"Filesystem location where repositories should be stored. After changing this"
+" value a restart and rescan of the repository folder are required."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:8
+msgid "General"
+msgstr "Geral"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:13
+msgid "Use repository extra fields"
+msgstr "Usar campos extras do repositório"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:15
+msgid "Allows storing additional customized fields per repository."
+msgstr "Permite armazenar campos customizados adicionais por repositório."
+
+#: rhodecode/templates/admin/settings/settings_visual.html:18
+msgid "Show RhodeCode version"
+msgstr "Mostrar versão do RhodeCode"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:20
+msgid "Shows or hides a version number of RhodeCode displayed in the footer."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:24
+msgid "Use Gravatars in RhodeCode"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:30
+msgid ""
+"Gravatar url allows you to use other avatar server application.\n"
+"                                                        Following variables of the URL will be replaced accordingly.\n"
+"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {email}     user email,\n"
+"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
+"                                                        {size}      size of the image that is expected from the server application,\n"
+"                                                        {netloc}    network location/server host of running RhodeCode server"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:42
+msgid ""
+"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
+"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {user}   current user username,\n"
+"                                                        {netloc} network location/server host of running RhodeCode server,\n"
+"                                                        {repo}   full repository name,\n"
+"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:54
+msgid "Dashboard items"
+msgstr "Itens do dashboard"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:58
+msgid ""
+"Number of items displayed in the main page dashboard before pagination is "
+"shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:64
+msgid "Admin pages items"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:68
 msgid ""
-"Location where repositories are stored. After changing this value a restart,"
-" and rescan is required"
-msgstr "Local onde os repositórios são armazenados. Depois de mudar este valor uma reinicialização e uma nova varredura são requeridas"
-
-#: rhodecode/templates/admin/settings/settings.html:303
-msgid "Test Email"
-msgstr "Testar E-mail"
-
-#: rhodecode/templates/admin/settings/settings.html:311
-msgid "Email to"
-msgstr "E-mail para"
-
-#: rhodecode/templates/admin/settings/settings.html:319
-msgid "Send"
-msgstr "Enviar"
-
-#: rhodecode/templates/admin/settings/settings.html:325
-msgid "System Info and Packages"
-msgstr "Informações de Sistema e Pacotes"
-
-#: rhodecode/templates/admin/settings/settings.html:328
-#: rhodecode/templates/changelog/changelog.html:51
-msgid "Show"
-msgstr "Mostrar"
+"Number of items displayed in the admin pages grids before pagination is "
+"shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:74
+msgid "Icons"
+msgstr "Ícones"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:79
+msgid "Show public repo icon on repositories"
+msgstr "Mostrar ícone de repositório público nos repositórios"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:83
+msgid "Show private repo icon on repositories"
+msgstr "Mostrar ícone de repositório privado nos repositórios"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:85
+msgid "Show public/private icons next to repositories names."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:91
+msgid "Meta-Tagging"
+msgstr "Meta-Tagging"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:96
+msgid "Stylify recognised meta tags:"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:110
+msgid ""
+"Parses meta tags from repository description field and turns them into "
+"colored tags."
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:5
+msgid "Add user group"
+msgstr "Adicionar grupo de usuários"
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:13
+#: rhodecode/templates/base/base.html:73 rhodecode/templates/base/base.html:93
+msgid "User groups"
+msgstr "Grupos de usuários"
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:28
+msgid "Add User Group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:19
+msgid "Short, optional description for this user group."
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:5
+#, python-format
+msgid "%s user group settings"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:14
+msgid "User Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:44
+#: rhodecode/templates/admin/users/user_edit.html:45
+msgid "Default permissions"
+msgstr "Permissões padrão"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:6
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:32
+#: rhodecode/templates/admin/user_groups/user_groups.html:52
+msgid "Members"
+msgstr "Membros"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:1
+#, python-format
+msgid "User Group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:19
+#: rhodecode/templates/data_table/_dt_elements.html:176
+#, python-format
+msgid "Confirm to delete this user group: %s"
+msgstr "Confirme para excluir este grupo de usuário: %s"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:21
+msgid "Delete this user group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_members.html:15
+msgid "No members yet"
+msgstr "Nenhum membro ainda"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:40
+msgid "Chosen group members"
+msgstr "Membros escolhidos do grupo"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:43
+msgid "Remove all elements"
+msgstr "Remover todos os elementos"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:53
+msgid "Available members"
+msgstr "Membros disponíveis"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:56
+msgid "Add all elements"
+msgstr "Adicionar todos os elementos"
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:5
+msgid "User groups administration"
+msgstr "Administração de grupos de usuários"
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+msgid "user groups"
+msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr "Adicionar usuário"
 
-#: rhodecode/templates/admin/users/user_add.html:10
-#: rhodecode/templates/admin/users/user_edit.html:11
-#: rhodecode/templates/base/base.html:76
+#: rhodecode/templates/admin/users/user_add.html:13
+#: rhodecode/templates/admin/users/user_edit.html:14
+#: rhodecode/templates/base/base.html:72
 msgid "Users"
 msgstr "Usuários"
 
-#: rhodecode/templates/admin/users/user_add.html:12
-#: rhodecode/templates/admin/users/users.html:23
-msgid "Add new user"
-msgstr "Adicionar novo usuário"
-
-#: rhodecode/templates/admin/users/user_add.html:50
+#: rhodecode/templates/admin/users/user_add.html:15
+#: rhodecode/templates/admin/users/users.html:27
+msgid "Add User"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_add.html:53
 msgid "Password confirmation"
 msgstr "Confirmação de senha"
 
 #: rhodecode/templates/admin/users/user_edit.html:5
-msgid "Edit user"
-msgstr "Editar usuário"
-
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#, python-format
-msgid "Edit %s"
-msgstr "Editar %s"
-
-#: rhodecode/templates/admin/users/user_edit.html:34
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:10
-msgid "Change your avatar at"
-msgstr "Altere o seu avatar em"
-
-#: rhodecode/templates/admin/users/user_edit.html:35
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:11
-msgid "Using"
-msgstr "Usando"
-
-#: rhodecode/templates/admin/users/user_edit.html:43
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:20
-msgid "API key"
-msgstr "Chave de API"
-
-#: rhodecode/templates/admin/users/user_edit.html:50
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25
-msgid "Current IP"
-msgstr "IP atual"
-
-#: rhodecode/templates/admin/users/user_edit.html:70
-msgid "LDAP DN"
-msgstr "DN LDAP"
-
-#: rhodecode/templates/admin/users/user_edit.html:79
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
-msgid "New password"
-msgstr "Nova senha"
-
-#: rhodecode/templates/admin/users/user_edit.html:88
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
+#, python-format
+msgid "%s user settings"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:46
+msgid "Emails"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:47
+msgid "Ip whitelist"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:1
+#, python-format
+msgid "User: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_profile.html:51
+msgid "Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:9
+msgid "Last Login"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:10
+msgid "Member of User groups"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:160
+#, python-format
+msgid "Confirm to delete this user: %s"
+msgstr "Confirma excluir este usuário: %s"
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:23
+msgid "Delete this user"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_ips.html:8
+#, python-format
+msgid "Inherited from %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:8
+msgid "Change avatar at"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:12
+msgid "Missing email, please update this user email address."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:27
+#, python-format
+msgid ""
+"This user is in an external Source of Record (%s); some details cannot be "
+"managed here."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:60
+msgid "Name in Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr "Confirmação de nova senha"
 
-#: rhodecode/templates/admin/users/user_edit.html:163
-msgid "Email addresses"
-msgstr "Endereços de email"
-
-#: rhodecode/templates/admin/users/user_edit.html:176
-#, python-format
-msgid "Confirm to delete this email: %s"
-msgstr "Confirme para excluir este email: %s"
-
-#: rhodecode/templates/admin/users/user_edit.html:190
-msgid "New email address"
-msgstr "Novo endereço de email"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:254
-msgid "My account"
-msgstr "Minha conta"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:9
-msgid "My Account"
-msgstr "Minha Conta"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:35
-msgid "My permissions"
-msgstr "Minhas permissões"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:54
-msgid "My repos"
-msgstr "Meus repositórios"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:41
-msgid "My pull requests"
-msgstr "Meus pull requests"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4
-msgid "Show closed pull requests"
-msgstr "Mostrar pull requests fechados"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6
-msgid "Opened by me"
-msgstr "Abertos por mim"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
-#, python-format
-msgid "Pull request #%s opened on %s"
-msgstr "Pull request $%s aberto em %s"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45
-#: rhodecode/templates/pullrequests/pullrequest_data.html:11
-#: rhodecode/templates/pullrequests/pullrequest_show.html:27
-#: rhodecode/templates/pullrequests/pullrequest_show.html:42
-msgid "Closed"
-msgstr "Fechado"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23
-msgid "Confirm to delete this pull request"
-msgstr "Confirme para excluir este pull request"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51
-msgid "Nothing here yet"
-msgstr "Não há nada aqui ainda"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34
-msgid "I participate in"
-msgstr "Eu participo em"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42
-#: rhodecode/templates/pullrequests/pullrequest_data.html:8
-#, python-format
-msgid "Pull request #%s opened by %s on %s"
-msgstr "Pull request #%s aberto por %s em %s"
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "Administração de usuários"
 
-#: rhodecode/templates/admin/users/users.html:9
+#: rhodecode/templates/admin/users/users.html:13
 msgid "users"
 msgstr "usuários"
 
-#: rhodecode/templates/admin/users/users.html:80
+#: rhodecode/templates/admin/users/users.html:54
 msgid "Firstname"
 msgstr "Primeiro nome"
 
-#: rhodecode/templates/admin/users/users.html:81
+#: rhodecode/templates/admin/users/users.html:55
 msgid "Lastname"
 msgstr "Último nome"
 
-#: rhodecode/templates/admin/users/users.html:82
+#: rhodecode/templates/admin/users/users.html:56
 msgid "Last login"
 msgstr "Último login"
 
-#: rhodecode/templates/admin/users_groups/users_group_add.html:5
-msgid "Add user group"
-msgstr "Adicionar grupo de usuários"
-
-#: rhodecode/templates/admin/users_groups/users_group_add.html:10
-#: rhodecode/templates/admin/users_groups/users_groups.html:11
-#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94
-msgid "User groups"
-msgstr "Grupos de usuários"
-
-#: rhodecode/templates/admin/users_groups/users_group_add.html:12
-#: rhodecode/templates/admin/users_groups/users_groups.html:26
-msgid "Add new user group"
-msgstr "Adicionar novo grupo de usuários"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:5
-msgid "Edit user group"
-msgstr "Editar grupo de usuários"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:11
-msgid "UserGroups"
-msgstr "Grupos de Usuários"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:50
-#: rhodecode/templates/admin/users_groups/users_groups.html:38
-msgid "Members"
-msgstr "Membros"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:58
-msgid "Chosen group members"
-msgstr "Membros escolhidos do grupo"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:61
-msgid "Remove all elements"
-msgstr "Remover todos os elementos"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:75
-msgid "Available members"
-msgstr "Membros disponíveis"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:79
-msgid "Add all elements"
-msgstr "Adicionar todos os elementos"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:109
-msgid "No members yet"
-msgstr "Nenhum membro ainda"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:117
-msgid "Global Permissions"
-msgstr "Permissões Globais"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:5
-msgid "User groups administration"
-msgstr "Administração de grupos de usuários"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:55
-#, python-format
-msgid "Confirm to delete this user group: %s"
-msgstr "Confirme para excluir este grupo de usuário: %s"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:62
-msgid "There are no user groups yet"
-msgstr "Ainda não há um grupo de usuários sequer"
-
-#: rhodecode/templates/base/base.html:42
+#: rhodecode/templates/admin/users/users.html:59
+msgid "Auth type"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:37
 #, python-format
 msgid "Server instance: %s"
 msgstr "Instância de servidor: %s"
 
-#: rhodecode/templates/base/base.html:52
-msgid "Report a bug"
-msgstr "Relatar um bug"
-
-#: rhodecode/templates/base/base.html:121
-#: rhodecode/templates/data_table/_dt_elements.html:9
+#: rhodecode/templates/base/base.html:46
+msgid "Support"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:131
+msgid "Create fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:142
 #: rhodecode/templates/data_table/_dt_elements.html:11
-#: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/summary/summary.html:8
+#: rhodecode/templates/data_table/_dt_elements.html:15
+#: rhodecode/templates/summary/summary.html:11
 msgid "Summary"
 msgstr "Sumário"
 
-#: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/changelog/changelog.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:17
+#: rhodecode/templates/base/base.html:143
+#: rhodecode/templates/changelog/changelog.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
-#: rhodecode/templates/data_table/_dt_elements.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:23
 msgid "Changelog"
 msgstr "Registro de alterações"
 
-#: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/data_table/_dt_elements.html:25
+#: rhodecode/templates/base/base.html:144
 #: rhodecode/templates/data_table/_dt_elements.html:27
-#: rhodecode/templates/data_table/_dt_elements.html:29
-#: rhodecode/templates/files/files.html:12
+#: rhodecode/templates/data_table/_dt_elements.html:31
+#: rhodecode/templates/files/files.html:15
 msgid "Files"
 msgstr "Arquivos"
 
-#: rhodecode/templates/base/base.html:125
+#: rhodecode/templates/base/base.html:146
 msgid "Switch To"
 msgstr "Trocar Para"
 
-#: rhodecode/templates/base/base.html:127
-#: rhodecode/templates/base/base.html:279
-msgid "loading..."
-msgstr "carregando..."
-
-#: rhodecode/templates/base/base.html:131
+#: rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:155
 msgid "Options"
 msgstr "Opções"
 
-#: rhodecode/templates/base/base.html:137
+#: rhodecode/templates/base/base.html:163
 #: rhodecode/templates/forks/forks_data.html:21
 msgid "Compare fork"
 msgstr "Compare bifurcação"
 
-#: rhodecode/templates/base/base.html:139
-#: rhodecode/templates/base/base.html:312
-#: rhodecode/templates/search/search.html:14
-#: rhodecode/templates/search/search.html:54
+#: rhodecode/templates/base/base.html:165
+#: rhodecode/templates/bookmarks/bookmarks.html:58
+#: rhodecode/templates/bookmarks/bookmarks_data.html:13
+#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/branches/branches_data.html:13
+#: rhodecode/templates/tags/tags.html:58
+#: rhodecode/templates/tags/tags_data.html:13
+msgid "Compare"
+msgstr "Compare"
+
+#: rhodecode/templates/base/base.html:167
+#: rhodecode/templates/base/base.html:334
+#: rhodecode/templates/search/search.html:17
+#: rhodecode/templates/search/search.html:57
 msgid "Search"
 msgstr "Pesquisar"
 
-#: rhodecode/templates/base/base.html:145
+#: rhodecode/templates/base/base.html:171
+msgid "Unlock"
+msgstr "Destravar"
+
+#: rhodecode/templates/base/base.html:173
 msgid "Lock"
 msgstr "Travar"
 
-#: rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:181
 msgid "Follow"
 msgstr "Seguir"
 
-#: rhodecode/templates/base/base.html:154
+#: rhodecode/templates/base/base.html:182
 msgid "Unfollow"
 msgstr "Parar de seguir"
 
-#: rhodecode/templates/base/base.html:157
-#: rhodecode/templates/data_table/_dt_elements.html:33
+#: rhodecode/templates/base/base.html:185
 #: rhodecode/templates/data_table/_dt_elements.html:35
-#: rhodecode/templates/data_table/_dt_elements.html:37
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/forks/fork.html:9
+#: rhodecode/templates/data_table/_dt_elements.html:39
+#: rhodecode/templates/forks/fork.html:12
 msgid "Fork"
 msgstr "Bifurcação"
 
-#: rhodecode/templates/base/base.html:159
+#: rhodecode/templates/base/base.html:187
 msgid "Create Pull Request"
 msgstr "Criar Pull Request"
 
-#: rhodecode/templates/base/base.html:165
-msgid "Show Pull Requests"
-msgstr "Mostrar Pull Requests"
-
-#: rhodecode/templates/base/base.html:165
-msgid "Pull Requests"
-msgstr "Pull Requests"
-
-#: rhodecode/templates/base/base.html:202
+#: rhodecode/templates/base/base.html:193
+#, python-format
+msgid "Show Pull Requests for %s"
+msgstr "Mostrar Pull Requests para %s"
+
+#: rhodecode/templates/base/base.html:230
 msgid "Not logged in"
 msgstr "Não logado"
 
-#: rhodecode/templates/base/base.html:209
+#: rhodecode/templates/base/base.html:237
 msgid "Login to your account"
 msgstr "Entrar com sua conta"
 
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/templates/base/base.html:260
 msgid "Forgot password ?"
 msgstr "Esqueceu a senha ?"
 
-#: rhodecode/templates/base/base.html:255
+#: rhodecode/templates/base/base.html:283
 msgid "Log Out"
 msgstr "Sair"
 
-#: rhodecode/templates/base/base.html:274
-msgid "Switch repository"
-msgstr "Trocar repositório"
-
-#: rhodecode/templates/base/base.html:286
+#: rhodecode/templates/base/base.html:308
 msgid "Show recent activity"
 msgstr "Mostrar atividade recente"
 
-#: rhodecode/templates/base/base.html:287
+#: rhodecode/templates/base/base.html:309
 #: rhodecode/templates/journal/journal.html:4
 msgid "Journal"
 msgstr "Diário"
 
-#: rhodecode/templates/base/base.html:298
+#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:315
+msgid "Public journal"
+msgstr "Diário público"
+
+#: rhodecode/templates/base/base.html:320
 msgid "Show public gists"
 msgstr "Mostrar gists públicos"
 
-#: rhodecode/templates/base/base.html:303
+#: rhodecode/templates/base/base.html:321
+msgid "Gists"
+msgstr "Gists"
+
+#: rhodecode/templates/base/base.html:324
+msgid "Create new gist"
+msgstr "Criar novo gist"
+
+#: rhodecode/templates/base/base.html:325
 msgid "All public gists"
 msgstr "Todos os gists públicos"
 
-#: rhodecode/templates/base/base.html:305
+#: rhodecode/templates/base/base.html:327
 msgid "My public gists"
 msgstr "Meus gists públicos"
 
-#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/base/base.html:328
 msgid "My private gists"
 msgstr "Meus gists privados"
 
-#: rhodecode/templates/base/base.html:311
+#: rhodecode/templates/base/base.html:333
 msgid "Search in repositories"
 msgstr "Buscar nos repositórios"
 
+#: rhodecode/templates/base/base.html:394
+msgid "No matches found"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:522
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:531
+msgid "Site-wide shortcuts"
+msgstr ""
+
 #: rhodecode/templates/base/default_perms_box.html:14
-msgid "Inherit default permissions"
-msgstr "Herdar permissões padrão"
-
-#: rhodecode/templates/base/default_perms_box.html:18
+msgid "Inherit from defaults"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:19
 #, python-format
 msgid ""
-"Select to inherit permissions from %s settings. With this selected below "
-"options does not apply."
-msgstr "Selecione para herdar permissões das configurações de %s. Com isto selecionado as opções abaixo não se aplicam"
-
-#: rhodecode/templates/base/default_perms_box.html:26
+"Select to inherit permissions from %s permissions settings, and default IP "
+"address whitelist."
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:28
 msgid "Create repositories"
 msgstr "Criar repositórios"
 
-#: rhodecode/templates/base/default_perms_box.html:30
+#: rhodecode/templates/base/default_perms_box.html:33
 msgid "Select this option to allow repository creation for this user"
 msgstr "Selecione esta opção para permitir a criação de repositórios para este usuário"
 
-#: rhodecode/templates/base/default_perms_box.html:35
+#: rhodecode/templates/base/default_perms_box.html:40
 msgid "Create user groups"
 msgstr "Criar grupos de usuários"
 
-#: rhodecode/templates/base/default_perms_box.html:39
+#: rhodecode/templates/base/default_perms_box.html:45
 msgid "Select this option to allow user group creation for this user"
 msgstr "Selecione esta opção para permitir a criação de grupos de usuários para este usuário"
 
-#: rhodecode/templates/base/default_perms_box.html:44
+#: rhodecode/templates/base/default_perms_box.html:52
 msgid "Fork repositories"
 msgstr "Bufurcar repositórios"
 
-#: rhodecode/templates/base/default_perms_box.html:48
+#: rhodecode/templates/base/default_perms_box.html:57
 msgid "Select this option to allow repository forking for this user"
 msgstr "Selecione esta opção para permitir a bifurcação de repositórios para este usuário"
 
-#: rhodecode/templates/base/perms_summary.html:11
+#: rhodecode/templates/base/perms_summary.html:13
+msgid "show"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:22
 msgid "No permissions defined yet"
 msgstr "Nenhuma permissão definida ainda"
 
-#: rhodecode/templates/base/perms_summary.html:19
-#: rhodecode/templates/base/perms_summary.html:38
+#: rhodecode/templates/base/perms_summary.html:30
+#: rhodecode/templates/base/perms_summary.html:54
 msgid "Permission"
 msgstr "Permissão"
 
-#: rhodecode/templates/base/perms_summary.html:20
-#: rhodecode/templates/base/perms_summary.html:39
+#: rhodecode/templates/base/perms_summary.html:32
+#: rhodecode/templates/base/perms_summary.html:56
 msgid "Edit Permission"
 msgstr "Editar Permissão"
 
-#: rhodecode/templates/base/root.html:44
+#: rhodecode/templates/base/perms_summary.html:90
+msgid "No permission defined"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:47
 msgid "Add another comment"
 msgstr "Adicionar outro comentário"
 
-#: rhodecode/templates/base/root.html:45
-#: rhodecode/templates/data_table/_dt_elements.html:147
+#: rhodecode/templates/base/root.html:48
+#: rhodecode/templates/data_table/_dt_elements.html:216
 msgid "Stop following this repository"
 msgstr "Parar de seguir este repositório"
 
-#: rhodecode/templates/base/root.html:46
+#: rhodecode/templates/base/root.html:49
 msgid "Start following this repository"
 msgstr "Passar a seguir este repositório"
 
-#: rhodecode/templates/base/root.html:47
+#: rhodecode/templates/base/root.html:50
 msgid "Group"
 msgstr "Grupo"
 
-#: rhodecode/templates/base/root.html:48
+#: rhodecode/templates/base/root.html:51
 msgid "members"
 msgstr "membros"
 
-#: rhodecode/templates/base/root.html:49
-#: rhodecode/templates/pullrequests/pullrequest.html:203
+#: rhodecode/templates/base/root.html:52
+#: rhodecode/templates/pullrequests/pullrequest.html:202
 msgid "Loading ..."
 msgstr "Carregando..."
 
-#: rhodecode/templates/base/root.html:50
+#: rhodecode/templates/base/root.html:53
+msgid "loading ..."
+msgstr "carregando ..."
+
+#: rhodecode/templates/base/root.html:54
 msgid "Search truncated"
 msgstr "Busca truncada"
 
-#: rhodecode/templates/base/root.html:51
+#: rhodecode/templates/base/root.html:55
 msgid "No matching files"
 msgstr "Nenhum arquivo encontrado"
 
-#: rhodecode/templates/base/root.html:52
-#: rhodecode/templates/changelog/changelog.html:45
+#: rhodecode/templates/base/root.html:56
+#: rhodecode/templates/changelog/changelog.html:51
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
 msgid "Open new pull request"
 msgstr "Crie novo pull request"
 
-#: rhodecode/templates/base/root.html:53
+#: rhodecode/templates/base/root.html:57
 msgid "Open new pull request for selected changesets"
 msgstr "Abrir novo pull request para os changesets selecionados"
 
-#: rhodecode/templates/base/root.html:54
+#: rhodecode/templates/base/root.html:58
 msgid "Show selected changesets __S -> __E"
 msgstr "Mostrar changesets selecionados __S -> __E"
 
-#: rhodecode/templates/base/root.html:55
+#: rhodecode/templates/base/root.html:59
 msgid "Show selected changeset __S"
 msgstr "Mostrar changesets selecionados __S"
 
-#: rhodecode/templates/base/root.html:56
+#: rhodecode/templates/base/root.html:60
 msgid "Selection link"
 msgstr "Link da seleção"
 
-#: rhodecode/templates/base/root.html:57
+#: rhodecode/templates/base/root.html:61
 #: rhodecode/templates/changeset/diff_block.html:8
 msgid "Collapse diff"
 msgstr "Colapsar diff"
 
-#: rhodecode/templates/base/root.html:58
+#: rhodecode/templates/base/root.html:62
 msgid "Expand diff"
 msgstr "Expandir diff"
 
-#: rhodecode/templates/base/root.html:59
+#: rhodecode/templates/base/root.html:63
 msgid "Failed to revoke permission"
+msgstr "Falhou ao revocar a permissão"
+
+#: rhodecode/templates/base/root.html:64
+msgid "confirm to revoke permission for {0}: {1} ?"
+msgstr "confirme para revogar permissão para {0}: {1} ?"
+
+#: rhodecode/templates/base/root.html:68
+msgid "specify changeset"
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.html:5
@@ -3547,141 +4544,149 @@
 msgid "%s Bookmarks"
 msgstr "%s Bookmarks"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:26
-msgid "Compare bookmarks"
-msgstr "Comparar bookmarks"
-
-#: rhodecode/templates/bookmarks/bookmarks.html:51
-#: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:50
-#: rhodecode/templates/branches/branches_data.html:8
+#: rhodecode/templates/bookmarks/bookmarks.html:29
+msgid "Compare Bookmarks"
+msgstr ""
+
+#: rhodecode/templates/bookmarks/bookmarks.html:55
+#: rhodecode/templates/bookmarks/bookmarks_data.html:10
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:10
 #: rhodecode/templates/changelog/changelog_summary_data.html:8
-#: rhodecode/templates/tags/tags.html:51
-#: rhodecode/templates/tags/tags_data.html:8
+#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/tags/tags_data.html:10
 msgid "Author"
 msgstr "Autor"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:52
-#: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:51
-#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/bookmarks/bookmarks.html:56
+#: rhodecode/templates/bookmarks/bookmarks_data.html:12
+#: rhodecode/templates/branches/branches.html:55
+#: rhodecode/templates/branches/branches_data.html:12
 #: rhodecode/templates/changelog/changelog_summary_data.html:5
-#: rhodecode/templates/tags/tags.html:52
-#: rhodecode/templates/tags/tags_data.html:9
+#: rhodecode/templates/tags/tags.html:56
+#: rhodecode/templates/tags/tags_data.html:12
 msgid "Revision"
 msgstr "Revisão"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:54
-#: rhodecode/templates/bookmarks/bookmarks_data.html:10
-#: rhodecode/templates/branches/branches.html:53
-#: rhodecode/templates/branches/branches_data.html:10
-#: rhodecode/templates/tags/tags.html:54
-#: rhodecode/templates/tags/tags_data.html:10
-msgid "Compare"
-msgstr "Compare"
-
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
 msgstr "%s Ramos"
 
-#: rhodecode/templates/branches/branches.html:26
-msgid "Compare branches"
-msgstr "Compare ramos"
+#: rhodecode/templates/branches/branches.html:29
+msgid "Compare Branches"
+msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr "%s Changelog"
 
-#: rhodecode/templates/changelog/changelog.html:19
+#: rhodecode/templates/changelog/changelog.html:21
 #, python-format
 msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
 msgstr[0] "mostrando %d de %d revisão"
 msgstr[1] "mostrando %d de %d revisões"
 
-#: rhodecode/templates/changelog/changelog.html:39
+#: rhodecode/templates/changelog/changelog.html:43
 msgid "Clear selection"
 msgstr "Deselecionar seleção"
 
-#: rhodecode/templates/changelog/changelog.html:42
+#: rhodecode/templates/changelog/changelog.html:47
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 msgstr "Comparar bifurcação com %s"
 
-#: rhodecode/templates/changelog/changelog.html:42
-msgid "Compare fork with parent"
-msgstr "Comparar bifurcação com o pai"
-
-#: rhodecode/templates/changelog/changelog.html:78
-#: rhodecode/templates/changelog/changelog_summary_data.html:28
-#, python-format
-msgid "Click to open associated pull request #%s"
-msgstr "Clique para abrir o pull request #%s associado"
-
-#: rhodecode/templates/changelog/changelog.html:102
-#: rhodecode/templates/summary/summary.html:403
-msgid "Show more"
-msgstr "Mostrar mais"
-
-#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changelog/changelog.html:49
+#, python-format
+msgid "Compare fork with Parent(%s)"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:56
+msgid "Show"
+msgstr "Mostrar"
+
+#: rhodecode/templates/changelog/changelog.html:82
+#: rhodecode/templates/changelog/changelog_summary_data.html:19
+#, python-format
+msgid ""
+"Changeset status: %s\n"
+"Click to open associated pull request #%s"
+msgstr "Estado do changeset: %s\nClique para abrir os pull request #%s associado"
+
+#: rhodecode/templates/changelog/changelog.html:86
+#: rhodecode/templates/compare/compare_cs.html:18
+#, python-format
+msgid "Changeset status: %s"
+msgstr "Estado do changeset: %s"
+
+#: rhodecode/templates/changelog/changelog.html:105
+#: rhodecode/templates/compare/compare_cs.html:36
+msgid "Expand commit message"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:114
+msgid "Changeset has comments"
+msgstr "O changeset tem comentários"
+
+#: rhodecode/templates/changelog/changelog.html:124
 #: rhodecode/templates/changelog/changelog_summary_data.html:50
-#: rhodecode/templates/changeset/changeset.html:107
-#: rhodecode/templates/changeset/changeset_range.html:86
+#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset_range.html:93
 #, python-format
 msgid "Bookmark %s"
 msgstr "Bookmark %s"
 
-#: rhodecode/templates/changelog/changelog.html:121
+#: rhodecode/templates/changelog/changelog.html:130
 #: rhodecode/templates/changelog/changelog_summary_data.html:56
-#: rhodecode/templates/changeset/changeset.html:113
-#: rhodecode/templates/changeset/changeset_range.html:92
+#: rhodecode/templates/changeset/changeset.html:100
+#: rhodecode/templates/changeset/changeset_range.html:99
 #, python-format
 msgid "Tag %s"
 msgstr "Tag %s"
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:135
 #: rhodecode/templates/changelog/changelog_summary_data.html:61
-#: rhodecode/templates/changeset/changeset.html:117
-#: rhodecode/templates/changeset/changeset_range.html:96
+#: rhodecode/templates/changeset/changeset.html:105
+#: rhodecode/templates/changeset/changeset_range.html:103
 #, python-format
 msgid "Branch %s"
 msgstr "Ramo %s"
 
-#: rhodecode/templates/changelog/changelog.html:286
+#: rhodecode/templates/changelog/changelog.html:299
 msgid "There are no changes yet"
 msgstr "Ainda não há alteações"
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:91
+#: rhodecode/templates/changeset/changeset.html:76
 msgid "Removed"
 msgstr "Removido"
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:92
+#: rhodecode/templates/changeset/changeset.html:77
 msgid "Changed"
 msgstr "Modificado"
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset.html:78
 msgid "Added"
 msgstr "Adicionado"
 
 #: rhodecode/templates/changelog/changelog_details.html:8
 #: rhodecode/templates/changelog/changelog_details.html:9
 #: rhodecode/templates/changelog/changelog_details.html:10
-#: rhodecode/templates/changeset/changeset.html:95
-#: rhodecode/templates/changeset/changeset.html:96
-#: rhodecode/templates/changeset/changeset.html:97
+#: rhodecode/templates/changeset/changeset.html:80
+#: rhodecode/templates/changeset/changeset.html:81
+#: rhodecode/templates/changeset/changeset.html:82
 #, python-format
 msgid "Affected %s files"
 msgstr "Afetados %s arquivos"
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:6
-#: rhodecode/templates/files/files_add.html:75
-#: rhodecode/templates/files/files_edit.html:61
+#: rhodecode/templates/files/files_add.html:65
+#: rhodecode/templates/files/files_delete.html:53
 msgid "Commit message"
 msgstr "Mensagem de commit"
 
@@ -3698,10 +4703,9 @@
 msgstr "Adicionar ou enviar arquivos diretamente pelo RhodeCode"
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:89
-#: rhodecode/templates/files/files_add.html:38
-#: rhodecode/templates/files/files_browser.html:31
-msgid "Add new file"
-msgstr "Adicionar novo arquivo"
+#: rhodecode/templates/files/files_ypjax.html:9
+msgid "Add New File"
+msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:95
 msgid "Push new repo"
@@ -3716,182 +4720,204 @@
 msgid "%s Changeset"
 msgstr "%s Changeset"
 
-#: rhodecode/templates/changeset/changeset.html:39
-msgid "No parents"
-msgstr "Sem progenitores"
-
-#: rhodecode/templates/changeset/changeset.html:49
-msgid "No children"
-msgstr "Nenhum filho"
-
-#: rhodecode/templates/changeset/changeset.html:62
-#: rhodecode/templates/changeset/changeset_file_comment.html:20
-#: rhodecode/templates/changeset/changeset_range.html:44
+#: rhodecode/templates/changeset/changeset.html:37
+msgid "parent rev."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:43
+msgid "child rev."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:51
+#: rhodecode/templates/changeset/changeset_file_comment.html:41
+#: rhodecode/templates/changeset/changeset_range.html:51
 msgid "Changeset status"
 msgstr "Estado do changeset"
 
+#: rhodecode/templates/changeset/changeset.html:55
+#: rhodecode/templates/changeset/diff_block.html:27
+#: rhodecode/templates/files/diff_2way.html:52
+msgid "Raw diff"
+msgstr "Diff cru"
+
+#: rhodecode/templates/changeset/changeset.html:58
+msgid "Patch diff"
+msgstr "D"
+
+#: rhodecode/templates/changeset/changeset.html:61
+#: rhodecode/templates/changeset/diff_block.html:30
+#: rhodecode/templates/files/diff_2way.html:55
+msgid "Download diff"
+msgstr "Baixar diff"
+
 #: rhodecode/templates/changeset/changeset.html:67
-#: rhodecode/templates/changeset/diff_block.html:22
-msgid "Raw diff"
-msgstr "Diff cru"
-
-#: rhodecode/templates/changeset/changeset.html:68
-msgid "Patch diff"
-msgstr "D"
-
-#: rhodecode/templates/changeset/changeset.html:69
-#: rhodecode/templates/changeset/diff_block.html:23
-msgid "Download diff"
-msgstr "Baixar diff"
-
-#: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:103
+#: rhodecode/templates/changeset/changeset_file_comment.html:111
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d comentário"
 msgstr[1] "%d comentários"
 
-#: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:103
+#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:111
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
 msgstr[0] "(%d em linha)"
 msgstr[1] "(%d em linha)"
 
-#: rhodecode/templates/changeset/changeset.html:103
-#: rhodecode/templates/changeset/changeset_range.html:82
+#: rhodecode/templates/changeset/changeset.html:88
+#: rhodecode/templates/changeset/changeset_range.html:89
 msgid "merge"
 msgstr "mesclar"
 
-#: rhodecode/templates/changeset/changeset.html:126
-#: rhodecode/templates/compare/compare_diff.html:40
-#: rhodecode/templates/pullrequests/pullrequest_show.html:113
+#: rhodecode/templates/changeset/changeset.html:124
+#: rhodecode/templates/compare/compare_diff.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:160
 #, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
 msgstr[0] "%s arquivo modificado"
 msgstr[1] "%s arquivos modificados"
 
-#: rhodecode/templates/changeset/changeset.html:128
-#: rhodecode/templates/compare/compare_diff.html:42
-#: rhodecode/templates/pullrequests/pullrequest_show.html:115
+#: rhodecode/templates/changeset/changeset.html:126
+#: rhodecode/templates/compare/compare_diff.html:59
+#: rhodecode/templates/pullrequests/pullrequest_show.html:162
 #, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
 msgstr[0] "%s arquivo modificado com %s inserções e %s exclusões"
 msgstr[1] "%s arquivos modificados com %s inserções e %s exclusões"
 
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Showing a huge diff might take some time and resources"
 msgstr "Mostrar um diff muito grande pode levar muito tempo e gastar muitos recursos"
 
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Show full diff"
 msgstr "Mostrar diff completo"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:30
-#, python-format
-msgid "Status change on pull request #%s"
-msgstr "Mudança de estado no pull request $%s"
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:32
+#: rhodecode/templates/changeset/changeset.html:214
+#: rhodecode/templates/changeset/changeset.html:251
+msgid "no revisions"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:23
+#, python-format
+msgid "Vote on pull request #%s"
+msgstr "Vote no pull request #%s"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:25
 #, python-format
 msgid "Comment on pull request #%s"
 msgstr "Comentar no pull request #%s"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:55
+#: rhodecode/templates/changeset/changeset_file_comment.html:30
+msgid "Status change on changeset"
+msgstr "Alteração de estado no changeset"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:32
+msgid "Comment on changeset"
+msgstr "Comentário no changeset"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:63
 msgid "Submitting..."
 msgstr "Enviando..."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:58
+#: rhodecode/templates/changeset/changeset_file_comment.html:66
 msgid "Commenting on line {1}."
 msgstr "Comentando a linha {1}."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:59
-#: rhodecode/templates/changeset/changeset_file_comment.html:145
+#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:153
 #, 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:61
-#: rhodecode/templates/changeset/changeset_file_comment.html:147
+#: rhodecode/templates/changeset/changeset_file_comment.html:69
+#: rhodecode/templates/changeset/changeset_file_comment.html:155
 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:65
-#: rhodecode/templates/changeset/changeset_file_comment.html:152
+#: rhodecode/templates/changeset/changeset_file_comment.html:73
+#: rhodecode/templates/changeset/changeset_file_comment.html:166
 msgid "Preview"
 msgstr "Visualizar"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:72
-#: rhodecode/templates/changeset/changeset_file_comment.html:170
+#: rhodecode/templates/changeset/changeset_file_comment.html:80
+#: rhodecode/templates/changeset/changeset_file_comment.html:189
 msgid "Comment preview"
 msgstr "Visualizar comentário"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:80
-#: rhodecode/templates/changeset/changeset_file_comment.html:177
-#: rhodecode/templates/email_templates/changeset_comment.html:16
+#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:196
+#: rhodecode/templates/email_templates/changeset_comment.html:11
 #: rhodecode/templates/email_templates/pull_request_comment.html:16
 msgid "Comment"
 msgstr "Comentário"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:81
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:96
 msgid "You need to be logged in to comment."
 msgstr "Você precisa estar logado para comentar."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:96
 msgid "Login now"
 msgstr "Entrar agora"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:92
+#: rhodecode/templates/changeset/changeset_file_comment.html:100
 msgid "Hide"
 msgstr "Ocultar"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:149
-msgid "Change status"
-msgstr "Mudar estado"
+#: rhodecode/templates/changeset/changeset_file_comment.html:159
+msgid "Vote for pull request status"
+msgstr "Vote para estado do pull request"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:161
+msgid "Change changeset status"
+msgstr "Altere o estado do changeset"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:179
-msgid "Comment and close"
-msgstr "Comentar e fechar"
+msgid "Close (when approved or rejected)"
+msgstr "Fechar (quando aprovado ou rejeitado)"
 
 #: rhodecode/templates/changeset/changeset_range.html:5
 #, python-format
 msgid "%s Changesets"
 msgstr "%s Changesets"
 
-#: rhodecode/templates/changeset/changeset_range.html:52
+#: rhodecode/templates/changeset/changeset_range.html:59
 msgid "Files affected"
 msgstr "Arquivos afetados"
 
 #: rhodecode/templates/changeset/diff_block.html:21
+#: rhodecode/templates/files/diff_2way.html:46
 msgid "Show full diff for this file"
 msgstr "Mostrar diff completo para este arquivo"
 
-#: rhodecode/templates/changeset/diff_block.html:29
+#: rhodecode/templates/changeset/diff_block.html:24
+#: rhodecode/templates/changeset/diff_block.html:68
+#: rhodecode/templates/files/diff_2way.html:49
+msgid "Show full side-by-side diff for this file"
+msgstr "Mostrar diff completo lado-a-lado para este arquivo"
+
+#: rhodecode/templates/changeset/diff_block.html:38
 msgid "Show inline comments"
 msgstr "Mostrar comentários inline"
 
-#: rhodecode/templates/changeset/diff_block.html:53
+#: rhodecode/templates/changeset/diff_block.html:62
 msgid "Show file at latest version in this repo"
 msgstr "Mostrar última versão do arquivo neste repo"
 
-#: rhodecode/templates/changeset/diff_block.html:54
+#: rhodecode/templates/changeset/diff_block.html:64
 msgid "Show file at initial version in this repo"
 msgstr "Mostrar versão inicial do arquivo neste repo"
 
@@ -3899,90 +4925,87 @@
 msgid "No changesets"
 msgstr "Nenhum changeset"
 
-#: rhodecode/templates/compare/compare_cs.html:32
+#: rhodecode/templates/compare/compare_cs.html:8
 msgid "Ancestor"
 msgstr "Antecessor"
 
-#: rhodecode/templates/compare/compare_diff.html:5
+#: rhodecode/templates/compare/compare_diff.html:6
+#: rhodecode/templates/compare/compare_diff.html:8
 #, python-format
 msgid "%s Compare"
 msgstr "%s Comparar"
 
-#: rhodecode/templates/compare/compare_diff.html:9
+#: rhodecode/templates/compare/compare_diff.html:16
 msgid "Compare revisions"
 msgstr "Comparar revisões"
 
-#: rhodecode/templates/compare/compare_diff.html:33
-#: rhodecode/templates/pullrequests/pullrequest_show.html:106
+#: rhodecode/templates/compare/compare_diff.html:36
+msgid "Swap"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:38
+msgid "Compare Revisions"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:45
+msgid "Compare revisions, branches, bookmarks or tags."
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:50
+#: rhodecode/templates/pullrequests/pullrequest_show.html:153
 #, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
 msgstr[0] "Mostrando %s commit"
 msgstr[1] "Mostrando %s commits"
 
-#: rhodecode/templates/compare/compare_diff.html:48
-#: rhodecode/templates/pullrequests/pullrequest_show.html:121
+#: rhodecode/templates/compare/compare_diff.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:168
 msgid "No files"
 msgstr "Nenhum arquivo"
 
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-msgid "confirm to show potentially huge diff"
-msgstr "confirme para mostrar diff potencialmente muito grande"
-
-#: rhodecode/templates/data_table/_dt_elements.html:54
-#: rhodecode/templates/summary/summary.html:69
+#: rhodecode/templates/data_table/_dt_elements.html:63
 msgid "Mercurial repository"
 msgstr "Repositório Mercurial"
 
-#: rhodecode/templates/data_table/_dt_elements.html:56
-#: rhodecode/templates/summary/summary.html:72
+#: rhodecode/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr "Repositório Git"
 
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#, python-format
-msgid "Fork of %s"
-msgstr "Bifurcação de %s"
-
-#: rhodecode/templates/data_table/_dt_elements.html:88
+#: rhodecode/templates/data_table/_dt_elements.html:72
+msgid "Public repository"
+msgstr "Repositório público"
+
+#: rhodecode/templates/data_table/_dt_elements.html:82
+msgid "Repository creating in progress..."
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr "Nenhum conjunto de alterações ainda."
 
-#: rhodecode/templates/data_table/_dt_elements.html:95
-#: rhodecode/templates/data_table/_dt_elements.html:97
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "Assinar o feed rss de %s"
 
-#: rhodecode/templates/data_table/_dt_elements.html:103
-#: rhodecode/templates/data_table/_dt_elements.html:105
+#: rhodecode/templates/data_table/_dt_elements.html:111
+#: rhodecode/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "Assinar o feed atom de %s"
 
-#: rhodecode/templates/data_table/_dt_elements.html:122
-#, python-format
-msgid "Confirm to delete this repository: %s"
-msgstr "Confirma excluir esse repositório: %s"
-
-#: rhodecode/templates/data_table/_dt_elements.html:137
-#, python-format
-msgid "Confirm to delete this user: %s"
-msgstr "Confirma excluir este usuário: %s"
-
-#: rhodecode/templates/email_templates/changeset_comment.html:4
-#: rhodecode/templates/email_templates/pull_request.html:4
-#: rhodecode/templates/email_templates/pull_request_comment.html:4
-msgid "URL"
-msgstr "URL"
+#: rhodecode/templates/data_table/_dt_elements.html:141
+msgid "Creating"
+msgstr ""
 
 #: rhodecode/templates/email_templates/changeset_comment.html:6
 #, python-format
 msgid "%s commented on a %s changeset."
 msgstr "%s comentou num changeset de %s."
 
-#: rhodecode/templates/email_templates/changeset_comment.html:14
+#: rhodecode/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
 msgstr "O estado do changeset foi alterado para"
 
@@ -4014,9 +5037,9 @@
 msgstr "%s abriu um pull request para o repositório %s e espera sua revisão."
 
 #: rhodecode/templates/email_templates/pull_request.html:8
-#: rhodecode/templates/pullrequests/pullrequest.html:34
+#: rhodecode/templates/pullrequests/pullrequest.html:31
 #: rhodecode/templates/pullrequests/pullrequest_data.html:14
-#: rhodecode/templates/pullrequests/pullrequest_show.html:25
+#: rhodecode/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr "Título"
 
@@ -4037,77 +5060,85 @@
 msgid "View this user here"
 msgstr "Veja este usuário aqui"
 
-#: rhodecode/templates/errors/error_document.html:55
+#: rhodecode/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr "Você será redirecionado para %s em %s segundos"
 
+#: rhodecode/templates/files/diff_2way.html:15
+#, python-format
+msgid "%s File side-by-side diff"
+msgstr "Arquivo %s diff lado-a-lado"
+
+#: rhodecode/templates/files/diff_2way.html:22
+#: rhodecode/templates/files/file_diff.html:11
+msgid "File diff"
+msgstr "Diff do arquivo"
+
+#: rhodecode/templates/files/diff_2way.html:58
+msgid "ignore white space"
+msgstr "ignorar espaços em branco"
+
+#: rhodecode/templates/files/diff_2way.html:59
+msgid "turn on edit mode"
+msgstr "habilitar modo de edição"
+
 #: rhodecode/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr "%s Diff de Arquivo"
 
-#: rhodecode/templates/files/file_diff.html:8
-msgid "File diff"
-msgstr "Diff do arquivo"
-
 #: rhodecode/templates/files/files.html:4
-#: rhodecode/templates/files/files.html:76
+#: rhodecode/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr "%s Arquivos"
 
-#: rhodecode/templates/files/files.html:30
-#: rhodecode/templates/files/files_add.html:31
-#: rhodecode/templates/files/files_edit.html:31
-msgid "Branch"
-msgstr "Ramo"
-
 #: rhodecode/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr "%s Adicionar Arquivos"
 
-#: rhodecode/templates/files/files_add.html:19
-msgid "Add file"
-msgstr "Adicionar arquivo"
-
-#: rhodecode/templates/files/files_add.html:43
-msgid "File Name"
-msgstr "Nome de Arquivo"
-
-#: rhodecode/templates/files/files_add.html:47
-#: rhodecode/templates/files/files_add.html:56
-msgid "or"
-msgstr "ou"
-
-#: rhodecode/templates/files/files_add.html:47
-#: rhodecode/templates/files/files_add.html:52
-msgid "Upload file"
-msgstr "Enviar arquivo"
-
-#: rhodecode/templates/files/files_add.html:56
-msgid "Create new file"
-msgstr "Criar novo arquivo"
-
-#: rhodecode/templates/files/files_add.html:61
-#: rhodecode/templates/files/files_edit.html:37
+#: rhodecode/templates/files/files_add.html:25
+msgid "Add new file"
+msgstr "Adicionar novo arquivo"
+
+#: rhodecode/templates/files/files_add.html:45
+#: rhodecode/templates/files/files_edit.html:43
 #: rhodecode/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "Local"
 
-#: rhodecode/templates/files/files_add.html:65
-msgid "use / to separate directories"
-msgstr "use / para separar diretórios"
-
-#: rhodecode/templates/files/files_add.html:79
-#: rhodecode/templates/files/files_edit.html:65
+#: rhodecode/templates/files/files_add.html:47
+msgid "Enter filename..."
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:49
+#: rhodecode/templates/files/files_add.html:53
+msgid "or"
+msgstr "ou"
+
+#: rhodecode/templates/files/files_add.html:49
+msgid "Upload File"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:53
+msgid "Create New File"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:58
+msgid "New file mode"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:69
+#: rhodecode/templates/files/files_delete.html:57
+#: rhodecode/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr "Realizar commit das alterações"
 
 #: rhodecode/templates/files/files_browser.html:13
-msgid "View"
-msgstr "Visualizar"
+msgid "revision"
+msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:14
 msgid "Previous revision"
@@ -4117,115 +5148,129 @@
 msgid "Next revision"
 msgstr "Próxima revisão"
 
-#: rhodecode/templates/files/files_browser.html:23
+#: rhodecode/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr "Seguir o ramo atual"
 
-#: rhodecode/templates/files/files_browser.html:27
-msgid "Search file list"
-msgstr "Buscar a lista de arquivos"
-
-#: rhodecode/templates/files/files_browser.html:35
+#: rhodecode/templates/files/files_browser.html:25
+msgid "Search File List"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr "Carregando lista de arquivos..."
 
-#: rhodecode/templates/files/files_browser.html:48
+#: rhodecode/templates/files/files_browser.html:42
 msgid "Size"
 msgstr "Tamanho"
 
-#: rhodecode/templates/files/files_browser.html:49
+#: rhodecode/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr "Mimetype"
 
-#: rhodecode/templates/files/files_browser.html:50
+#: rhodecode/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr "Última revisão"
 
-#: rhodecode/templates/files/files_browser.html:51
+#: rhodecode/templates/files/files_browser.html:45
 msgid "Last modified"
 msgstr "Última alteração"
 
-#: rhodecode/templates/files/files_browser.html:52
+#: rhodecode/templates/files/files_browser.html:46
 msgid "Last committer"
 msgstr "Último commiter"
 
+#: rhodecode/templates/files/files_delete.html:4
+#, python-format
+msgid "%s Files Delete"
+msgstr ""
+
+#: rhodecode/templates/files/files_delete.html:25
+#: rhodecode/templates/files/files_delete.html:45
+msgid "Delete file"
+msgstr ""
+
 #: rhodecode/templates/files/files_edit.html:4
 #, python-format
-msgid "%s Files Edit"
-msgstr "%s Editar Arquivos"
-
-#: rhodecode/templates/files/files_edit.html:19
+msgid "%s File Edit"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:25
 msgid "Edit file"
 msgstr "Editar arquivo"
 
-#: rhodecode/templates/files/files_edit.html:47
-#: rhodecode/templates/files/files_source.html:23
-msgid "Show annotation"
-msgstr "Mostrar anotação"
-
-#: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:26
-msgid "Download as raw"
-msgstr "Baixar original"
-
-#: rhodecode/templates/files/files_edit.html:52
+#: rhodecode/templates/files/files_edit.html:53
+#: rhodecode/templates/files/files_source.html:32
+msgid "Show Annotation"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:55
+#: rhodecode/templates/files/files_source.html:35
+msgid "Download as Raw"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:58
 msgid "Source"
 msgstr "Fonte"
 
-#: rhodecode/templates/files/files_edit.html:57
+#: rhodecode/templates/files/files_edit.html:63
 msgid "Editing file"
 msgstr "Editando arquivo"
 
+#: rhodecode/templates/files/files_edit.html:68
+msgid "Commit Message"
+msgstr ""
+
 #: rhodecode/templates/files/files_history_box.html:2
-msgid "History"
-msgstr "Histórico"
-
-#: rhodecode/templates/files/files_history_box.html:9
-msgid "Diff to revision"
-msgstr "Diff para revisão"
-
-#: rhodecode/templates/files/files_history_box.html:10
-msgid "Show at revision"
-msgstr "Mostrar na revisão"
-
-#: rhodecode/templates/files/files_history_box.html:11
-msgid "Show full history"
-msgstr "Mostrar história completa"
-
-#: rhodecode/templates/files/files_history_box.html:16
 #, python-format
 msgid "%s author"
 msgid_plural "%s authors"
 msgstr[0] "%s autor"
 msgstr[1] "%s autores"
 
-#: rhodecode/templates/files/files_source.html:6
-msgid "Load file history"
-msgstr "Carregar história do arquivo"
-
-#: rhodecode/templates/files/files_source.html:21
-msgid "Show source"
-msgstr "Mostrar fonte"
-
-#: rhodecode/templates/files/files_source.html:29
-#, python-format
-msgid "Edit on branch:%s"
-msgstr "Editar no ramo:%s"
-
-#: rhodecode/templates/files/files_source.html:31
-msgid "Edit on branch:?"
-msgstr "Editar no ramo:?"
-
-#: rhodecode/templates/files/files_source.html:31
+#: rhodecode/templates/files/files_source.html:7
+msgid "Diff to Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:8
+msgid "Show at Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:10
+msgid "Show Full History"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:11
+msgid "Show Authors"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:30
+msgid "Show Source"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:38
+#, python-format
+msgid "Edit on Branch:%s"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:41
+msgid "Editing binary files not allowed"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:44
 msgid "Editing files allowed only when on branch head revision"
 msgstr "A edição de arquivos só é permitida quando se está na revisão mais recente do ramo"
 
-#: rhodecode/templates/files/files_source.html:46
+#: rhodecode/templates/files/files_source.html:45
+msgid "Deleting files allowed only when on branch head revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:61
 #, python-format
 msgid "Binary file (%s)"
 msgstr "Arquivo binário (%s)"
 
-#: rhodecode/templates/files/files_source.html:55
+#: rhodecode/templates/files/files_source.html:71
 msgid "File is too big to display"
 msgstr "Arquivo é grande demais para exibir"
 
@@ -4233,11 +5278,11 @@
 msgid "annotation"
 msgstr "anotação"
 
-#: rhodecode/templates/files/files_ypjax.html:15
-msgid "Go back"
-msgstr "Voltar"
-
-#: rhodecode/templates/files/files_ypjax.html:16
+#: rhodecode/templates/files/files_ypjax.html:23
+msgid "Go Back"
+msgstr ""
+
+#: rhodecode/templates/files/files_ypjax.html:24
 msgid "No files at given path"
 msgstr "Nenhum arquivo no caminho especificado"
 
@@ -4246,9 +5291,9 @@
 msgid "%s Followers"
 msgstr "%s Seguidores"
 
-#: rhodecode/templates/followers/followers.html:9
-#: rhodecode/templates/summary/summary.html:183
-#: rhodecode/templates/summary/summary.html:184
+#: rhodecode/templates/followers/followers.html:12
+#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/templates/summary/summary.html:150
 msgid "Followers"
 msgstr "Seguidores"
 
@@ -4258,45 +5303,45 @@
 
 #: rhodecode/templates/forks/fork.html:5
 #, python-format
-msgid "%s Fork"
-msgstr "%s Bifurcação"
-
-#: rhodecode/templates/forks/fork.html:28
+msgid "Fork repository %s"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:30
 msgid "Fork name"
 msgstr "Nome da bifurcação"
 
-#: rhodecode/templates/forks/fork.html:65
+#: rhodecode/templates/forks/fork.html:71
 msgid "Private"
 msgstr "Privado"
 
-#: rhodecode/templates/forks/fork.html:74
+#: rhodecode/templates/forks/fork.html:80
 msgid "Copy permissions"
 msgstr "Copiar permissões"
 
-#: rhodecode/templates/forks/fork.html:78
+#: rhodecode/templates/forks/fork.html:84
 msgid "Copy permissions from forked repository"
 msgstr "Copiar permissões do repositório bifurcado"
 
-#: rhodecode/templates/forks/fork.html:84
+#: rhodecode/templates/forks/fork.html:90
 msgid "Update after clone"
 msgstr "Atualizar após clonar"
 
-#: rhodecode/templates/forks/fork.html:88
+#: rhodecode/templates/forks/fork.html:94
 msgid "Checkout source after making a clone"
 msgstr "Checkout fontes depois de criar o clone"
 
-#: rhodecode/templates/forks/fork.html:93
-msgid "Fork this repository"
-msgstr "Bifurcar este repositório"
+#: rhodecode/templates/forks/fork.html:99
+msgid "Fork this Repository"
+msgstr ""
 
 #: rhodecode/templates/forks/forks.html:5
 #, python-format
 msgid "%s Forks"
 msgstr "%s Bifurcações"
 
-#: rhodecode/templates/forks/forks.html:9
-#: rhodecode/templates/summary/summary.html:189
-#: rhodecode/templates/summary/summary.html:190
+#: rhodecode/templates/forks/forks.html:12
+#: rhodecode/templates/summary/summary.html:155
+#: rhodecode/templates/summary/summary.html:156
 msgid "Forks"
 msgstr "Bifurcações"
 
@@ -4308,41 +5353,32 @@
 msgid "There are no forks yet"
 msgstr "Ainda não há bifurcações"
 
-#: rhodecode/templates/journal/journal.html:21
+#: rhodecode/templates/journal/journal.html:24
 msgid "ATOM journal feed"
 msgstr "ATOM feed do diário"
 
-#: rhodecode/templates/journal/journal.html:22
+#: rhodecode/templates/journal/journal.html:25
 msgid "RSS journal feed"
 msgstr "RSS feed do diário"
 
-#: rhodecode/templates/journal/journal.html:32
-msgid "Refresh"
-msgstr "Atualizar"
-
-#: rhodecode/templates/journal/journal.html:35
-#: rhodecode/templates/journal/public_journal.html:24
-msgid "ATOM feed"
-msgstr "ATOM feed"
-
-#: rhodecode/templates/journal/journal.html:51
-msgid "Watched"
-msgstr "Seguindo"
+#: rhodecode/templates/journal/journal.html:57
+msgid "My repos"
+msgstr "Meus repositórios"
 
 #: rhodecode/templates/journal/journal_data.html:55
 msgid "No entries yet"
 msgstr "Ainda não há entradas"
 
 #: rhodecode/templates/journal/public_journal.html:4
-#: rhodecode/templates/journal/public_journal.html:21
+#: rhodecode/templates/journal/public_journal.html:24
 msgid "Public Journal"
 msgstr "Diário Público"
 
-#: rhodecode/templates/journal/public_journal.html:13
+#: rhodecode/templates/journal/public_journal.html:16
 msgid "ATOM public journal feed"
 msgstr "ATOM feed do diário público"
 
-#: rhodecode/templates/journal/public_journal.html:14
+#: rhodecode/templates/journal/public_journal.html:17
 msgid "RSS public journal feed"
 msgstr "RSS feed do diário público"
 
@@ -4351,46 +5387,42 @@
 msgid "New pull request"
 msgstr "Novo pull request"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:25
-msgid "Create new pull request"
-msgstr "Criar novo pull request"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:47
+#: rhodecode/templates/pullrequests/pullrequest.html:44
 msgid "Write a short description on this pull request"
 msgstr "Escreva uma breve descrição para este pull request"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:53
+#: rhodecode/templates/pullrequests/pullrequest.html:50
 msgid "Changeset flow"
 msgstr "Fluxo de changesets"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:60
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+#: rhodecode/templates/pullrequests/pullrequest.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:68
 msgid "Origin repository"
 msgstr "Repositório origem"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:85
-msgid "Send pull request"
-msgstr "Enviar pull request"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:94
-#: rhodecode/templates/pullrequests/pullrequest_show.html:137
+#: rhodecode/templates/pullrequests/pullrequest.html:82
+msgid "Send Pull Request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:91
+#: rhodecode/templates/pullrequests/pullrequest_show.html:104
 msgid "Pull request reviewers"
 msgstr "Revisores do pull request"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:103
-#: rhodecode/templates/pullrequests/pullrequest_show.html:149
+#: rhodecode/templates/pullrequests/pullrequest.html:100
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
 msgid "owner"
 msgstr "dono"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:115
+#: rhodecode/templates/pullrequests/pullrequest.html:114
 msgid "Add reviewer to this pull request."
 msgstr "Adicionar revisor a este pull request"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:129
+#: rhodecode/templates/pullrequests/pullrequest.html:128
 msgid "Detailed compare view"
 msgstr "Visão de comparação detalhada"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:150
+#: rhodecode/templates/pullrequests/pullrequest.html:149
 msgid "Destination repository"
 msgstr "Repositório de destino"
 
@@ -4399,80 +5431,111 @@
 msgid "%s Pull Request #%s"
 msgstr "%s Pull Request #%s"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:35
+#: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Review status"
 msgstr "Estado da revisão"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:40
-msgid "Pull request status"
-msgstr "Estado do pull request"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:53
+#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:43
+msgid "Pull request status calculated from votes"
+msgstr "Estado do pull request calculado a partir dos votos"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:56
 msgid "Still not reviewed by"
 msgstr "Ainda não revisado por"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:60
 #, python-format
 msgid "%d reviewer"
 msgid_plural "%d reviewers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:59
+msgstr[0] "%d revisor"
+msgstr[1] "%d revisores"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:62
 msgid "Pull request was reviewed by all reviewers"
 msgstr "O pull request foi revisado por todos os revisores"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:89
-msgid "Created on"
-msgstr "Criado em"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:102
-msgid "Compare view"
-msgstr "Visão de comparação"
+#: rhodecode/templates/pullrequests/pullrequest_show.html:77
+#: rhodecode/templates/pullrequests/pullrequest_show.html:79
+msgid "Pull changes"
+msgstr "Puxar mudanças"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
+msgid "reviewer"
+msgstr "revisor"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:133
+msgid "Add or remove reviewer to this pull request."
+msgstr "Adicionar ou remover revisor a este pull request"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:137
+msgid "Save Changes"
+msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:149
-msgid "reviewer"
-msgstr "revisor"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:164
-msgid "Add or remove reviewer to this pull request."
-msgstr "Adicionar ou remover revisor a este pull request"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:168
-msgid "Save changes"
-msgstr "Salvar modificações"
+msgid "Compare view"
+msgstr "Visão de comparação"
 
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
 #, python-format
 msgid "%s Pull Requests"
-msgstr ""
+msgstr "%s Pull Requests"
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
+#, python-format
+msgid "Pull requests from %s"
+msgstr "Pull requests de %s"
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:14
+#, python-format
+msgid "Pull requests to %s"
+msgstr "Pull requests para %s"
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:38
+#, python-format
+msgid "Show pull requests to %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:40
+#, python-format
+msgid "Show pull requests from %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:50
+msgid "Hide closed pull requests"
+msgstr "Esconder pull requests fechados"
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:52
+msgid "Show closed pull requests too"
+msgstr "Mostrar pull requests fechados também"
 
 #: rhodecode/templates/search/search.html:6
-msgid "Search repository"
-msgstr "Buscar no repositório"
+#, python-format
+msgid "%s Search"
+msgstr ""
 
 #: rhodecode/templates/search/search.html:8
-#: rhodecode/templates/search/search.html:16
+#: rhodecode/templates/search/search.html:19
 msgid "Search in all repositories"
 msgstr "Buscar em todos os repositórios"
 
-#: rhodecode/templates/search/search.html:50
+#: rhodecode/templates/search/search.html:53
 msgid "Search term"
 msgstr "Termo de pesquisa"
 
-#: rhodecode/templates/search/search.html:62
+#: rhodecode/templates/search/search.html:65
 msgid "Search in"
 msgstr "Pesquisando em"
 
-#: rhodecode/templates/search/search.html:65
+#: rhodecode/templates/search/search.html:68
 msgid "File contents"
 msgstr "Conteúdo dos arquivos"
 
-#: rhodecode/templates/search/search.html:66
+#: rhodecode/templates/search/search.html:69
 msgid "Commit messages"
 msgstr "Mensagens de commit"
 
-#: rhodecode/templates/search/search.html:67
+#: rhodecode/templates/search/search.html:70
 msgid "File names"
 msgstr "Nomes dos arquivos"
 
@@ -4482,6 +5545,75 @@
 msgid "Permission denied"
 msgstr "Permissão negada"
 
+#: rhodecode/templates/summary/statistics.html:4
+#, python-format
+msgid "%s Statistics"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:19
+#: rhodecode/templates/summary/summary.html:42
+#, python-format
+msgid "%s ATOM feed"
+msgstr "%s ATOM feed"
+
+#: rhodecode/templates/summary/statistics.html:20
+#: rhodecode/templates/summary/summary.html:43
+#, python-format
+msgid "%s RSS feed"
+msgstr "%s RSS feed"
+
+#: rhodecode/templates/summary/statistics.html:39
+#: rhodecode/templates/summary/summary.html:107
+#: rhodecode/templates/summary/summary.html:123
+msgid "Enable"
+msgstr "Habilitar"
+
+#: rhodecode/templates/summary/statistics.html:42
+msgid "Stats gathered: "
+msgstr "Estatísticas coletadas:"
+
+#: rhodecode/templates/summary/statistics.html:91
+#: rhodecode/templates/summary/summary.html:354
+msgid "files"
+msgstr "arquivos"
+
+#: rhodecode/templates/summary/statistics.html:115
+#: rhodecode/templates/summary/summary.html:378
+msgid "Show more"
+msgstr "Mostrar mais"
+
+#: rhodecode/templates/summary/statistics.html:392
+msgid "commits"
+msgstr "commits"
+
+#: rhodecode/templates/summary/statistics.html:393
+msgid "files added"
+msgstr "arquivos adicionados"
+
+#: rhodecode/templates/summary/statistics.html:394
+msgid "files changed"
+msgstr "arquivos alterados"
+
+#: rhodecode/templates/summary/statistics.html:395
+msgid "files removed"
+msgstr "arquivos removidos"
+
+#: rhodecode/templates/summary/statistics.html:397
+msgid "commit"
+msgstr "commit"
+
+#: rhodecode/templates/summary/statistics.html:398
+msgid "file added"
+msgstr "arquivo adicionado"
+
+#: rhodecode/templates/summary/statistics.html:399
+msgid "file changed"
+msgstr "arquivo alterado"
+
+#: rhodecode/templates/summary/statistics.html:400
+msgid "file removed"
+msgstr "arquivo removido"
+
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
 msgid "%s Summary"
@@ -4489,170 +5621,85 @@
 
 #: rhodecode/templates/summary/summary.html:16
 #, python-format
-msgid "%s ATOM feed"
-msgstr "%s ATOM feed"
-
-#: rhodecode/templates/summary/summary.html:17
-#, python-format
-msgid "%s RSS feed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:62
-#, python-format
 msgid "Repository locked by %s"
 msgstr "Repositório travado por %s"
 
-#: rhodecode/templates/summary/summary.html:64
+#: rhodecode/templates/summary/summary.html:18
 msgid "Repository unlocked"
 msgstr "Repositório destravado"
 
-#: rhodecode/templates/summary/summary.html:83
-#, python-format
-msgid "Non changable ID %s"
-msgstr "ID não alterável %s"
-
-#: rhodecode/templates/summary/summary.html:88
-msgid "Public"
-msgstr "Público"
-
-#: rhodecode/templates/summary/summary.html:88
-#: rhodecode/templates/summary/summary.html:89
-msgid "Fork of"
-msgstr "Bifurcação de"
-
-#: rhodecode/templates/summary/summary.html:97
-msgid "Remote clone"
-msgstr "Clone remoto"
-
-#: rhodecode/templates/summary/summary.html:117
-msgid "Contact"
-msgstr "Contato"
-
-#: rhodecode/templates/summary/summary.html:131
+#: rhodecode/templates/summary/summary.html:76
 msgid "Clone url"
 msgstr "URL de clonagem"
 
-#: rhodecode/templates/summary/summary.html:136
+#: rhodecode/templates/summary/summary.html:81
 msgid "Show by Name"
 msgstr "Mostrar por Nome"
 
-#: rhodecode/templates/summary/summary.html:137
+#: rhodecode/templates/summary/summary.html:82
 msgid "Show by ID"
 msgstr "Mostrar por ID"
 
-#: rhodecode/templates/summary/summary.html:143
+#: rhodecode/templates/summary/summary.html:99
 msgid "Trending files"
 msgstr "Tendências em arquivos"
 
-#: rhodecode/templates/summary/summary.html:151
-#: rhodecode/templates/summary/summary.html:167
-msgid "Enable"
-msgstr "Habilitar"
-
-#: rhodecode/templates/summary/summary.html:159
+#: rhodecode/templates/summary/summary.html:115
 msgid "Download"
 msgstr "Download"
 
-#: rhodecode/templates/summary/summary.html:163
+#: rhodecode/templates/summary/summary.html:119
 msgid "There are no downloads yet"
 msgstr "Ainda não há downloads"
 
-#: rhodecode/templates/summary/summary.html:165
+#: rhodecode/templates/summary/summary.html:121
 msgid "Downloads are disabled for this repository"
 msgstr "Downloads estão desabilitados para este repositório"
 
-#: rhodecode/templates/summary/summary.html:170
+#: rhodecode/templates/summary/summary.html:127
 msgid "Download as zip"
 msgstr "Download como zip"
 
-#: rhodecode/templates/summary/summary.html:174
+#: rhodecode/templates/summary/summary.html:132
 msgid "Check this to download archive with subrepos"
 msgstr "Marque isto para descarregar arquivo com subrepositórios"
 
-#: rhodecode/templates/summary/summary.html:174
+#: rhodecode/templates/summary/summary.html:132
 msgid "with subrepos"
 msgstr "com subrepositórios"
 
-#: rhodecode/templates/summary/summary.html:197
+#: rhodecode/templates/summary/summary.html:163
 msgid "Repository Size"
 msgstr "Tamanho do Repositório"
 
-#: rhodecode/templates/summary/summary.html:204
-#: rhodecode/templates/summary/summary.html:206
+#: rhodecode/templates/summary/summary.html:170
+#: rhodecode/templates/summary/summary.html:172
 msgid "Feed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:224
-msgid "Commit activity by day / author"
-msgstr "Atividade de commit por dia / autor"
-
-#: rhodecode/templates/summary/summary.html:232
-msgid "enable"
-msgstr "habilitar"
-
-#: rhodecode/templates/summary/summary.html:235
-msgid "Stats gathered: "
-msgstr "Estatísticas coletadas:"
-
-#: rhodecode/templates/summary/summary.html:256
+msgstr "Feed"
+
+#: rhodecode/templates/summary/summary.html:193
 msgid "Latest changes"
 msgstr "Mudanças mais recentes"
 
-#: rhodecode/templates/summary/summary.html:258
+#: rhodecode/templates/summary/summary.html:195
 msgid "Quick start"
 msgstr "Início rápido"
 
-#: rhodecode/templates/summary/summary.html:272
-#, python-format
-msgid "Readme file from revision %s"
-msgstr "Arquivo README da revisão %s"
-
-#: rhodecode/templates/summary/summary.html:332
+#: rhodecode/templates/summary/summary.html:209
+#, python-format
+msgid "Readme file from revision %s:%s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:299
 #, python-format
 msgid "Download %s as %s"
 msgstr "Descarregar %s como %s"
 
-#: rhodecode/templates/summary/summary.html:379
-msgid "files"
-msgstr "arquivos"
-
-#: rhodecode/templates/summary/summary.html:689
-msgid "commits"
-msgstr "commits"
-
-#: rhodecode/templates/summary/summary.html:690
-msgid "files added"
-msgstr "arquivos adicionados"
-
-#: rhodecode/templates/summary/summary.html:691
-msgid "files changed"
-msgstr "arquivos alterados"
-
-#: rhodecode/templates/summary/summary.html:692
-msgid "files removed"
-msgstr "arquivos removidos"
-
-#: rhodecode/templates/summary/summary.html:694
-msgid "commit"
-msgstr "commit"
-
-#: rhodecode/templates/summary/summary.html:695
-msgid "file added"
-msgstr "arquivo adicionado"
-
-#: rhodecode/templates/summary/summary.html:696
-msgid "file changed"
-msgstr "arquivo alterado"
-
-#: rhodecode/templates/summary/summary.html:697
-msgid "file removed"
-msgstr "arquivo removido"
-
 #: rhodecode/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr "%s Tags"
 
-#: rhodecode/templates/tags/tags.html:26
+#: rhodecode/templates/tags/tags.html:29
 msgid "Compare tags"
 msgstr "Comparar tags"
--- a/rhodecode/i18n/rhodecode.pot	Wed Jul 02 19:03:19 2014 -0400
+++ b/rhodecode/i18n/rhodecode.pot	Wed Jul 02 19:03:20 2014 -0400
@@ -1,13 +1,13 @@
 # Translations template for RhodeCode.
-# Copyright (C) 2013 Marcin Kuzminski RhodeCode
+# Copyright (C) 2014 RhodeCode GmbH
 # This file is distributed under the same license as the RhodeCode project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 ##, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: RhodeCode 1.7.1\n"
-"Report-Msgid-Bugs-To: marcin@maq.io\n"
-"POT-Creation-Date: 2013-07-09 05:02-0700\n"
+"Project-Id-Version: RhodeCode 2.2.5\n"
+"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
+"POT-Creation-Date: 2014-02-13 15:30+0100\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"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: rhodecode/controllers/changelog.py:88 rhodecode/controllers/compare.py:87
-#: rhodecode/controllers/pullrequests.py:258
+#: rhodecode/controllers/changelog.py:88 rhodecode/controllers/compare.py:88
+#: rhodecode/controllers/pullrequests.py:263
 msgid "There are no changesets yet"
 msgstr ""
 
@@ -29,1272 +29,1608 @@
 msgid "(closed)"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:84
+#: rhodecode/controllers/changeset.py:85
 msgid "Show white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
+#: rhodecode/controllers/changeset.py:92 rhodecode/controllers/changeset.py:99
 msgid "Ignore white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:164
-#, python-format
-msgid "%s line context"
-msgstr ""
-
-#: rhodecode/controllers/changeset.py:345
-#: rhodecode/controllers/pullrequests.py:474
+#: rhodecode/controllers/changeset.py:165
+#, python-format
+msgid "increase diff context to %(num)s lines"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:207 rhodecode/controllers/files.py:96
+#: rhodecode/controllers/files.py:119
+msgid "Such revision does not exist for this repository"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:353
+#: rhodecode/controllers/pullrequests.py:480
 #, python-format
 msgid "Status change -> %s"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:376
+#: rhodecode/controllers/changeset.py:384
 msgid "Changing status on a changeset associated with a closed pull request is not allowed"
 msgstr ""
 
-#: rhodecode/controllers/error.py:69
+#: rhodecode/controllers/compare.py:192 rhodecode/templates/base/root.html:67
+msgid "Select changeset"
+msgstr ""
+
+#: rhodecode/controllers/error.py:70
 msgid "Home page"
 msgstr ""
 
-#: rhodecode/controllers/error.py:98
+#: rhodecode/controllers/error.py:99
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr ""
 
-#: rhodecode/controllers/error.py:101
+#: rhodecode/controllers/error.py:102
 msgid "Unauthorized access to resource"
 msgstr ""
 
-#: rhodecode/controllers/error.py:103
+#: rhodecode/controllers/error.py:104
 msgid "You don't have permission to view this page"
 msgstr ""
 
-#: rhodecode/controllers/error.py:105
+#: rhodecode/controllers/error.py:106
 msgid "The resource could not be found"
 msgstr ""
 
-#: rhodecode/controllers/error.py:107
+#: rhodecode/controllers/error.py:108
 msgid "The server encountered an unexpected condition which prevented it from fulfilling the request."
 msgstr ""
 
-#: rhodecode/controllers/feed.py:52
-#, python-format
-msgid "Changes on %s repository"
-msgstr ""
-
 #: rhodecode/controllers/feed.py:53
 #, python-format
+msgid "Changes on %s repository"
+msgstr ""
+
+#: rhodecode/controllers/feed.py:54
+#, python-format
 msgid "%s %s feed"
 msgstr ""
 
-#: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-#: rhodecode/templates/pullrequests/pullrequest_show.html:138
+#: rhodecode/controllers/feed.py:87
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
 #: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr ""
 
-#: rhodecode/controllers/feed.py:90
+#: rhodecode/controllers/feed.py:91
 #, python-format
 msgid "%s committed on %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:89
-msgid "Click here to add new file"
-msgstr ""
-
 #: rhodecode/controllers/files.py:90
-#, python-format
-msgid "There are no files yet %s"
-msgstr ""
-
-#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:338
+msgid "Click here to add new file"
+msgstr ""
+
+#: rhodecode/controllers/files.py:91
+#, python-format
+msgid "There are no files yet. %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:299 rhodecode/controllers/files.py:359
+#: rhodecode/controllers/files.py:426
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:283
-msgid "You can only edit files with revision being a valid branch "
-msgstr ""
-
-#: rhodecode/controllers/files.py:297
-#, python-format
-msgid "Edited file %s via RhodeCode"
-msgstr ""
-
-#: rhodecode/controllers/files.py:313
-msgid "No changes"
-msgstr ""
-
-#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:397
-#, python-format
-msgid "Successfully committed to %s"
-msgstr ""
-
-#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:408
+#: rhodecode/controllers/files.py:311
+msgid "You can only delete files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:322
+#, python-format
+msgid "Deleted file %s via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:344
+#, python-format
+msgid "Successfully deleted file %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:348 rhodecode/controllers/files.py:414
+#: rhodecode/controllers/files.py:496
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/controllers/files.py:350
-msgid "Added file via RhodeCode"
-msgstr ""
-
 #: rhodecode/controllers/files.py:371
+msgid "You can only edit files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:385
+#, python-format
+msgid "Edited file %s via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:401
+msgid "No changes"
+msgstr ""
+
+#: rhodecode/controllers/files.py:410 rhodecode/controllers/files.py:485
+#, python-format
+msgid "Successfully committed to %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:438
+msgid "Added file via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:459
 msgid "No content"
 msgstr ""
 
-#: rhodecode/controllers/files.py:375
+#: rhodecode/controllers/files.py:463
 msgid "No filename"
 msgstr ""
 
-#: rhodecode/controllers/files.py:400
+#: rhodecode/controllers/files.py:488
 msgid "Location must be relative path and must not contain .. in path"
 msgstr ""
 
-#: rhodecode/controllers/files.py:434
+#: rhodecode/controllers/files.py:522
 msgid "Downloads disabled"
 msgstr ""
 
-#: rhodecode/controllers/files.py:445
+#: rhodecode/controllers/files.py:533
 #, python-format
 msgid "Unknown revision %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:447
+#: rhodecode/controllers/files.py:535
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/controllers/files.py:449
+#: rhodecode/controllers/files.py:537
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/controllers/files.py:705
-#: rhodecode/templates/changeset/changeset_range.html:9
+#: rhodecode/controllers/files.py:773
+#: rhodecode/templates/changeset/changeset_range.html:12
 #: rhodecode/templates/email_templates/pull_request.html:12
-#: rhodecode/templates/pullrequests/pullrequest.html:124
+#: rhodecode/templates/pullrequests/pullrequest.html:123
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:706 rhodecode/controllers/pullrequests.py:149
-#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:689
+#: rhodecode/controllers/files.py:774 rhodecode/controllers/pullrequests.py:158
+#: rhodecode/controllers/summary.py:74 rhodecode/model/scm.py:816
 #: rhodecode/templates/switch_to_list.html:3
-#: rhodecode/templates/branches/branches.html:10
+#: rhodecode/templates/branches/branches.html:13
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:707 rhodecode/controllers/pullrequests.py:150
-#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:700
+#: rhodecode/controllers/files.py:775 rhodecode/controllers/pullrequests.py:159
+#: rhodecode/controllers/summary.py:75 rhodecode/model/scm.py:827
 #: rhodecode/templates/switch_to_list.html:25
-#: rhodecode/templates/tags/tags.html:10
+#: rhodecode/templates/tags/tags.html:13
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:176
-#, python-format
-msgid "Forked repository %s as %s"
-msgstr ""
-
-#: rhodecode/controllers/forks.py:190
+#: rhodecode/controllers/forks.py:189
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153
+#: rhodecode/controllers/home.py:81
+msgid "Groups"
+msgstr ""
+
+#: rhodecode/controllers/home.py:86
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:106
+#: rhodecode/templates/admin/repos/repo_add.html:15
+#: rhodecode/templates/admin/repos/repo_add.html:19
+#: rhodecode/templates/admin/users/user_edit_advanced.html:6
+#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:87
+#: rhodecode/templates/base/base.html:136
+#: rhodecode/templates/base/base.html:389
+#: rhodecode/templates/base/base.html:560
+msgid "Repositories"
+msgstr ""
+
+#: rhodecode/controllers/home.py:127 rhodecode/templates/files/files.html:33
+#: rhodecode/templates/files/files_add.html:37
+#: rhodecode/templates/files/files_delete.html:37
+#: rhodecode/templates/files/files_edit.html:37
+msgid "Branch"
+msgstr ""
+
+#: rhodecode/controllers/home.py:133
+msgid "Tag"
+msgstr ""
+
+#: rhodecode/controllers/home.py:139
+msgid "Bookmark"
+msgstr ""
+
+#: rhodecode/controllers/journal.py:112 rhodecode/controllers/journal.py:155
 msgid "public journal"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157
-#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/controllers/journal.py:116 rhodecode/controllers/journal.py:159
+#: rhodecode/templates/journal/journal.html:15
 msgid "journal"
 msgstr ""
 
-#: rhodecode/controllers/login.py:145
+#: rhodecode/controllers/login.py:185 rhodecode/controllers/login.py:230
+msgid "bad captcha"
+msgstr ""
+
+#: rhodecode/controllers/login.py:191
 msgid "You have successfully registered into RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/login.py:172
+#: rhodecode/controllers/login.py:235
 msgid "Your password reset link was sent"
 msgstr ""
 
-#: rhodecode/controllers/login.py:192
+#: rhodecode/controllers/login.py:255
 msgid "Your password reset was successful, new password has been sent to your email"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:136
-#: rhodecode/templates/changeset/changeset.html:10
+#: rhodecode/controllers/pullrequests.py:138
+#: rhodecode/templates/changeset/changeset.html:13
 #: rhodecode/templates/email_templates/changeset_comment.html:15
 msgid "Changeset"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:146
+#: rhodecode/controllers/pullrequests.py:155
 msgid "Special"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:147
+#: rhodecode/controllers/pullrequests.py:156
 msgid "Peer branches"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:148 rhodecode/model/scm.py:695
+#: rhodecode/controllers/pullrequests.py:157 rhodecode/model/scm.py:822
 #: rhodecode/templates/switch_to_list.html:38
-#: rhodecode/templates/bookmarks/bookmarks.html:10
+#: rhodecode/templates/bookmarks/bookmarks.html:13
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:323
+#: rhodecode/controllers/pullrequests.py:328
 msgid "Pull request requires a title with min. 3 chars"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:325
+#: rhodecode/controllers/pullrequests.py:330
 #, python-format
 msgid "Error creating pull request: %s"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:347
+#: rhodecode/controllers/pullrequests.py:352
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:350
+#: rhodecode/controllers/pullrequests.py:355
 msgid "Error occurred during sending pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:389
+#: rhodecode/controllers/pullrequests.py:395
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:477
+#: rhodecode/controllers/pullrequests.py:483
 msgid "Closing with"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:514
+#: rhodecode/controllers/pullrequests.py:520
 msgid "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr ""
 
-#: rhodecode/controllers/search.py:132
+#: rhodecode/controllers/search.py:133
 msgid "Invalid search query. Try quoting it."
 msgstr ""
 
-#: rhodecode/controllers/search.py:137
+#: rhodecode/controllers/search.py:138
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr ""
 
-#: rhodecode/controllers/search.py:141
+#: rhodecode/controllers/search.py:142
 msgid "An error occurred during this search operation"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:182
+#: rhodecode/controllers/summary.py:201
 msgid "No data loaded yet"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:188
-#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/controllers/summary.py:204
+#: rhodecode/templates/summary/summary.html:105
 msgid "Statistics are disabled for this repository"
 msgstr ""
 
-#: rhodecode/controllers/admin/defaults.py:96
+#: rhodecode/controllers/admin/auth_settings.py:125
+msgid "Auth settings updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/auth_settings.py:136
+msgid "error occurred during update of auth settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/defaults.py:95
 msgid "Default settings updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/defaults.py:110
+#: rhodecode/controllers/admin/defaults.py:109
 msgid "Error occurred during update of defaults"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:56
-msgid "forever"
-msgstr ""
-
-#: rhodecode/controllers/admin/gists.py:57
-msgid "5 minutes"
-msgstr ""
-
 #: rhodecode/controllers/admin/gists.py:58
-msgid "1 hour"
+#: rhodecode/controllers/admin/my_account.py:255
+#: rhodecode/controllers/admin/users.py:287
+msgid "forever"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:59
-msgid "1 day"
+#: rhodecode/controllers/admin/my_account.py:256
+#: rhodecode/controllers/admin/users.py:288
+msgid "5 minutes"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:60
-msgid "1 month"
+#: rhodecode/controllers/admin/my_account.py:257
+#: rhodecode/controllers/admin/users.py:289
+msgid "1 hour"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:61
+#: rhodecode/controllers/admin/my_account.py:258
+#: rhodecode/controllers/admin/users.py:290
+msgid "1 day"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/my_account.py:259
+#: rhodecode/controllers/admin/users.py:291
+msgid "1 month"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:66
+#: rhodecode/controllers/admin/my_account.py:261
+#: rhodecode/controllers/admin/users.py:293
 msgid "Lifetime"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:128
+#: rhodecode/controllers/admin/gists.py:145
 msgid "Error occurred during gist creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:166
+#: rhodecode/controllers/admin/gists.py:183
 #, python-format
 msgid "Deleted gist %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/ldap_settings.py:50
-msgid "BASE"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:51
-msgid "ONELEVEL"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:52
-msgid "SUBTREE"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:56
-msgid "NEVER"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:57
-msgid "ALLOW"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:58
-msgid "TRY"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:59
-msgid "DEMAND"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:60
-msgid "HARD"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:64
-msgid "No encryption"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:65
-msgid "LDAPS connection"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:66
-msgid "START_TLS on LDAP connection"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:124
-msgid "LDAP settings updated successfully"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:128
-msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:145
-msgid "Error occurred during update of ldap settings"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:58
-#: rhodecode/controllers/admin/permissions.py:62
-#: rhodecode/controllers/admin/permissions.py:66
-msgid "None"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:59
-#: rhodecode/controllers/admin/permissions.py:63
-#: rhodecode/controllers/admin/permissions.py:67
-msgid "Read"
+#: rhodecode/controllers/admin/gists.py:232
+msgid "unmodified"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:261
+msgid "Successfully updated gist content"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:266
+msgid "Successfully updated gist data"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:269
+#, python-format
+msgid "Error occurred during update of gist %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:68
+msgid "You can't edit this user since it's crucial for entire application"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:125
+msgid "Your account was updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:139
+#: rhodecode/controllers/admin/users.py:205
+#, python-format
+msgid "Error occurred during update of user %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:159
+msgid "Successfully updated password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:169
+msgid "Error occurred during update of user password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:211
+#: rhodecode/controllers/admin/users.py:430
+#, python-format
+msgid "Added email %s to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:217
+#: rhodecode/controllers/admin/users.py:436
+msgid "An error occurred during email saving"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:226
+#: rhodecode/controllers/admin/users.py:447
+msgid "Removed email from user"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:272
+#: rhodecode/controllers/admin/users.py:313
+msgid "Api key successfully created"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:284
+#: rhodecode/controllers/admin/users.py:329
+msgid "Api key successfully reset"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:288
+#: rhodecode/controllers/admin/users.py:333
+msgid "Api key successfully deleted"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:60
 #: rhodecode/controllers/admin/permissions.py:64
 #: rhodecode/controllers/admin/permissions.py:68
-msgid "Write"
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:104
+msgid "None"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
 #: rhodecode/controllers/admin/permissions.py:69
-#: rhodecode/templates/admin/defaults/defaults.html:9
-#: rhodecode/templates/admin/ldap/ldap.html:9
-#: rhodecode/templates/admin/permissions/permissions.html:9
-#: rhodecode/templates/admin/repos/repo_add.html:10
-#: rhodecode/templates/admin/repos/repo_add.html:14
-#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:9
-#: rhodecode/templates/admin/users/user_add.html:8
-#: rhodecode/templates/admin/users/user_edit.html:9
-#: rhodecode/templates/admin/users/user_edit.html:133
-#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/admin/users_groups/users_group_add.html:8
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:9
-#: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:315
-#: rhodecode/templates/base/base.html:316
-#: rhodecode/templates/base/base.html:322
-#: rhodecode/templates/base/base.html:323
+msgid "Read"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:62
+#: rhodecode/controllers/admin/permissions.py:66
+#: rhodecode/controllers/admin/permissions.py:70
+msgid "Write"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
+#: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/templates/admin/auth/auth_settings.html:12
+#: rhodecode/templates/admin/defaults/defaults.html:12
+#: rhodecode/templates/admin/permissions/permissions.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:17
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/settings/settings.html:12
+#: rhodecode/templates/admin/user_groups/user_group_add.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+#: rhodecode/templates/admin/users/user_add.html:11
+#: rhodecode/templates/admin/users/user_edit.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:114
+#: rhodecode/templates/admin/users/users.html:13
+#: rhodecode/templates/admin/users/users.html:58
+#: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:340
+#: rhodecode/templates/base/base.html:346
+#: rhodecode/templates/base/base.html:347
 msgid "Admin"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:72
-#: rhodecode/controllers/admin/permissions.py:83
-#: rhodecode/controllers/admin/permissions.py:86
-#: rhodecode/controllers/admin/permissions.py:89
-#: rhodecode/controllers/admin/permissions.py:92
-msgid "Disabled"
-msgstr ""
-
 #: rhodecode/controllers/admin/permissions.py:74
-msgid "Allowed with manual account activation"
+#: rhodecode/controllers/admin/permissions.py:85
+#: rhodecode/controllers/admin/permissions.py:90
+#: rhodecode/controllers/admin/permissions.py:93
+#: rhodecode/controllers/admin/permissions.py:96
+#: rhodecode/controllers/admin/permissions.py:99
+msgid "Disabled"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:76
+msgid "Allowed with manual account activation"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:78
 msgid "Allowed with automatic account activation"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:79
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444
+#: rhodecode/controllers/admin/permissions.py:81
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1485
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1542
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1564
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1603
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1655
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1682 rhodecode/model/db.py:1692
 msgid "Manual activation of external account"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:80
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445
+#: rhodecode/controllers/admin/permissions.py:82
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1486
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1565
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1604
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1656
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1683 rhodecode/model/db.py:1693
 msgid "Automatic activation of external account"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:84
-#: rhodecode/controllers/admin/permissions.py:87
-#: rhodecode/controllers/admin/permissions.py:90
-#: rhodecode/controllers/admin/permissions.py:93
+#: rhodecode/controllers/admin/permissions.py:86
+#: rhodecode/controllers/admin/permissions.py:89
+#: rhodecode/controllers/admin/permissions.py:94
+#: rhodecode/controllers/admin/permissions.py:97
+#: rhodecode/controllers/admin/permissions.py:100
 msgid "Enabled"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:138
-msgid "Default permissions updated successfully"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:152
+#: rhodecode/controllers/admin/permissions.py:123
+msgid "Global permissions updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:137
 msgid "Error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:128
-msgid "--REMOVE FORK--"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:168
+#: rhodecode/controllers/admin/repo_groups.py:184
+#, python-format
+msgid "Created repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:196
+#, python-format
+msgid "Error occurred during creation of repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:254
+#, python-format
+msgid "Updated repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:269
+#, python-format
+msgid "Error occurred during update of repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:287
+#, python-format
+msgid "This group contains %s repositores and cannot be deleted"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:294
+#, python-format
+msgid "This group contains %s subgroups and cannot be deleted"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:300
+#, python-format
+msgid "Removed repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:305
+#, python-format
+msgid "Error occurred during deletion of repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:417
+#: rhodecode/controllers/admin/repo_groups.py:452
+#: rhodecode/controllers/admin/user_groups.py:335
+msgid "Cannot revoke permission for yourself as admin"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:432
+msgid "Repository Group permissions updated"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:469
+#: rhodecode/controllers/admin/repos.py:424
+#: rhodecode/controllers/admin/user_groups.py:347
+msgid "An error occurred during revoking of permission"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:160
+#, python-format
+msgid "Error creating repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:235
 #, python-format
 msgid "Created repository %s from %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:174
+#: rhodecode/controllers/admin/repos.py:244
+#, python-format
+msgid "Forked repository %s as %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:247
 #, python-format
 msgid "Created repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:197
-#, python-format
-msgid "Error creating repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:270
+#: rhodecode/controllers/admin/repos.py:287
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:288
+#: rhodecode/controllers/admin/repos.py:305
 #, python-format
 msgid "Error occurred during update of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:315
+#: rhodecode/controllers/admin/repos.py:332
 #, python-format
 msgid "Detached %s forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:318
+#: rhodecode/controllers/admin/repos.py:335
 #, python-format
 msgid "Deleted %s forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:323
+#: rhodecode/controllers/admin/repos.py:340
 #, python-format
 msgid "Deleted repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:326
+#: rhodecode/controllers/admin/repos.py:343
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/admin/repos.py:348
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:345
+#: rhodecode/controllers/admin/repos.py:400
 msgid "Repository permissions updated"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:375
-#: rhodecode/controllers/admin/repos_groups.py:332
-#: rhodecode/controllers/admin/users_groups.py:312
-msgid "An error occurred during revoking of permission"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:392
-msgid "An error occurred during deletion of repository stats"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:409
-msgid "An error occurred during cache invalidation"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:429
 #: rhodecode/controllers/admin/repos.py:456
-msgid "An error occurred during unlocking"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:447
-msgid "Unlocked"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:450
-msgid "Locked"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:452
-#, python-format
-msgid "Repository has been %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:476
+msgid "An error occurred during creation of field"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:470
+msgid "An error occurred during removal of field"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:486
+msgid "-- Not a fork --"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:520
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:480
+#: rhodecode/controllers/admin/repos.py:524
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302
+#: rhodecode/controllers/admin/repos.py:529 rhodecode/model/validators.py:359
 msgid "Token mismatch"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:498
-msgid "Pulled from remote location"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:501
-msgid "An error occurred during pull from remote location"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:517
+#: rhodecode/controllers/admin/repos.py:544
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:519
+#: rhodecode/controllers/admin/repos.py:546
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:523
+#: rhodecode/controllers/admin/repos.py:553
 msgid "An error occurred during this operation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:562
-msgid "An error occurred during creation of field"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:576
-msgid "An error occurred during removal of field"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:147
-#, python-format
-msgid "Created repository group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:159
-#, python-format
-msgid "Error occurred during creation of repository group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:217
-#, python-format
-msgid "Updated repository group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:232
-#, python-format
-msgid "Error occurred during update of repository group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:250
-#, python-format
-msgid "This group contains %s repositores and cannot be deleted"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:257
-#, python-format
-msgid "This group contains %s subgroups and cannot be deleted"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:263
-#, python-format
-msgid "Removed repository group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:268
-#, python-format
-msgid "Error occurred during deletion of repository group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:279
-#: rhodecode/controllers/admin/repos_groups.py:314
-#: rhodecode/controllers/admin/users_groups.py:300
-msgid "Cannot revoke permission for yourself as admin"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:294
-msgid "Repository Group permissions updated"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:127
-#, python-format
-msgid "Repositories successfully rescanned added: %s ; removed: %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:136
-msgid "Whoosh reindex task scheduled"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:167
-msgid "Updated application settings"
+#: rhodecode/controllers/admin/repos.py:569
+msgid "Locked repository"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:572
+msgid "Unlocked repository"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:575
+#: rhodecode/controllers/admin/repos.py:602
+msgid "An error occurred during unlocking"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:593
+msgid "Unlocked"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:596
+msgid "Locked"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:598
+#, python-format
+msgid "Repository has been %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:616
+msgid "Cache invalidation successful"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:620
+msgid "An error occurred during cache invalidation"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:635
+msgid "Pulled from remote location"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:638
+msgid "An error occurred during pull from remote location"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:671
+msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:171
-#: rhodecode/controllers/admin/settings.py:308
+msgid "Updated VCS settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:175
+msgid "Unable to activate hgsubversion support. The \"hgsubversion\" library is missing"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:181
+#: rhodecode/controllers/admin/settings.py:273
 msgid "Error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:223
+#: rhodecode/controllers/admin/settings.py:214
+#, python-format
+msgid "Repositories successfully rescanned added: %s ; removed: %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:269
+msgid "Updated application settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:326
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:228
-msgid "Error occurred during updating visualisation settings"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:304
-msgid "Updated VCS settings"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:319
-msgid "Added new hook"
-msgstr ""
-
 #: rhodecode/controllers/admin/settings.py:331
+msgid "Error occurred during updating visualisation settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:357
+msgid "Please enter email address"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:369
+msgid "Send email task created"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:399
+msgid "Added new hook"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:413
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:335
+#: rhodecode/controllers/admin/settings.py:417
 msgid "Error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:354
-msgid "Email task created"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:418
-msgid "You can't edit this user since it's crucial for entire application"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:460
-msgid "Your account was updated successfully"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:475
-#: rhodecode/controllers/admin/users.py:200
-#, python-format
-msgid "Error occurred during update of user %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:130
+#: rhodecode/controllers/admin/settings.py:443
+msgid "Whoosh reindex task scheduled"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:535
+msgid "Updated license information"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:540
+msgid "Error occurred during updating license info"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:563
+#, python-format
+msgid "Your license will expire on %s, please contact support to extend your license."
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:566
+#, python-format
+msgid "Your license has expired on %s, please contact support to extend your license."
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:571
+msgid "Unexpected error while reading license key. Please make sure your license token and key are correct"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:148
+#, python-format
+msgid "Created user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:159
+#, python-format
+msgid "Error occurred during creation of user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:197
+#, python-format
+msgid "Updated user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:219
+#, python-format
+msgid "Error occurred during update of user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:237
+msgid "Successfully deleted user group"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:242
+msgid "An error occurred during deletion of user group"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:309
+msgid "Target group cannot be the same"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:315
+msgid "User Group permissions updated"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:435
+#: rhodecode/controllers/admin/users.py:395
+msgid "Updated permissions"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:439
+#: rhodecode/controllers/admin/users.py:399
+msgid "An error occurred during permissions saving"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:133
 #, python-format
 msgid "Created user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:144
+#: rhodecode/controllers/admin/users.py:147
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:178
+#: rhodecode/controllers/admin/users.py:186
 msgid "User updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:216
-msgid "Successfully deleted user"
-msgstr ""
-
 #: rhodecode/controllers/admin/users.py:221
+msgid "Successfully deleted user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:226
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:236
+#: rhodecode/controllers/admin/users.py:240
+#: rhodecode/controllers/admin/users.py:258
+#: rhodecode/controllers/admin/users.py:281
+#: rhodecode/controllers/admin/users.py:306
+#: rhodecode/controllers/admin/users.py:319
+#: rhodecode/controllers/admin/users.py:343
+#: rhodecode/controllers/admin/users.py:406
+#: rhodecode/controllers/admin/users.py:453
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:295
-#: rhodecode/controllers/admin/users_groups.py:372
-msgid "Updated permissions"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:299
-#: rhodecode/controllers/admin/users_groups.py:376
-msgid "An error occurred during permissions saving"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:313
-#, python-format
-msgid "Added email %s to user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:319
-msgid "An error occurred during email saving"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:329
-msgid "Removed email from user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:342
-#, python-format
-msgid "Added ip %s to user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:348
+#: rhodecode/controllers/admin/users.py:481
+#, python-format
+msgid "Added ip %s to user whitelist"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:487
 msgid "An error occurred during ip saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:360
-msgid "Removed ip from user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:162
-#, python-format
-msgid "Created user group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:173
-#, python-format
-msgid "Error occurred during creation of user group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:210
-#, python-format
-msgid "Updated user group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:232
-#, python-format
-msgid "Error occurred during update of user group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:250
-msgid "Successfully deleted user group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:255
-msgid "An error occurred during deletion of user group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:274
-msgid "Target group cannot be the same"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:280
-msgid "User Group permissions updated"
-msgstr ""
-
-#: rhodecode/lib/auth.py:543
+#: rhodecode/controllers/admin/users.py:501
+msgid "Removed ip address from user whitelist"
+msgstr ""
+
+#: rhodecode/lib/auth.py:746
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 
-#: rhodecode/lib/auth.py:592
+#: rhodecode/lib/auth.py:807
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
-#: rhodecode/lib/auth.py:633
+#: rhodecode/lib/auth.py:844
 msgid "You need to be a signed in to view this page"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:66
+#: rhodecode/lib/diffs.py:64
 msgid "Binary file"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:82
+#: rhodecode/lib/diffs.py:80
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:92
+#: rhodecode/lib/diffs.py:90
 msgid "No changes detected"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:538
-msgid "True"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:541
-msgid "False"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:579
+#: rhodecode/lib/helpers.py:598
 #, python-format
 msgid "Deleted branch: %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:582
+#: rhodecode/lib/helpers.py:601
 #, python-format
 msgid "Created tag: %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:595
+#: rhodecode/lib/helpers.py:614
 msgid "Changeset not found"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:645
+#: rhodecode/lib/helpers.py:664
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:651
+#: rhodecode/lib/helpers.py:670
 msgid "compare view"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:671
+#: rhodecode/lib/helpers.py:690
 msgid "and"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:672
+#: rhodecode/lib/helpers.py:691
 #, python-format
 msgid "%s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:673 rhodecode/templates/changelog/changelog.html:53
+#: rhodecode/lib/helpers.py:692 rhodecode/templates/changelog/changelog.html:58
 msgid "revisions"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:697
+#: rhodecode/lib/helpers.py:716
 #, python-format
 msgid "fork name %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:714
-#: rhodecode/templates/pullrequests/pullrequest_show.html:8
+#: rhodecode/lib/helpers.py:733
+#: rhodecode/templates/pullrequests/pullrequest_show.html:11
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:724
+#: rhodecode/lib/helpers.py:743
 msgid "[deleted] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:726 rhodecode/lib/helpers.py:738
+#: rhodecode/lib/helpers.py:745 rhodecode/lib/helpers.py:757
 msgid "[created] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:728
+#: rhodecode/lib/helpers.py:747
 msgid "[created] repository as fork"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:730 rhodecode/lib/helpers.py:740
+#: rhodecode/lib/helpers.py:749 rhodecode/lib/helpers.py:759
 msgid "[forked] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:732 rhodecode/lib/helpers.py:742
+#: rhodecode/lib/helpers.py:751 rhodecode/lib/helpers.py:761
 msgid "[updated] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:734
+#: rhodecode/lib/helpers.py:753
 msgid "[downloaded] archive from repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:736
+#: rhodecode/lib/helpers.py:755
 msgid "[delete] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:744
+#: rhodecode/lib/helpers.py:763
 msgid "[created] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:746
+#: rhodecode/lib/helpers.py:765
 msgid "[updated] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:748
+#: rhodecode/lib/helpers.py:767
 msgid "[created] user group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:750
+#: rhodecode/lib/helpers.py:769
 msgid "[updated] user group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:752
+#: rhodecode/lib/helpers.py:771
 msgid "[commented] on revision in repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:754
+#: rhodecode/lib/helpers.py:773
 msgid "[commented] on pull request for"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:756
+#: rhodecode/lib/helpers.py:775
 msgid "[closed] pull request for"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:758
+#: rhodecode/lib/helpers.py:777
 msgid "[pushed] into"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:760
+#: rhodecode/lib/helpers.py:779
 msgid "[committed via RhodeCode] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:762
+#: rhodecode/lib/helpers.py:781
 msgid "[pulled from remote] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:764
+#: rhodecode/lib/helpers.py:783
 msgid "[pulled] from"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:766
+#: rhodecode/lib/helpers.py:785
 msgid "[started following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:768
+#: rhodecode/lib/helpers.py:787
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1087
+#: rhodecode/lib/helpers.py:1102
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1091
+#: rhodecode/lib/helpers.py:1106
 msgid "No Files"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1157
+#: rhodecode/lib/helpers.py:1172
 msgid "new file"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1160
+#: rhodecode/lib/helpers.py:1175
 msgid "mod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1163
+#: rhodecode/lib/helpers.py:1178
 msgid "del"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1166
+#: rhodecode/lib/helpers.py:1181
 msgid "rename"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1171
+#: rhodecode/lib/helpers.py:1186
 msgid "chmod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1403
+#: rhodecode/lib/helpers.py:1418
 #, 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/lib/utils2.py:410
+#: rhodecode/lib/utils2.py:413
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:411
+#: rhodecode/lib/utils2.py:414
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:412
+#: rhodecode/lib/utils2.py:415
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:413
+#: rhodecode/lib/utils2.py:416
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:414
+#: rhodecode/lib/utils2.py:417
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:415
+#: rhodecode/lib/utils2.py:418
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:431
+#: rhodecode/lib/utils2.py:434
 #, python-format
 msgid "in %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:433
+#: rhodecode/lib/utils2.py:436
 #, python-format
 msgid "%s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:435
-#, python-format
-msgid "in %s and %s"
-msgstr ""
-
 #: rhodecode/lib/utils2.py:438
 #, python-format
-msgid "%s and %s ago"
+msgid "in %s and %s"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:441
+#, python-format
+msgid "%s and %s ago"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:444
 msgid "just now"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1454
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1511
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1572
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1622
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1649 rhodecode/model/db.py:1659
 msgid "Repository no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304
-#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414
-msgid "Repository read access"
-msgstr ""
-
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305
-#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415
-msgid "Repository write access"
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1455
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1573
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1623
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1650 rhodecode/model/db.py:1660
+msgid "Repository read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1456
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1574
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1651 rhodecode/model/db.py:1661
+msgid "Repository write access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1167
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1457
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1515
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1575
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1652 rhodecode/model/db.py:1662
 msgid "Repository admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308
 msgid "Repositories Group no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309
 msgid "Repositories Group read access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group write access"
-msgstr ""
-
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310
+msgid "Repositories Group write access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311
 msgid "Repositories Group admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1452
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1509
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1510
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1570
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1620
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1647 rhodecode/model/db.py:1657
 msgid "RhodeCode Administrator"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1475
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1532
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1554
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1593
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1670 rhodecode/model/db.py:1680
 msgid "Repository creation disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315
-#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435
-msgid "Repository creation enabled"
-msgstr ""
-
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316
-#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437
-msgid "Repository forking disabled"
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1476
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1555
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1594
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1671 rhodecode/model/db.py:1681
+msgid "Repository creation enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1478
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1557
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1596
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1648
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1675 rhodecode/model/db.py:1685
+msgid "Repository forking disabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1479
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1537
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1558
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1597
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1649
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1676 rhodecode/model/db.py:1686
 msgid "Repository forking enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1403
 msgid "Register disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1180
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1404
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1183
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1407
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1651
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1980
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2040
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2062
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2101
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2154
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2200 rhodecode/model/db.py:2210
 msgid "Not Reviewed"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764
-#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940
-msgid "Approved"
-msgstr ""
-
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765
-#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941
-msgid "Rejected"
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1652
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1981
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2063
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2102
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2155
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2201 rhodecode/model/db.py:2211
+msgid "Approved"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1653
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1982
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2064
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2103
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2156
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2202 rhodecode/model/db.py:2212
+msgid "Rejected"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1654
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1983
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2044
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2065
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2104
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2157
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2203 rhodecode/model/db.py:2213
 msgid "Under Review"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1300
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1357
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1358
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1379
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1471
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1498 rhodecode/model/db.py:1508
 msgid "top level"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1459
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1516
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1577
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1654 rhodecode/model/db.py:1664
 msgid "Repository group no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1460
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1578
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1628
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1655 rhodecode/model/db.py:1665
 msgid "Repository group read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1461
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1579
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1629
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1656 rhodecode/model/db.py:1666
 msgid "Repository group write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1462
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1520
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1580
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1630
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1657 rhodecode/model/db.py:1667
 msgid "Repository group admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1464
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1521
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1582
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1632
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1659 rhodecode/model/db.py:1669
 msgid "User group no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1465
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1583
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1633
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1660 rhodecode/model/db.py:1670
 msgid "User group read access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1466
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1545
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1584
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1634
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1661 rhodecode/model/db.py:1671
 msgid "User group write access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1467
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1525
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1546
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1585
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1635
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1662 rhodecode/model/db.py:1672
 msgid "User group admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1469
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1526
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1548
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1587
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1637
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1664 rhodecode/model/db.py:1674
 msgid "Repository Group creation disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1470
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1528
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1549
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1588
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1638
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1665 rhodecode/model/db.py:1675
 msgid "Repository Group creation enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1472
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1529
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1551
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1590
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1640
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1667 rhodecode/model/db.py:1677
 msgid "User Group creation disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1473
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1552
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1591
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1641
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1668 rhodecode/model/db.py:1678
 msgid "User Group creation enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1481
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1560
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1599
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1651
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1678 rhodecode/model/db.py:1688
 msgid "Registration disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1482
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1561
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1600
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1652
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1679 rhodecode/model/db.py:1689
 msgid "User Registration with manual account activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1483
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1562
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1601
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1653
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1680 rhodecode/model/db.py:1690
 msgid "User Registration with automatic account activation"
 msgstr ""
 
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1672 rhodecode/model/db.py:1682
+msgid "Repository creation enabled with write permission to a repository group"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1673 rhodecode/model/db.py:1683
+msgid "Repository creation disabled with write permission to a repository group"
+msgstr ""
+
 #: rhodecode/model/comment.py:75
 #, python-format
 msgid "on line %s"
@@ -1304,51 +1640,55 @@
 msgid "[Mention]"
 msgstr ""
 
-#: rhodecode/model/forms.py:43
+#: rhodecode/model/forms.py:57
 msgid "Please enter a login"
 msgstr ""
 
-#: rhodecode/model/forms.py:44
+#: rhodecode/model/forms.py:58
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr ""
 
-#: rhodecode/model/forms.py:52
+#: rhodecode/model/forms.py:66
 msgid "Please enter a password"
 msgstr ""
 
-#: rhodecode/model/forms.py:53
+#: rhodecode/model/forms.py:67
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
-#: rhodecode/model/notification.py:228
-#, python-format
-msgid "%(user)s commented on changeset at %(when)s"
+#: rhodecode/model/forms.py:156
+msgid "Name must not contain only digits"
 msgstr ""
 
 #: rhodecode/model/notification.py:229
 #, python-format
-msgid "%(user)s sent message at %(when)s"
+msgid "%(user)s commented on changeset at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:230
 #, python-format
-msgid "%(user)s mentioned you at %(when)s"
+msgid "%(user)s sent message at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:231
 #, python-format
-msgid "%(user)s registered in RhodeCode at %(when)s"
+msgid "%(user)s mentioned you at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:232
 #, python-format
-msgid "%(user)s opened new pull request at %(when)s"
+msgid "%(user)s registered in RhodeCode at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:233
 #, python-format
+msgid "%(user)s opened new pull request at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:234
+#, python-format
 msgid "%(user)s commented on pull request at %(when)s"
 msgstr ""
 
@@ -1357,412 +1697,420 @@
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr ""
 
-#: rhodecode/model/scm.py:681
+#: rhodecode/model/scm.py:808
 msgid "latest tip"
 msgstr ""
 
-#: rhodecode/model/user.py:294
+#: rhodecode/model/user.py:196
 msgid "New user registration"
 msgstr ""
 
-#: rhodecode/model/user.py:318 rhodecode/model/user.py:342
+#: rhodecode/model/user.py:220 rhodecode/model/user.py:245
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:366
+#: rhodecode/model/user.py:268
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:372
+#: rhodecode/model/user.py:274
 #, python-format
 msgid "user \"%s\" still owns %s repositories and cannot be removed. Switch owners or remove those repositories. %s"
 msgstr ""
 
-#: rhodecode/model/user.py:400
+#: rhodecode/model/user.py:302
 msgid "Password reset link"
 msgstr ""
 
-#: rhodecode/model/user.py:430
+#: rhodecode/model/user.py:331
 msgid "Your new password"
 msgstr ""
 
-#: rhodecode/model/user.py:431
+#: rhodecode/model/user.py:332
 #, python-format
 msgid "Your new RhodeCode password:%s"
 msgstr ""
 
-#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39
+#: rhodecode/model/validators.py:82 rhodecode/model/validators.py:83
 msgid "Value cannot be an empty list"
 msgstr ""
 
-#: rhodecode/model/validators.py:85
+#: rhodecode/model/validators.py:120
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:87
+#: rhodecode/model/validators.py:122
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr ""
 
-#: rhodecode/model/validators.py:89
+#: rhodecode/model/validators.py:124
 msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character or underscore"
 msgstr ""
 
-#: rhodecode/model/validators.py:117
+#: rhodecode/model/validators.py:151
+msgid "The input is not valid"
+msgstr ""
+
+#: rhodecode/model/validators.py:158
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:136
-msgid "Invalid user group name"
-msgstr ""
-
-#: rhodecode/model/validators.py:137
-#, python-format
-msgid "User group \"%(usergroup)s\" already exists"
-msgstr ""
-
-#: rhodecode/model/validators.py:139
-msgid "user group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character"
-msgstr ""
-
 #: rhodecode/model/validators.py:177
-msgid "Cannot assign this group as parent"
+msgid "Invalid user group name"
 msgstr ""
 
 #: rhodecode/model/validators.py:178
 #, python-format
-msgid "Group \"%(group_name)s\" already exists"
+msgid "User group \"%(usergroup)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:180
+msgid "user group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character"
+msgstr ""
+
+#: rhodecode/model/validators.py:218
+msgid "Cannot assign this group as parent"
+msgstr ""
+
+#: rhodecode/model/validators.py:219
+#, python-format
+msgid "Group \"%(group_name)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:221
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:238
+#: rhodecode/model/validators.py:279
 msgid "Invalid characters (non-ascii) in password"
 msgstr ""
 
-#: rhodecode/model/validators.py:253
+#: rhodecode/model/validators.py:294
+msgid "Invalid old password"
+msgstr ""
+
+#: rhodecode/model/validators.py:310
 msgid "Passwords do not match"
 msgstr ""
 
-#: rhodecode/model/validators.py:270
+#: rhodecode/model/validators.py:327
 msgid "invalid password"
 msgstr ""
 
-#: rhodecode/model/validators.py:271
+#: rhodecode/model/validators.py:328
 msgid "invalid user name"
 msgstr ""
 
-#: rhodecode/model/validators.py:272
+#: rhodecode/model/validators.py:329
 msgid "Your account is disabled"
 msgstr ""
 
-#: rhodecode/model/validators.py:316
+#: rhodecode/model/validators.py:373
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr ""
 
-#: rhodecode/model/validators.py:318
+#: rhodecode/model/validators.py:375
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:319
+#: rhodecode/model/validators.py:376
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:321
+#: rhodecode/model/validators.py:378
 #, python-format
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:438
+#: rhodecode/model/validators.py:493
 msgid "invalid clone url"
 msgstr ""
 
-#: rhodecode/model/validators.py:439
+#: rhodecode/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 
-#: rhodecode/model/validators.py:464
+#: rhodecode/model/validators.py:519
 msgid "Fork have to be the same type as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:479
+#: rhodecode/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr ""
 
-#: rhodecode/model/validators.py:481
+#: rhodecode/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr ""
 
-#: rhodecode/model/validators.py:518
+#: rhodecode/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
 msgstr ""
 
-#: rhodecode/model/validators.py:559
+#: rhodecode/model/validators.py:626
 msgid "This username or user group name is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:652
+#: rhodecode/model/validators.py:719
 msgid "This is not a valid path"
 msgstr ""
 
-#: rhodecode/model/validators.py:667
+#: rhodecode/model/validators.py:734
 msgid "This e-mail address is already taken"
 msgstr ""
 
-#: rhodecode/model/validators.py:687
+#: rhodecode/model/validators.py:754
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr ""
 
-#: rhodecode/model/validators.py:724
+#: rhodecode/model/validators.py:791
 msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to \"username\""
 msgstr ""
 
-#: rhodecode/model/validators.py:737
+#: rhodecode/model/validators.py:804
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
-#: rhodecode/model/validators.py:769
+#: rhodecode/model/validators.py:836
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
-#: rhodecode/model/validators.py:770
+#: rhodecode/model/validators.py:837
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
 
-#: rhodecode/model/validators.py:803
+#: rhodecode/model/validators.py:870
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 
-#: rhodecode/model/validators.py:817
+#: rhodecode/model/validators.py:884
 msgid "Filename cannot be inside a directory"
 msgstr ""
 
+#: rhodecode/model/validators.py:900
+#, python-format
+msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
+msgstr ""
+
 #: rhodecode/templates/index.html:5
 msgid "Dashboard"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:6
-#: rhodecode/templates/repo_switcher_list.html:4
-#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/users/user_edit_my_account.html:31
-#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/bookmarks/bookmarks.html:9
-#: rhodecode/templates/branches/branches.html:9
-#: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:46
-#: rhodecode/templates/journal/journal.html:47
-#: rhodecode/templates/tags/tags.html:9
+#: rhodecode/templates/admin/my_account/my_account_repos.html:3
+#: rhodecode/templates/admin/my_account/my_account_watched.html:3
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:12
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:12
+#: rhodecode/templates/admin/users/users.html:12
+#: rhodecode/templates/bookmarks/bookmarks.html:12
+#: rhodecode/templates/branches/branches.html:12
+#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:50
+#: rhodecode/templates/tags/tags.html:12
 msgid "quick filter..."
 msgstr ""
 
 #: rhodecode/templates/index_base.html:6
-#: rhodecode/templates/admin/repos/repos.html:9
+#: rhodecode/templates/admin/repos/repos.html:12
 msgid "repositories"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:13
-#: rhodecode/templates/index_base.html:18
-#: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repos.html:22
-msgid "Add repository"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:15
 #: rhodecode/templates/index_base.html:20
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31
-msgid "Add repository group"
-msgstr ""
-
+#: rhodecode/templates/index_base.html:25
+#: rhodecode/templates/admin/repos/repo_add.html:22
+#: rhodecode/templates/admin/repos/repos.html:25
+msgid "Add Repository"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:22
 #: rhodecode/templates/index_base.html:27
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
-msgid "Edit repository group"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:27
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:16
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:29
+msgid "Add Repository Group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:32
 msgid "You have admin right to this group, and can edit it"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:40
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43
-#: rhodecode/templates/admin/users_groups/users_group_add.html:32
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:33
-#: rhodecode/templates/admin/users_groups/users_groups.html:37
-msgid "Group name"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:41
-#: rhodecode/templates/index_base.html:123
-#: rhodecode/templates/admin/repos/repo_add_base.html:56
-#: rhodecode/templates/admin/repos/repo_edit.html:68
-#: rhodecode/templates/admin/repos/repos.html:75
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44
+#: rhodecode/templates/index_base.html:32
+msgid "Edit Repository Group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:45
+msgid "Group Name"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:46
+#: rhodecode/templates/index_base.html:128
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:64
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:45
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:17
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:32
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:72
+#: rhodecode/templates/admin/repos/repos.html:51
+#: rhodecode/templates/admin/user_groups/user_group_add.html:43
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:51
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:64
 #: rhodecode/templates/email_templates/changeset_comment.html:16
 #: rhodecode/templates/email_templates/pull_request.html:9
-#: rhodecode/templates/forks/fork.html:56
-#: rhodecode/templates/pullrequests/pullrequest.html:43
-#: rhodecode/templates/pullrequests/pullrequest_show.html:88
-#: rhodecode/templates/summary/summary.html:106
+#: rhodecode/templates/forks/fork.html:41
+#: rhodecode/templates/pullrequests/pullrequest.html:40
+#: rhodecode/templates/pullrequests/pullrequest_show.html:86
+#: rhodecode/templates/summary/summary.html:88
 msgid "Description"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:51
-#: rhodecode/templates/admin/permissions/permissions.html:55
-#: rhodecode/templates/admin/repos/repo_add_base.html:29
-#: rhodecode/templates/admin/repos/repo_edit.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57
-#: rhodecode/templates/forks/fork.html:47
-msgid "Repository group"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:121
-#: rhodecode/templates/admin/repos/repo_add_base.html:9
-#: rhodecode/templates/admin/repos/repo_edit.html:32
-#: rhodecode/templates/admin/repos/repos.html:73
-#: rhodecode/templates/admin/users/user_edit_my_account.html:172
-#: rhodecode/templates/base/perms_summary.html:37
-#: rhodecode/templates/bookmarks/bookmarks.html:48
-#: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:47
-#: rhodecode/templates/branches/branches_data.html:6
-#: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:193
-#: rhodecode/templates/journal/journal.html:283
-#: rhodecode/templates/summary/summary.html:55
-#: rhodecode/templates/summary/summary.html:124
-#: rhodecode/templates/tags/tags.html:48
-#: rhodecode/templates/tags/tags_data.html:6
-msgid "Name"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:124
-msgid "Last Change"
-msgstr ""
-
 #: rhodecode/templates/index_base.html:126
-#: rhodecode/templates/admin/repos/repos.html:76
-#: rhodecode/templates/admin/users/user_edit_my_account.html:174
-#: rhodecode/templates/journal/journal.html:195
-#: rhodecode/templates/journal/journal.html:285
+#: rhodecode/templates/admin/my_account/my_account_repos.html:46
+#: rhodecode/templates/admin/my_account/my_account_watched.html:46
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:50
+#: rhodecode/templates/admin/repos/repo_add_base.html:9
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:7
+#: rhodecode/templates/admin/repos/repos.html:50
+#: rhodecode/templates/admin/user_groups/user_groups.html:50
+#: rhodecode/templates/base/perms_summary.html:53
+#: rhodecode/templates/bookmarks/bookmarks.html:51
+#: rhodecode/templates/bookmarks/bookmarks_data.html:7
+#: rhodecode/templates/branches/branches.html:50
+#: rhodecode/templates/branches/branches_data.html:7
+#: rhodecode/templates/files/files_browser.html:41
+#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/journal/journal.html:288
+#: rhodecode/templates/tags/tags.html:51
+#: rhodecode/templates/tags/tags_data.html:7
+msgid "Name"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:129
+msgid "Last Change"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:131
+#: rhodecode/templates/admin/my_account/my_account_repos.html:48
+#: rhodecode/templates/admin/my_account/my_account_watched.html:48
+#: rhodecode/templates/admin/repos/repos.html:52
+#: rhodecode/templates/journal/journal.html:199
+#: rhodecode/templates/journal/journal.html:290
 msgid "Tip"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:128
-#: rhodecode/templates/admin/repos/repo_edit.html:114
-#: rhodecode/templates/admin/repos/repos.html:78
+#: rhodecode/templates/index_base.html:133
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:10
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:53
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:60
+#: rhodecode/templates/admin/repos/repos.html:53
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:8
+#: rhodecode/templates/admin/user_groups/user_groups.html:54
+#: rhodecode/templates/summary/summary.html:141
 msgid "Owner"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:136
-#: rhodecode/templates/admin/repos/repos.html:86
-#: rhodecode/templates/admin/users/user_edit_my_account.html:183
-#: rhodecode/templates/admin/users/users.html:107
-#: rhodecode/templates/bookmarks/bookmarks.html:74
-#: rhodecode/templates/branches/branches.html:73
-#: rhodecode/templates/journal/journal.html:204
-#: rhodecode/templates/journal/journal.html:294
-#: rhodecode/templates/tags/tags.html:74
+#: rhodecode/templates/index_base.html:141
+#: rhodecode/templates/admin/my_account/my_account_repos.html:57
+#: rhodecode/templates/admin/my_account/my_account_watched.html:57
+#: rhodecode/templates/base/root.html:69
+#: rhodecode/templates/bookmarks/bookmarks.html:81
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:208
+#: rhodecode/templates/journal/journal.html:299
+#: rhodecode/templates/tags/tags.html:81
 msgid "Click to sort ascending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:137
-#: rhodecode/templates/admin/repos/repos.html:87
-#: rhodecode/templates/admin/users/user_edit_my_account.html:184
-#: rhodecode/templates/admin/users/users.html:108
-#: rhodecode/templates/bookmarks/bookmarks.html:75
-#: rhodecode/templates/branches/branches.html:74
-#: rhodecode/templates/journal/journal.html:205
-#: rhodecode/templates/journal/journal.html:295
-#: rhodecode/templates/tags/tags.html:75
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/admin/my_account/my_account_repos.html:58
+#: rhodecode/templates/admin/my_account/my_account_watched.html:58
+#: rhodecode/templates/base/root.html:70
+#: rhodecode/templates/bookmarks/bookmarks.html:82
+#: rhodecode/templates/branches/branches.html:81
+#: rhodecode/templates/journal/journal.html:209
+#: rhodecode/templates/journal/journal.html:300
+#: rhodecode/templates/tags/tags.html:82
 msgid "Click to sort descending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:138
+#: rhodecode/templates/index_base.html:143
 msgid "No repositories found."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:139
-#: rhodecode/templates/admin/repos/repos.html:89
-#: rhodecode/templates/admin/users/user_edit_my_account.html:186
-#: rhodecode/templates/admin/users/users.html:110
-#: rhodecode/templates/bookmarks/bookmarks.html:77
-#: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:207
-#: rhodecode/templates/journal/journal.html:297
-#: rhodecode/templates/tags/tags.html:77
+#: rhodecode/templates/index_base.html:144
+#: rhodecode/templates/admin/my_account/my_account_repos.html:60
+#: rhodecode/templates/admin/my_account/my_account_watched.html:60
+#: rhodecode/templates/base/root.html:72
+#: rhodecode/templates/bookmarks/bookmarks.html:84
+#: rhodecode/templates/branches/branches.html:83
+#: rhodecode/templates/journal/journal.html:211
+#: rhodecode/templates/journal/journal.html:302
+#: rhodecode/templates/tags/tags.html:84
 msgid "Data error."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:140
-#: rhodecode/templates/admin/repos/repos.html:90
-#: rhodecode/templates/admin/users/user_edit_my_account.html:58
-#: rhodecode/templates/admin/users/user_edit_my_account.html:187
-#: rhodecode/templates/admin/users/users.html:111
-#: rhodecode/templates/base/base.html:125
-#: rhodecode/templates/base/base.html:277
-#: rhodecode/templates/bookmarks/bookmarks.html:78
-#: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:208
-#: rhodecode/templates/journal/journal.html:298
-#: rhodecode/templates/tags/tags.html:78
+#: rhodecode/templates/index_base.html:145
+#: rhodecode/templates/admin/my_account/my_account_repos.html:61
+#: rhodecode/templates/admin/my_account/my_account_watched.html:61
+#: rhodecode/templates/base/base.html:148 rhodecode/templates/base/root.html:73
+#: rhodecode/templates/bookmarks/bookmarks.html:85
+#: rhodecode/templates/branches/branches.html:84
+#: rhodecode/templates/journal/journal.html:212
+#: rhodecode/templates/journal/journal.html:303
+#: rhodecode/templates/tags/tags.html:85
 msgid "Loading..."
 msgstr ""
 
-#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:237
+#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:32
+#: rhodecode/templates/base/base.html:267
 msgid "Log In"
 msgstr ""
 
-#: rhodecode/templates/login.html:21
+#: rhodecode/templates/login.html:30
 #, python-format
 msgid "Log In to %s"
 msgstr ""
 
-#: rhodecode/templates/login.html:31 rhodecode/templates/register.html:29
+#: rhodecode/templates/login.html:43 rhodecode/templates/register.html:40
 #: rhodecode/templates/admin/admin_log.html:5
-#: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:57
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:32
-#: rhodecode/templates/admin/users/users.html:77
-#: rhodecode/templates/base/base.html:213
-#: rhodecode/templates/summary/summary.html:123
+#: rhodecode/templates/admin/my_account/my_account_profile.html:30
+#: rhodecode/templates/admin/users/user_add.html:35
+#: rhodecode/templates/admin/users/user_edit_profile.html:33
+#: rhodecode/templates/admin/users/users.html:53
+#: rhodecode/templates/base/base.html:243
 msgid "Username"
 msgstr ""
 
-#: rhodecode/templates/login.html:40 rhodecode/templates/register.html:38
-#: rhodecode/templates/admin/ldap/ldap.html:46
-#: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:222
+#: rhodecode/templates/login.html:52 rhodecode/templates/register.html:49
+#: rhodecode/templates/admin/my_account/my_account.html:39
+#: rhodecode/templates/admin/users/user_add.html:44
+#: rhodecode/templates/base/base.html:252
 msgid "Password"
 msgstr ""
 
-#: rhodecode/templates/login.html:50
+#: rhodecode/templates/login.html:62
 msgid "Remember me"
 msgstr ""
 
-#: rhodecode/templates/login.html:54
+#: rhodecode/templates/login.html:66
 msgid "Sign In"
 msgstr ""
 
-#: rhodecode/templates/login.html:60
+#: rhodecode/templates/login.html:72
 msgid "Forgot your password ?"
 msgstr ""
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:233
+#: rhodecode/templates/login.html:75 rhodecode/templates/base/base.html:263
 msgid "Don't have an account ?"
 msgstr ""
 
@@ -1770,81 +2118,78 @@
 msgid "Password Reset"
 msgstr ""
 
-#: rhodecode/templates/password_reset.html:11
-msgid "Reset your password to"
-msgstr ""
-
-#: rhodecode/templates/password_reset.html:21
-msgid "Email address"
-msgstr ""
-
-#: rhodecode/templates/password_reset.html:30
-msgid "Reset my password"
+#: rhodecode/templates/password_reset.html:29
+#, python-format
+msgid "Reset your Password to %s"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:31
+msgid "Reset your Password"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:42
+msgid "Email Address"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:52
+#: rhodecode/templates/register.html:95
+msgid "Captcha"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:63
+msgid "Send password reset email"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:64
 msgid "Password reset link will be send to matching email address"
 msgstr ""
 
-#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:83
+#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:30
+#: rhodecode/templates/register.html:106
 msgid "Sign Up"
 msgstr ""
 
-#: rhodecode/templates/register.html:20
-msgid "Sign Up to"
-msgstr ""
-
-#: rhodecode/templates/register.html:47
+#: rhodecode/templates/register.html:28
+#, python-format
+msgid "Sign Up to %s"
+msgstr ""
+
+#: rhodecode/templates/register.html:58
 msgid "Re-enter password"
 msgstr ""
 
-#: rhodecode/templates/register.html:56
-#: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:63
+#: rhodecode/templates/register.html:67
+#: rhodecode/templates/admin/my_account/my_account_profile.html:41
+#: rhodecode/templates/admin/users/user_add.html:62
+#: rhodecode/templates/admin/users/user_edit_profile.html:87
 msgid "First Name"
 msgstr ""
 
-#: rhodecode/templates/register.html:65
-#: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:106
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:72
+#: rhodecode/templates/register.html:76
+#: rhodecode/templates/admin/my_account/my_account_profile.html:50
+#: rhodecode/templates/admin/users/user_add.html:71
+#: rhodecode/templates/admin/users/user_edit_profile.html:96
 msgid "Last Name"
 msgstr ""
 
-#: rhodecode/templates/register.html:74
-#: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:115
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:81
-#: rhodecode/templates/summary/summary.html:125
-msgid "Email"
-msgstr ""
-
 #: rhodecode/templates/register.html:85
+#: rhodecode/templates/admin/my_account/my_account_profile.html:59
+#: rhodecode/templates/admin/settings/settings.html:44
+#: rhodecode/templates/admin/users/user_add.html:80
+#: rhodecode/templates/admin/users/user_edit_profile.html:42
+msgid "Email"
+msgstr ""
+
+#: rhodecode/templates/register.html:108
 msgid "Your account will be activated right after registration"
 msgstr ""
 
-#: rhodecode/templates/register.html:87
+#: rhodecode/templates/register.html:110
 msgid "Your account must wait for activation by administrator"
 msgstr ""
 
-#: rhodecode/templates/repo_switcher_list.html:10
-#: rhodecode/templates/admin/defaults/defaults.html:44
-#: rhodecode/templates/admin/repos/repo_add_base.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:78
-#: rhodecode/templates/data_table/_dt_elements.html:61
-#: rhodecode/templates/summary/summary.html:77
-msgid "Private repository"
-msgstr ""
-
-#: rhodecode/templates/repo_switcher_list.html:12
-#: rhodecode/templates/data_table/_dt_elements.html:63
-#: rhodecode/templates/summary/summary.html:79
-msgid "Public repository"
-msgstr ""
-
 #: rhodecode/templates/switch_to_list.html:10
-#: rhodecode/templates/branches/branches_data.html:57
+#: rhodecode/templates/branches/branches_data.html:67
 msgid "There are no branches yet"
 msgstr ""
 
@@ -1853,32 +2198,32 @@
 msgstr ""
 
 #: rhodecode/templates/switch_to_list.html:32
-#: rhodecode/templates/tags/tags_data.html:38
+#: rhodecode/templates/tags/tags_data.html:44
 msgid "There are no tags yet"
 msgstr ""
 
 #: rhodecode/templates/switch_to_list.html:45
-#: rhodecode/templates/bookmarks/bookmarks_data.html:37
+#: rhodecode/templates/bookmarks/bookmarks_data.html:43
 msgid "There are no bookmarks yet"
 msgstr ""
 
 #: rhodecode/templates/admin/admin.html:5
-#: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/base/base.html:71
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/base/base.html:69
 msgid "Admin journal"
 msgstr ""
 
-#: rhodecode/templates/admin/admin.html:10
-msgid "journal filter..."
-msgstr ""
-
-#: rhodecode/templates/admin/admin.html:12
-#: rhodecode/templates/journal/journal.html:11
-msgid "filter"
-msgstr ""
-
 #: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/journal/journal.html:12
+msgid "journal filter..."
+msgstr ""
+
+#: rhodecode/templates/admin/admin.html:15
+#: rhodecode/templates/journal/journal.html:14
+msgid "filter"
+msgstr ""
+
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/journal/journal.html:15
 #, python-format
 msgid "%s entry"
 msgid_plural "%s entries"
@@ -1886,28 +2231,30 @@
 msgstr[1] ""
 
 #: rhodecode/templates/admin/admin_log.html:6
-#: rhodecode/templates/admin/repos/repos.html:79
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
-#: rhodecode/templates/admin/users/user_edit_my_account.html:176
-#: rhodecode/templates/admin/users/users.html:87
-#: rhodecode/templates/admin/users_groups/users_groups.html:40
-#: rhodecode/templates/journal/journal.html:197
-#: rhodecode/templates/journal/journal.html:287
+#: rhodecode/templates/admin/my_account/my_account_repos.html:50
+#: rhodecode/templates/admin/my_account/my_account_watched.html:50
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:54
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:8
+#: rhodecode/templates/admin/repos/repos.html:55
+#: rhodecode/templates/admin/user_groups/user_groups.html:55
+#: rhodecode/templates/admin/users/users.html:60
+#: rhodecode/templates/journal/journal.html:201
+#: rhodecode/templates/journal/journal.html:292
 msgid "Action"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:7
-#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/permissions/permissions_globals.html:18
 msgid "Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:8
-#: rhodecode/templates/bookmarks/bookmarks.html:49
-#: rhodecode/templates/bookmarks/bookmarks_data.html:7
-#: rhodecode/templates/branches/branches.html:48
-#: rhodecode/templates/branches/branches_data.html:7
-#: rhodecode/templates/tags/tags.html:49
-#: rhodecode/templates/tags/tags_data.html:7
+#: rhodecode/templates/bookmarks/bookmarks.html:53
+#: rhodecode/templates/bookmarks/bookmarks_data.html:9
+#: rhodecode/templates/branches/branches.html:52
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/tags/tags.html:53
+#: rhodecode/templates/tags/tags_data.html:9
 msgid "Date"
 msgstr ""
 
@@ -1919,316 +2266,590 @@
 msgid "No actions yet"
 msgstr ""
 
+#: rhodecode/templates/admin/auth/auth_settings.html:5
+msgid "Authentication Settings"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:14
+#: rhodecode/templates/base/base.html:75
+msgid "Authentication"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:31
+msgid "Authentication Plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:34
+msgid "Enabled Plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:36
+msgid "Comma separated list of plugins. Order of plugins is also order in which RhodeCode will try to authenticate user"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:37
+msgid "Available built-in plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:65
+msgid "enabled"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:66
+msgid "disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:51
+#: rhodecode/templates/admin/defaults/defaults.html:87
+#: rhodecode/templates/admin/my_account/my_account_password.html:33
+#: rhodecode/templates/admin/my_account/my_account_profile.html:68
+#: rhodecode/templates/admin/permissions/permissions_globals.html:108
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:72
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:114
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:101
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:134
+#: rhodecode/templates/admin/settings/settings_hooks.html:53
+#: rhodecode/templates/admin/user_groups/user_group_add.html:60
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:104
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:67
+#: rhodecode/templates/admin/users/user_add.html:99
+#: rhodecode/templates/admin/users/user_edit_profile.html:122
+#: rhodecode/templates/base/default_perms_box.html:64
+msgid "Save"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:57
+msgid "Plugin"
+msgstr ""
+
 #: rhodecode/templates/admin/defaults/defaults.html:5
-#: rhodecode/templates/admin/defaults/defaults.html:25
+#: rhodecode/templates/admin/defaults/defaults.html:28
 msgid "Repositories defaults"
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:11
-#: rhodecode/templates/base/base.html:78
+#: rhodecode/templates/admin/defaults/defaults.html:14
+#: rhodecode/templates/base/base.html:76
 msgid "Defaults"
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:35
-#: rhodecode/templates/admin/repos/repo_add_base.html:38
+#: rhodecode/templates/admin/defaults/defaults.html:38
+#: rhodecode/templates/admin/repos/repo_add_base.html:59
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:7
 msgid "Type"
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:48
-#: rhodecode/templates/admin/repos/repo_add_base.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:82
-#: rhodecode/templates/forks/fork.html:69
+#: rhodecode/templates/admin/defaults/defaults.html:47
+#: rhodecode/templates/admin/repos/repo_add_base.html:77
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:82
+#: rhodecode/templates/data_table/_dt_elements.html:70
+msgid "Private repository"
+msgstr ""
+
+#: rhodecode/templates/admin/defaults/defaults.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:81
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:86
+#: rhodecode/templates/forks/fork.html:75
 msgid "Private repositories are only visible to people explicitly added as collaborators."
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:55
-#: rhodecode/templates/admin/repos/repo_edit.html:87
+#: rhodecode/templates/admin/defaults/defaults.html:58
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:91
 msgid "Enable statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:59
-#: rhodecode/templates/admin/repos/repo_edit.html:91
+#: rhodecode/templates/admin/defaults/defaults.html:62
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:95
 msgid "Enable statistics window on summary page."
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:96
+#: rhodecode/templates/admin/defaults/defaults.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:100
 msgid "Enable downloads"
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:100
+#: rhodecode/templates/admin/defaults/defaults.html:72
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:104
 msgid "Enable download menu on summary page."
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:75
-#: rhodecode/templates/admin/repos/repo_edit.html:105
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64
+#: rhodecode/templates/admin/defaults/defaults.html:78
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:34
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:109
 msgid "Enable locking"
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:79
-#: rhodecode/templates/admin/repos/repo_edit.html:109
+#: rhodecode/templates/admin/defaults/defaults.html:82
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:113
 msgid "Enable lock-by-pulling on repository."
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:84
-#: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/permissions/permissions.html:122
-#: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos/repo_edit.html:166
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96
-#: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_add.html:94
-#: rhodecode/templates/admin/users/user_edit.html:140
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89
-#: rhodecode/templates/admin/users_groups/users_group_add.html:49
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:143
-#: rhodecode/templates/base/default_perms_box.html:53
-msgid "Save"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:5
-#: rhodecode/templates/base/base.html:297
-msgid "Gists"
+#: rhodecode/templates/admin/gists/edit.html:5
+#: rhodecode/templates/admin/gists/edit.html:22
+msgid "Edit Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:40
+#, python-format
+msgid "Gist was update since you started editing. Copy your changes and click %(here)s to reload new version."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:59
+#: rhodecode/templates/admin/gists/new.html:43
+msgid "Gist description ..."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:61
+#: rhodecode/templates/admin/gists/new.html:45
+msgid "Gist lifetime"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/edit.html:67
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/index.html:62
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/gists/show.html:52
+msgid "Expires"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+msgid "never"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:80
+#: rhodecode/templates/admin/gists/new.html:52
+#: rhodecode/templates/files/files_add.html:59
+#: rhodecode/templates/files/files_edit.html:64
+msgid "plain"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:147
+msgid "Update Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:148
+#: rhodecode/templates/changeset/changeset_file_comment.html:89
+msgid "Cancel"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:6
+#: rhodecode/templates/admin/gists/index.html:19
+#, python-format
+msgid "Private Gists for user %s"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:8
+#: rhodecode/templates/admin/gists/index.html:21
+#, python-format
+msgid "Public Gists for user %s"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:10
-#, python-format
-msgid "Private Gists for user %s"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:12
-#, python-format
-msgid "Public Gists for user %s"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:14
+#: rhodecode/templates/admin/gists/index.html:23
 msgid "Public Gists"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.html:31
-#: rhodecode/templates/admin/gists/show.html:24
-#: rhodecode/templates/base/base.html:300
-msgid "Create new gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:48
+#: rhodecode/templates/admin/gists/index.html:40
+#: rhodecode/templates/admin/gists/show.html:28
+msgid "Create New Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:57
+#: rhodecode/templates/data_table/_dt_elements.html:143
 msgid "Created"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.html:51
-#: rhodecode/templates/admin/gists/index.html:53
-#: rhodecode/templates/admin/gists/show.html:43
-#: rhodecode/templates/admin/gists/show.html:45
-msgid "Expires"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:51
-#: rhodecode/templates/admin/gists/show.html:43
-msgid "never"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:68
+#: rhodecode/templates/admin/gists/index.html:77
 msgid "There are no gists yet"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/new.html:5
-#: rhodecode/templates/admin/gists/new.html:19
-msgid "New gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:40
-msgid "Gist description ..."
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:42
-msgid "Gist lifetime"
+#: rhodecode/templates/admin/gists/new.html:22
+msgid "New Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/new.html:51
-#: rhodecode/templates/files/files_add.html:75
-#: rhodecode/templates/files/files_edit.html:60
-msgid "plain"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:59
-msgid "Create private gist"
+msgid "name this file..."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/new.html:60
-msgid "Create public gist"
+msgid "Create Private Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/new.html:61
-#: rhodecode/templates/admin/permissions/permissions.html:123
-#: rhodecode/templates/admin/permissions/permissions.html:185
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos/repo_edit.html:167
-#: rhodecode/templates/admin/repos/repo_edit.html:381
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97
-#: rhodecode/templates/admin/settings/settings.html:121
-#: rhodecode/templates/admin/settings/settings.html:202
-#: rhodecode/templates/admin/settings/settings.html:297
-#: rhodecode/templates/admin/users/user_edit.html:141
-#: rhodecode/templates/admin/users/user_edit.html:198
-#: rhodecode/templates/admin/users/user_edit.html:246
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:90
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:144
-#: rhodecode/templates/base/default_perms_box.html:54
-#: rhodecode/templates/files/files_add.html:86
-#: rhodecode/templates/files/files_edit.html:69
-#: rhodecode/templates/pullrequests/pullrequest.html:86
+msgid "Create Public Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:62
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:70
+#: rhodecode/templates/admin/my_account/my_account_emails.html:46
+#: rhodecode/templates/admin/my_account/my_account_password.html:34
+#: rhodecode/templates/admin/my_account/my_account_profile.html:69
+#: rhodecode/templates/admin/permissions/permissions_globals.html:109
+#: rhodecode/templates/admin/permissions/permissions_ips.html:41
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:115
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:43
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:59
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:102
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:135
+#: rhodecode/templates/admin/settings/settings_global.html:56
+#: rhodecode/templates/admin/settings/settings_license.html:43
+#: rhodecode/templates/admin/settings/settings_vcs.html:81
+#: rhodecode/templates/admin/settings/settings_visual.html:116
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:105
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:70
+#: rhodecode/templates/admin/users/user_edit_emails.html:46
+#: rhodecode/templates/admin/users/user_edit_ips.html:50
+#: rhodecode/templates/admin/users/user_edit_profile.html:123
+#: rhodecode/templates/base/default_perms_box.html:65
+#: rhodecode/templates/files/files_add.html:70
+#: rhodecode/templates/files/files_delete.html:58
+#: rhodecode/templates/files/files_edit.html:73
+#: rhodecode/templates/pullrequests/pullrequest.html:83
 msgid "Reset"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:5
-msgid "gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:9
+#: rhodecode/templates/admin/gists/show.html:12
 msgid "Gist"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/show.html:36
-msgid "Public gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:38
-msgid "Private gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:54
-#: rhodecode/templates/admin/repos/repo_edit.html:299
+#: rhodecode/templates/admin/gists/show.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:4
+#: rhodecode/templates/email_templates/pull_request.html:4
+#: rhodecode/templates/email_templates/pull_request_comment.html:4
+msgid "URL"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:40
+msgid "Public Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:42
+msgid "Private Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:59
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:80
 #: rhodecode/templates/changeset/changeset_file_comment.html:48
+#: rhodecode/templates/files/files_source.html:39
+#: rhodecode/templates/files/files_source.html:42
+#: rhodecode/templates/files/files_source.html:45
 msgid "Delete"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/show.html:54
-msgid "Confirm to delete this gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:63
-#: rhodecode/templates/admin/gists/show.html:84
-#: rhodecode/templates/files/files_edit.html:50
-#: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:55
-msgid "Show as raw"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:71
+#: rhodecode/templates/admin/gists/show.html:59
+msgid "Confirm to delete this Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:66
+#: rhodecode/templates/changeset/changeset_file_comment.html:81
+#: rhodecode/templates/changeset/changeset_file_comment.html:190
+#: rhodecode/templates/data_table/_dt_elements.html:167
+#: rhodecode/templates/data_table/_dt_elements.html:183
+#: rhodecode/templates/files/files_source.html:41
+#: rhodecode/templates/files/files_source.html:44
+msgid "Edit"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:68
+#: rhodecode/templates/files/files_edit.html:54
+#: rhodecode/templates/files/files_source.html:34
+msgid "Show as Raw"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:76
 msgid "created"
 msgstr ""
 
-#: rhodecode/templates/admin/ldap/ldap.html:5
-msgid "LDAP administration"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:11
-#: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:77
-msgid "LDAP"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:28
-msgid "Connection settings"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:30
-msgid "Enable LDAP"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:34
-msgid "Host"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:38
-msgid "Port"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:42
-msgid "Account"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:50
-msgid "Connection security"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:54
-msgid "Certificate Checks"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:57
-msgid "Search settings"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:59
-msgid "Base DN"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:63
-msgid "LDAP Filter"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:67
-msgid "LDAP Search Scope"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:70
-msgid "Attribute mappings"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:72
-msgid "Login Attribute"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:76
-msgid "First Name Attribute"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:80
-msgid "Last Name Attribute"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:84
-msgid "E-mail Attribute"
+#: rhodecode/templates/admin/gists/show.html:89
+#: rhodecode/templates/files/files_source.html:71
+msgid "Show as raw"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:5
+#: rhodecode/templates/base/base.html:282
+msgid "My account"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:12
+msgid "My Account"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:38
+#: rhodecode/templates/admin/users/user_edit.html:42
+msgid "Profile"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:40
+#: rhodecode/templates/admin/users/user_edit.html:43
+msgid "API keys"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:41
+msgid "My Emails"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:42
+msgid "My Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:43
+#: rhodecode/templates/journal/journal.html:54
+msgid "Watched"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:44
+msgid "Pull requests"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:45
+msgid "My permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:6
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:6
+msgid "Built-in"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:32
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:32
+msgid "expires"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:14
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:14
+#, python-format
+msgid "Confirm to reset this api key: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:15
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:15
+msgid "reset"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:30
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:30
+msgid "expired"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:40
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:40
+#, python-format
+msgid "Confirm to remove this api key: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:42
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:42
+msgid "remove"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:49
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:49
+msgid "No additional api keys specified"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:61
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:61
+msgid "New api key"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:69
+#: rhodecode/templates/admin/my_account/my_account_emails.html:45
+#: rhodecode/templates/admin/permissions/permissions_ips.html:40
+#: rhodecode/templates/admin/repos/repo_add_base.html:85
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:58
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:69
+#: rhodecode/templates/admin/users/user_edit_emails.html:45
+#: rhodecode/templates/admin/users/user_edit_ips.html:49
+msgid "Add"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:7
+#: rhodecode/templates/admin/users/user_edit_emails.html:7
+msgid "Primary"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:19
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:24
+#: rhodecode/templates/admin/permissions/permissions_ips.html:14
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:18
+#: rhodecode/templates/admin/settings/settings_hooks.html:36
+#: rhodecode/templates/admin/users/user_edit_emails.html:19
+#: rhodecode/templates/admin/users/user_edit_ips.html:22
+#: rhodecode/templates/data_table/_dt_elements.html:131
+#: rhodecode/templates/data_table/_dt_elements.html:159
+#: rhodecode/templates/data_table/_dt_elements.html:175
+#: rhodecode/templates/data_table/_dt_elements.html:191
+msgid "delete"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:20
+#: rhodecode/templates/admin/users/user_edit_emails.html:20
+#, python-format
+msgid "Confirm to delete this email: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:26
+#: rhodecode/templates/admin/users/user_edit_emails.html:26
+msgid "No additional emails specified"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:38
+#: rhodecode/templates/admin/users/user_edit_emails.html:38
+msgid "New email address"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:1
+msgid "Change your account password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:7
+msgid "Current password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:16
+#: rhodecode/templates/admin/users/user_edit_profile.html:69
+msgid "New password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:25
+msgid "Confirm new password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:9
+msgid "Change your avatar at"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:10
+#: rhodecode/templates/admin/users/user_edit_profile.html:9
+msgid "Using"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:11
+msgid "Avatars are disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:13
+msgid "Missing email, please update your user email address."
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:14
+#: rhodecode/templates/admin/users/user_edit_profile.html:15
+msgid "current IP"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:26
+msgid "Your user is in an external Source of Record; some details cannot be managed here"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:2
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:4
+msgid "Show closed pull requests"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:6
+msgid "Opened by me"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:15
+#, python-format
+msgid "Pull request #%s opened on %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:17
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:47
+#: rhodecode/templates/pullrequests/pullrequest_data.html:11
+#: rhodecode/templates/pullrequests/pullrequest_show.html:30
+#: rhodecode/templates/pullrequests/pullrequest_show.html:45
+msgid "Closed"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:25
+msgid "Confirm to delete this pull request"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:32
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:53
+msgid "Nothing here yet"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:36
+msgid "I participate in"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:44
+#: rhodecode/templates/pullrequests/pullrequest_data.html:8
+#, python-format
+msgid "Pull request #%s opened by %s on %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:1
+msgid "Repositories you are owner of"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:59
+#: rhodecode/templates/admin/my_account/my_account_watched.html:59
+#: rhodecode/templates/base/root.html:71
+#: rhodecode/templates/bookmarks/bookmarks.html:83
+#: rhodecode/templates/branches/branches.html:82
+#: rhodecode/templates/journal/journal.html:210
+#: rhodecode/templates/journal/journal.html:301
+#: rhodecode/templates/tags/tags.html:83
+msgid "No records found."
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_watched.html:1
+msgid "Repositories you are watching"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:5
-#: rhodecode/templates/admin/notifications/notifications.html:9
+#: rhodecode/templates/admin/notifications/notifications.html:12
 msgid "My Notifications"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/notifications.html:29
+#: rhodecode/templates/admin/notifications/notifications.html:32
 msgid "All"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/notifications.html:30
+#: rhodecode/templates/admin/notifications/notifications.html:33
 msgid "Comments"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/notifications.html:31
-msgid "Pull requests"
-msgstr ""
-
-#: rhodecode/templates/admin/notifications/notifications.html:35
+#: rhodecode/templates/admin/notifications/notifications.html:34
+#: rhodecode/templates/base/base.html:193
+msgid "Pull Requests"
+msgstr ""
+
+#: rhodecode/templates/admin/notifications/notifications.html:38
 msgid "Mark all read"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/notifications_data.html:39
+#: rhodecode/templates/admin/notifications/notifications_data.html:40
 msgid "No notifications here yet"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/show_notification.html:5
-#: rhodecode/templates/admin/notifications/show_notification.html:11
+#: rhodecode/templates/admin/notifications/show_notification.html:14
 msgid "Show notification"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/show_notification.html:9
-#: rhodecode/templates/base/base.html:251
+#: rhodecode/templates/admin/notifications/show_notification.html:12
+#: rhodecode/templates/base/base.html:281
 msgid "Notifications"
 msgstr ""
 
@@ -2236,1316 +2857,1613 @@
 msgid "Permissions administration"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:151
-#: rhodecode/templates/admin/repos/repo_edit.html:158
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88
-#: rhodecode/templates/admin/users/user_edit.html:150
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:129
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/base/base.html:76
+#: rhodecode/templates/admin/permissions/permissions.html:14
+#: rhodecode/templates/admin/permissions/permissions.html:37
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:55
+#: rhodecode/templates/admin/repos/repo_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:45
+#: rhodecode/templates/base/base.html:74
 msgid "Permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:24
-msgid "Default permissions"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:31
+#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/settings/settings.html:42
+msgid "Global"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:42
+msgid "IP whitelist"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:43
+msgid "Overview"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:7
 msgid "Anonymous access"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:49
+#: rhodecode/templates/admin/permissions/permissions_globals.html:13
+#, python-format
+msgid "Allow access to RhodeCode without need to log in. Anonymous users use %s user permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:26
 msgid "All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:50
-#: rhodecode/templates/admin/permissions/permissions.html:63
-#: rhodecode/templates/admin/permissions/permissions.html:77
+#: rhodecode/templates/admin/permissions/permissions_globals.html:27
+#: rhodecode/templates/admin/permissions/permissions_globals.html:40
+#: rhodecode/templates/admin/permissions/permissions_globals.html:54
 msgid "Overwrite existing settings"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:62
+#: rhodecode/templates/admin/permissions/permissions_globals.html:32
+#: rhodecode/templates/admin/repos/repo_add_base.html:41
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:42
+#: rhodecode/templates/data_table/_dt_elements.html:204
+#: rhodecode/templates/forks/fork.html:51
+msgid "Repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:39
 msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:69
+#: rhodecode/templates/admin/permissions/permissions_globals.html:46
+#: rhodecode/templates/data_table/_dt_elements.html:211
 msgid "User group"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:76
+#: rhodecode/templates/admin/permissions/permissions_globals.html:53
 msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on repository groups will be lost"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:83
+#: rhodecode/templates/admin/permissions/permissions_globals.html:60
 msgid "Repository creation"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:91
+#: rhodecode/templates/admin/permissions/permissions_globals.html:68
+msgid "Repository creation with group write access"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:72
+msgid "Write permission to repository groups allows creating repositories inside that group"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:77
 msgid "User group creation"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:99
+#: rhodecode/templates/admin/permissions/permissions_globals.html:85
 msgid "Repository forking"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:107
+#: rhodecode/templates/admin/permissions/permissions_globals.html:93
 msgid "Registration"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:115
+#: rhodecode/templates/admin/permissions/permissions_globals.html:101
 msgid "External auth account activation"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:133
-msgid "Default User Permissions"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:144
-#: rhodecode/templates/admin/users/user_edit.html:207
-msgid "Allowed IP addresses"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:158
-#: rhodecode/templates/admin/repos/repo_edit.html:340
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
-#: rhodecode/templates/admin/users/user_edit.html:175
-#: rhodecode/templates/admin/users/user_edit.html:220
-#: rhodecode/templates/admin/users_groups/users_groups.html:54
-#: rhodecode/templates/data_table/_dt_elements.html:122
-#: rhodecode/templates/data_table/_dt_elements.html:136
-msgid "delete"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:159
-#: rhodecode/templates/admin/users/user_edit.html:221
+#: rhodecode/templates/admin/permissions/permissions_ips.html:1
+msgid "Default ip whitelist for all users"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_ips.html:15
+#: rhodecode/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:165
-#: rhodecode/templates/admin/users/user_edit.html:227
+#: rhodecode/templates/admin/permissions/permissions_ips.html:21
+#: rhodecode/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:176
-#: rhodecode/templates/admin/users/user_edit.html:238
+#: rhodecode/templates/admin/permissions/permissions_ips.html:32
+#: rhodecode/templates/admin/users/user_edit_ips.html:42
 msgid "New ip address"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:184
-#: rhodecode/templates/admin/repos/repo_add_base.html:73
-#: rhodecode/templates/admin/repos/repo_edit.html:380
-#: rhodecode/templates/admin/users/user_edit.html:197
-#: rhodecode/templates/admin/users/user_edit.html:245
-msgid "Add"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add.html:12
-#: rhodecode/templates/admin/repos/repo_add.html:16
-#: rhodecode/templates/base/base.html:72 rhodecode/templates/base/base.html:86
-#: rhodecode/templates/base/base.html:114
-#: rhodecode/templates/base/base.html:273
-msgid "Repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add.html:19
-msgid "Add new"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:96
-#: rhodecode/templates/summary/summary.html:97
-msgid "Clone from"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:24
-#: rhodecode/templates/admin/repos/repo_edit.html:45
-msgid "Optional http[s] url from which repository should be cloned."
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:33
-#: rhodecode/templates/forks/fork.html:51
-msgid "Optionaly select a group to put this repository into."
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:42
-msgid "Type of repository to create."
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:47
-#: rhodecode/templates/admin/repos/repo_edit.html:59
-#: rhodecode/templates/forks/fork.html:38
-msgid "Landing revision"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:51
-#: rhodecode/templates/admin/repos/repo_edit.html:63
-#: rhodecode/templates/forks/fork.html:42
-msgid "Default revision for files page, downloads, whoosh and readme"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:60
-#: rhodecode/templates/admin/repos/repo_edit.html:72
-#: rhodecode/templates/forks/fork.html:60
-msgid "Keep it short and to the point. Use a README file for longer descriptions."
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:8
-msgid "Edit repository"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:12
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:11
-#: rhodecode/templates/base/base.html:79 rhodecode/templates/base/base.html:132
-#: rhodecode/templates/summary/summary.html:212
+#: rhodecode/templates/admin/permissions/permissions_perms.html:1
+msgid "Default user permissions overview"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:5
+msgid "Add repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:14
+#: rhodecode/templates/base/base.html:71 rhodecode/templates/base/base.html:90
+msgid "Repository groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:36
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:8
+#: rhodecode/templates/admin/user_groups/user_group_add.html:35
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:7
+msgid "Group name"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:54
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:26
+msgid "Group parent"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:63
+#: rhodecode/templates/admin/repos/repo_add_base.html:50
+msgid "Copy parent group permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:67
+#: rhodecode/templates/admin/repos/repo_add_base.html:54
+msgid "Copy permission set from parent repository group."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:5
+#, python-format
+msgid "%s Repository group settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:105
+msgid "Repository Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:24
+msgid "Add Child Group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:53
+#: rhodecode/templates/admin/repos/repo_edit.html:15
+#: rhodecode/templates/admin/repos/repo_edit.html:43
+#: rhodecode/templates/admin/settings/settings.html:14
+#: rhodecode/templates/admin/settings/settings.html:36
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:42
+#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:159
 msgid "Settings"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:36
-msgid "Non-changeable id"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:41
-msgid "Clone uri"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:54
-msgid "Optional select a group to put this repository into."
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:119
-msgid "Change owner of this repository."
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:177
-msgid "Advanced settings"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:180
-msgid "Statistics"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Reset current statistics"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Confirm to remove current statistics"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:187
-msgid "Fetched to rev"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:188
-msgid "Stats gathered"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:196
-msgid "Remote"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:200
-msgid "Pull changes from remote location"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:200
-msgid "Confirm to pull changes from remote side"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:211
-msgid "Cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:215
-msgid "Invalidate repository cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:215
-msgid "Confirm to invalidate repository cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:218
-msgid "Manually invalidate cache for this repository. On first access repository will be cached again"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:223
-msgid "List of cached values"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:226
-msgid "Prefix"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:227
-msgid "Key"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:228
-#: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:124
-#: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/admin/users_groups/users_group_add.html:41
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-#: rhodecode/templates/admin/users_groups/users_groups.html:39
-msgid "Active"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:243
-#: rhodecode/templates/base/base.html:290
-#: rhodecode/templates/base/base.html:291
-msgid "Public journal"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:249
-msgid "Remove from public journal"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:251
-msgid "Add to public journal"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:256
-msgid "All actions made on this repository will be accessible to everyone in public journal"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:263
-msgid "Locking"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
-msgid "Unlock locked repo"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
-msgid "Confirm to unlock repository"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:271
-msgid "Lock repo"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:271
-msgid "Confirm to lock repository"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:272
-msgid "Repository is not locked"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:277
-msgid "Force locking on repository. Works only when anonymous access is disabled"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:284
-msgid "Set as fork of"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:289
-msgid "Set"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:293
-msgid "Manually set this repository as a fork of another from the list"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:308
-msgid "Remove this repository"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:308
-msgid "Confirm to delete this repository"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:310
-#, python-format
-msgid "this repository has %s fork"
-msgid_plural "this repository has %s forks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:311
-msgid "Detach forks"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:312
-msgid "Delete forks"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:315
-msgid "This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems. If you need to fully delete it from file system please do it manually"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:329
-msgid "Extra fields"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:341
-#, python-format
-msgid "Confirm to delete this field: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:355
-msgid "New field key"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:363
-msgid "New field label"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:366
-msgid "Enter short label"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:372
-msgid "New field description"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:375
-msgid "Enter description of a field"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:3
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3
-msgid "none"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:4
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4
-msgid "read"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:5
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5
-msgid "write"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:6
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6
-msgid "admin"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:7
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7
-msgid "member"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-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:20
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35
-msgid "default"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:33
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:58
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:55
-msgid "revoke"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:83
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81
-msgid "Add another member"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repos.html:5
-msgid "Repositories administration"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repos.html:88
-#: rhodecode/templates/admin/users/user_edit_my_account.html:185
-#: rhodecode/templates/admin/users/users.html:109
-#: rhodecode/templates/bookmarks/bookmarks.html:76
-#: rhodecode/templates/branches/branches.html:75
-#: rhodecode/templates/journal/journal.html:206
-#: rhodecode/templates/journal/journal.html:296
-#: rhodecode/templates/tags/tags.html:76
-msgid "No records found."
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
-msgid "apply to children"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88
-msgid "Set or revoke permission to all children of that group, including non-private repositories and other groups"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
-#, python-format
-msgid "%s Group Dashboard"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:9
-msgid "Home"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:13
-msgid "with"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16
-#: rhodecode/templates/base/base.html:73 rhodecode/templates/base/base.html:89
-msgid "Repository groups"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13
-msgid "Add new repository group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56
-msgid "Group parent"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59
-msgid "save"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13
-#, python-format
-msgid "Edit repository group %s"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27
-msgid "Add child group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68
-msgid "Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
-msgid "Repository groups administration"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45
-msgid "Number of toplevel repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64
-#: rhodecode/templates/admin/users_groups/users_groups.html:48
-#: rhodecode/templates/changeset/changeset_file_comment.html:81
-#: rhodecode/templates/changeset/changeset_file_comment.html:189
-msgid "Edit"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65
-#: rhodecode/templates/admin/users_groups/users_groups.html:49
-#: rhodecode/templates/base/perms_summary.html:29
-#: rhodecode/templates/base/perms_summary.html:60
-#: rhodecode/templates/base/perms_summary.html:62
-#: rhodecode/templates/data_table/_dt_elements.html:116
-#: rhodecode/templates/data_table/_dt_elements.html:117
-#: rhodecode/templates/data_table/_dt_elements.html:130
-#: rhodecode/templates/data_table/_dt_elements.html:131
-msgid "edit"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:54
+#: rhodecode/templates/admin/repos/repo_edit.html:49
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:43
+#: rhodecode/templates/admin/users/user_edit.html:44
+msgid "Advanced"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:1
+#, python-format
+msgid "Repository Group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:6
+msgid "Top level repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:7
+msgid "Total repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:8
+msgid "Children groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_advanced.html:8
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+msgid "Created on"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:192
 #, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78
-msgid "There are no repository groups yet"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/hooks.html:5
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:25
+msgid "Delete this repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:7
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:8
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:7
+#: rhodecode/templates/base/perms_summary.html:14
+msgid "none"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:8
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:8
+#: rhodecode/templates/base/perms_summary.html:15
+msgid "read"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:9
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:10
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:9
+#: rhodecode/templates/base/perms_summary.html:16
+msgid "write"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:10
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:10
+#: rhodecode/templates/base/perms_summary.html:17
+msgid "admin"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:11
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:12
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:11
+msgid "user/user group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:28
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:45
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:24
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:37
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:28
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:45
+msgid "default"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:34
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:71
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:43
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:68
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:34
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:71
+msgid "revoke"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:47
+msgid "delegated admin"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:97
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:94
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:97
+msgid "Add new"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:103
+msgid "apply to children"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:107
+msgid "Both"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:108
+msgid "Set or revoke permission to all children of that group, including non-private repositories and other groups if selected."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:38
+msgid "Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:4
+#, python-format
+msgid "%s Repository group dashboard"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:12
+msgid "Home"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:16
+msgid "with"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:5
+msgid "Repository groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+msgid "repository groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:52
+msgid "Number of toplevel repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add.html:5
+msgid "Add repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:14
+msgid "Import existing repository ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:23
+#: rhodecode/templates/summary/summary.html:32
+msgid "Clone from"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:27
+msgid "Optional http[s] url from which repository should be cloned."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:36
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:76
+#: rhodecode/templates/forks/fork.html:45
+msgid "Keep it short and to the point. Use a README file for longer descriptions."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:45
+#: rhodecode/templates/forks/fork.html:55
+msgid "Optionaly select a group to put this repository into."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:63
+msgid "Type of repository to create."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:51
+#: rhodecode/templates/forks/fork.html:61
+msgid "Landing revision"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:72
+msgid "Default revision for files page, downloads, full text search index and readme generation"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:9
+#, python-format
+msgid "%s Creating repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:16
+msgid "Creating repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:30
+#, python-format
+msgid "Repository \"%(repo_name)s\" is beeing created, you will be redirected when this process is finished.repo_name"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:42
+msgid "We're sorry but error occured during this operation. Please check your RhodeCode server logs, or contact administrator."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:8
+#, python-format
+msgid "%s repository settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:52
+msgid "Extra fields"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:55
+msgid "Caches"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:58
+msgid "Remote"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:61
+#: rhodecode/templates/summary/statistics.html:11
+#: rhodecode/templates/summary/summary.html:178
+#: rhodecode/templates/summary/summary.html:179
+msgid "Statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:1
+#: rhodecode/templates/summary/summary.html:25
+msgid "Fork of"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:6
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:5
+msgid "Set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:10
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:9
+msgid "Manually set this repository as a fork of another from the list"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:24
+msgid "Public journal visibility"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:32
+msgid "Remove from public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:37
+msgid "Add to public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:43
+msgid "All actions made on this repository will be accessible to everyone in public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:49
+msgid "Change locking"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:56
+msgid "Confirm to unlock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:58
+msgid "Unlock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:64
+msgid "Confirm to lock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:66
+msgid "Lock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:68
+msgid "Repository is not locked"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:73
+msgid "Force locking on repository. Works only when anonymous access is disabled. Trigering a pull locks repository by user who pulled, only the same user can unlock by doing a push"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:83
+#: rhodecode/templates/data_table/_dt_elements.html:132
+#, python-format
+msgid "Confirm to delete this repository: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:85
+msgid "Delete this repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:88
+#, python-format
+msgid "this repository has %s fork"
+msgid_plural "this repository has %s forks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:89
+msgid "Detach forks"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:90
+msgid "Delete forks"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:94
+msgid "This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems. If you need to fully delete it from file system please do it manually"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Confirm to invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:7
+msgid "Manually invalidate cache for this repository. On first access repository will be cached again"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:12
+msgid "List of cached values"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:15
+msgid "Prefix"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:16
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:6
+msgid "Key"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:17
+#: rhodecode/templates/admin/user_groups/user_group_add.html:52
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:24
+#: rhodecode/templates/admin/user_groups/user_groups.html:53
+#: rhodecode/templates/admin/users/user_add.html:91
+#: rhodecode/templates/admin/users/user_edit_profile.html:105
+#: rhodecode/templates/admin/users/users.html:57
+msgid "Active"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:5
+msgid "Label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:19
+#, python-format
+msgid "Confirm to delete this field: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:33
+msgid "New field key"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:41
+msgid "New field label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:44
+msgid "Enter short label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:50
+msgid "New field description"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:53
+msgid "Enter description of a field"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:66
+msgid "Extra fields are disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:21
+msgid "private repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:3
+msgid "Remote url"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+msgid "Pull changes from remote location"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+msgid "Confirm to pull changes from remote side"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:14
+msgid "This repository does not have any remote url set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "Non-changeable id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "what is that ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:13
+msgid "URL by id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:14
+msgid ""
+"In case this repository is renamed or moved into another group the repository url changes.\n"
+"                               Using above url guarantees that this repository will allways be accessible under such url.\n"
+"                               Usefull for CI systems, or any other cases that you need to hardcode the url into 3rd party service."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:21
+msgid "Clone uri"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:27
+#: rhodecode/templates/base/perms_summary.html:43
+#: rhodecode/templates/base/perms_summary.html:79
+#: rhodecode/templates/base/perms_summary.html:81
+#: rhodecode/templates/data_table/_dt_elements.html:124
+#: rhodecode/templates/data_table/_dt_elements.html:125
+#: rhodecode/templates/data_table/_dt_elements.html:152
+#: rhodecode/templates/data_table/_dt_elements.html:153
+#: rhodecode/templates/data_table/_dt_elements.html:169
+#: rhodecode/templates/data_table/_dt_elements.html:185
+msgid "edit"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:30
+msgid "new value"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:37
+msgid "http[s] url used for doing remote pulls."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:46
+msgid "Optional select a group to put this repository into."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:55
+#: rhodecode/templates/forks/fork.html:65
+msgid "Default revision for files page, downloads, whoosh and readme"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:65
+msgid "Change owner of this repository."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:6
+msgid "Processed commits"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:7
+msgid "Processed progress"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Reset statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Confirm to remove current statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repos.html:5
+msgid "Repositories administration"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repos.html:54
+msgid "State"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings.html:5
 msgid "Settings administration"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/hooks.html:24
-msgid "Built in hooks - read only"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/hooks.html:40
-msgid "Custom hooks"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/hooks.html:56
-msgid "remove"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/hooks.html:89
-msgid "Failed to remove hook"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:26
-msgid "Remap and rescan repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:34
-msgid "Rescan option"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:40
-msgid "In case a repository was deleted from filesystem and there are leftovers in the database check this option to scan obsolete data in database and remove it."
+msgid "VCS"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:41
-msgid "Destroy old data"
+msgid "Remap and rescan"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:43
+msgid "Visual"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:45
+#: rhodecode/templates/admin/settings/settings_vcs.html:19
+msgid "Hooks"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:46
-msgid "Invalidate cache for all repositories during scan"
+msgid "Full text search"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:47
-msgid "Invalidate cache for all repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:49
-msgid "Rescan repositories location for new repositories. Also deletes obsolete if `destroy` flag is checked "
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:54
-msgid "Rescan repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:60
-msgid "Whoosh indexing"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:68
-msgid "Index build option"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:73
-msgid "Build from scratch"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:79
-msgid "Reindex"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:85
-msgid "Global application settings"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:94
+msgid "System Info"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:48
+msgid "License"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:4
+msgid "Email prefix"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:5
+msgid "RhodeCode email from"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:6
+msgid "Error email from"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:7
+msgid "Error email recipients"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:9
+msgid "SMTP server"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:10
+msgid "SMTP username"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:11
+msgid "SMTP password"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:12
+msgid "SMTP port"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:14
+msgid "SMTP use TLS"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:15
+msgid "SMTP use SSL"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:16
+msgid "SMTP auth"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:31
+msgid "Send test email to"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:39
+msgid "Send"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:8
 msgid "Site branding"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:103
+#: rhodecode/templates/admin/settings/settings_global.html:12
+msgid "Set a custom title for your RhodeCode Service."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:18
 msgid "HTTP authentication realm"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:112
+#: rhodecode/templates/admin/settings/settings_global.html:27
 msgid "Google Analytics code"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:120
-#: rhodecode/templates/admin/settings/settings.html:201
-#: rhodecode/templates/admin/settings/settings.html:296
+#: rhodecode/templates/admin/settings/settings_global.html:36
+msgid "ReCaptcha public key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:40
+msgid "Public key for reCaptcha system."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:46
+msgid "ReCaptcha private key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:50
+msgid "Private key for reCaptcha system. Setting this value will enable captcha on registration"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:55
+#: rhodecode/templates/admin/settings/settings_license.html:42
+#: rhodecode/templates/admin/settings/settings_vcs.html:80
+#: rhodecode/templates/admin/settings/settings_visual.html:115
 msgid "Save settings"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:127
-msgid "Visualisation settings"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:135
+#: rhodecode/templates/admin/settings/settings_hooks.html:1
+msgid "Built in Mercurial hooks - read only"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:15
+msgid "Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:19
+msgid "Custom hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:69
+msgid "Failed to remove hook"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:2
+msgid "Currently you're using a free license, which is limited to 20 users."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:9
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "RhodeCode version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "License token"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "No license token"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:13
+msgid "License issued to"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:14
+msgid "License issued on"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "License users limit"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "unlimited"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:16
+msgid "License expires on"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:33
+msgid "License key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:37
+msgid "Paste your RhodeCode license key into that textarea."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:52
+msgid "Please enter following lines (if yet not present) into [app:main] section of your .ini file. The token below is autogenerated."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:6
+msgid "Rescan option"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:11
+msgid "Destroy old data"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:13
+msgid "In case a repository was deleted from filesystem and it still exists in the database check this option to scan obsolete data in database and remove it."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:17
+msgid "Invalidate cache for all repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:19
+msgid "Each cache data for repositories will be cleaned with this option selected. Use this to reload data and clear cache keys."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:23
+msgid "Install GIT hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:25
+msgid "Verify if RhodeCodes GIT hooks are installed for each repository. Current hooks will be updated to latest version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:32
+msgid "Rescan Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:7
+msgid "Index build option"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:12
+msgid "Build from scratch"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:15
+msgid "This option completely reindex all the files within RhodeCode for proper fulltext search capabilities."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:21
+msgid "Reindex"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "check for updates"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:5
+msgid "Python version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:6
+msgid "Platform"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:7
+msgid "GIT version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:8
+msgid "GIT path"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Upgrade info endpoint"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Note: please make sure this server can access this url"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:14
+msgid "Checking for updates..."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:22
+msgid "Python packages"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:6
+msgid "Web"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:11
+msgid "Require SSL for vcs operations"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:13
+msgid "Activate to set RhodeCode to require SSL for pushing or pulling. If SSL certificate is missing it will return a HTTP Error 406: Not Acceptable."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:24
+msgid "Show repository size after push"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:28
+msgid "Log user push commands"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:32
+msgid "Log user pull commands"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:36
+msgid "Update repository after push (hg update)"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:42
+msgid "Mercurial Extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:47
+msgid "Enable largefiles extension"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:51
+msgid "Enable hgsubversion extension"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:53
+msgid "Requires hgsubversion library to be installed. Allows cloning remote SVN repositories and migrates them to Mercurial type."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:64
+msgid "Repositories location"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:69
+msgid "Click to unlock. You must restart RhodeCode in order to make this setting take effect."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:72
+msgid "Filesystem location where repositories should be stored. After changing this value a restart and rescan of the repository folder are required."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:8
 msgid "General"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:140
+#: rhodecode/templates/admin/settings/settings_visual.html:13
 msgid "Use repository extra fields"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:142
+#: rhodecode/templates/admin/settings/settings_visual.html:15
 msgid "Allows storing additional customized fields per repository."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:145
+#: rhodecode/templates/admin/settings/settings_visual.html:18
 msgid "Show RhodeCode version"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:147
-msgid "Shows or hides displayed version of RhodeCode in the footer"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:152
+#: rhodecode/templates/admin/settings/settings_visual.html:20
+msgid "Shows or hides a version number of RhodeCode displayed in the footer."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:24
+msgid "Use Gravatars in RhodeCode"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:30
+msgid ""
+"Gravatar url allows you to use other avatar server application.\n"
+"                                                        Following variables of the URL will be replaced accordingly.\n"
+"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {email}     user email,\n"
+"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
+"                                                        {size}      size of the image that is expected from the server application,\n"
+"                                                        {netloc}    network location/server host of running RhodeCode server"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:42
+msgid ""
+"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
+"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {user}   current user username,\n"
+"                                                        {netloc} network location/server host of running RhodeCode server,\n"
+"                                                        {repo}   full repository name,\n"
+"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:54
 msgid "Dashboard items"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:156
-msgid "Number of items displayed in lightweight dashboard before pagination is shown."
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:161
+#: rhodecode/templates/admin/settings/settings_visual.html:58
+msgid "Number of items displayed in the main page dashboard before pagination is shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:64
+msgid "Admin pages items"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:68
+msgid "Number of items displayed in the admin pages grids before pagination is shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:74
 msgid "Icons"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:166
+#: rhodecode/templates/admin/settings/settings_visual.html:79
 msgid "Show public repo icon on repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:170
+#: rhodecode/templates/admin/settings/settings_visual.html:83
 msgid "Show private repo icon on repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:172
-msgid "Show public/private icons next to repositories names"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:178
+#: rhodecode/templates/admin/settings/settings_visual.html:85
+msgid "Show public/private icons next to repositories names."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:91
 msgid "Meta-Tagging"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:183
-msgid "Stylify recognised metatags:"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:210
-msgid "VCS settings"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:219
-msgid "Web"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:224
-msgid "Require SSL for vcs operations"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:226
-msgid "RhodeCode will require SSL for pushing or pulling. If SSL is missing it will return HTTP Error 406: Not Acceptable"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:232
-msgid "Hooks"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:237
-msgid "Update repository after push (hg update)"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:241
-msgid "Show repository size after push"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:245
-msgid "Log user push commands"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:249
-msgid "Log user pull commands"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:253
-msgid "Advanced setup"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:258
-msgid "Mercurial Extensions"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:263
-msgid "Enable largefiles extension"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:267
-msgid "Enable hgsubversion extension"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:269
-msgid "Requires hgsubversion library installed. Allows cloning from svn remote locations"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:280
-msgid "Repositories location"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:285
-msgid "Click to unlock. You must restart RhodeCode in order to make this setting take effect."
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:286
-#: rhodecode/templates/base/base.html:141
-msgid "Unlock"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:288
-msgid "Location where repositories are stored. After changing this value a restart, and rescan is required"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:312
-msgid "Test Email"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:320
-msgid "Email to"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:328
-msgid "Send"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:334
-msgid "System Info and Packages"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:337
-#: rhodecode/templates/changelog/changelog.html:51
-msgid "Show"
+#: rhodecode/templates/admin/settings/settings_visual.html:96
+msgid "Stylify recognised meta tags:"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:110
+msgid "Parses meta tags from repository description field and turns them into colored tags."
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:5
+msgid "Add user group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:13
+#: rhodecode/templates/base/base.html:73 rhodecode/templates/base/base.html:93
+msgid "User groups"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:28
+msgid "Add User Group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:19
+msgid "Short, optional description for this user group."
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:5
+#, python-format
+msgid "%s user group settings"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:14
+msgid "User Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:44
+#: rhodecode/templates/admin/users/user_edit.html:45
+msgid "Default permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:6
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:32
+#: rhodecode/templates/admin/user_groups/user_groups.html:52
+msgid "Members"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:1
+#, python-format
+msgid "User Group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:19
+#: rhodecode/templates/data_table/_dt_elements.html:176
+#, python-format
+msgid "Confirm to delete this user group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:21
+msgid "Delete this user group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_members.html:15
+msgid "No members yet"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:40
+msgid "Chosen group members"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:43
+msgid "Remove all elements"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:53
+msgid "Available members"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:56
+msgid "Add all elements"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:5
+msgid "User groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+msgid "user groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_add.html:10
-#: rhodecode/templates/admin/users/user_edit.html:11
-#: rhodecode/templates/base/base.html:74
+#: rhodecode/templates/admin/users/user_add.html:13
+#: rhodecode/templates/admin/users/user_edit.html:14
+#: rhodecode/templates/base/base.html:72
 msgid "Users"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_add.html:12
-#: rhodecode/templates/admin/users/users.html:23
-msgid "Add new user"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_add.html:50
+#: rhodecode/templates/admin/users/user_add.html:15
+#: rhodecode/templates/admin/users/users.html:27
+msgid "Add User"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_add.html:53
 msgid "Password confirmation"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:5
-msgid "Edit user"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#, python-format
-msgid "Edit %s"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:34
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:10
-msgid "Change your avatar at"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:35
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:11
-msgid "Using"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:43
-msgid "API key"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:50
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:21
-msgid "Current IP"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:70
-msgid "LDAP DN"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:79
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:45
-msgid "New password"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:88
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:54
+#, python-format
+msgid "%s user settings"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:46
+msgid "Emails"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:47
+msgid "Ip whitelist"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:1
+#, python-format
+msgid "User: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_profile.html:51
+msgid "Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:9
+msgid "Last Login"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:10
+msgid "Member of User groups"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:160
+#, python-format
+msgid "Confirm to delete this user: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:23
+msgid "Delete this user"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_ips.html:8
+#, python-format
+msgid "Inherited from %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:8
+msgid "Change avatar at"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:12
+msgid "Missing email, please update this user email address."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:27
+#, python-format
+msgid "This user is in an external Source of Record (%s); some details cannot be managed here."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:60
+msgid "Name in Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:163
-msgid "Email addresses"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:176
-#, python-format
-msgid "Confirm to delete this email: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:190
-msgid "New email address"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:252
-msgid "My account"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:9
-msgid "My Account"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:35
-msgid "My permissions"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:54
-msgid "My repos"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:41
-msgid "My pull requests"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25
-msgid "API key - keep this in secret, change your password to generate new key"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4
-msgid "Show closed pull requests"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6
-msgid "Opened by me"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
-#, python-format
-msgid "Pull request #%s opened on %s"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45
-#: rhodecode/templates/pullrequests/pullrequest_data.html:11
-#: rhodecode/templates/pullrequests/pullrequest_show.html:26
-#: rhodecode/templates/pullrequests/pullrequest_show.html:42
-msgid "Closed"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23
-msgid "Confirm to delete this pull request"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51
-msgid "Nothing here yet"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34
-msgid "I participate in"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42
-#: rhodecode/templates/pullrequests/pullrequest_data.html:8
-#, python-format
-msgid "Pull request #%s opened by %s on %s"
-msgstr ""
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:9
+#: rhodecode/templates/admin/users/users.html:13
 msgid "users"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:80
+#: rhodecode/templates/admin/users/users.html:54
 msgid "Firstname"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:81
+#: rhodecode/templates/admin/users/users.html:55
 msgid "Lastname"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:82
+#: rhodecode/templates/admin/users/users.html:56
 msgid "Last login"
 msgstr ""
 
-#: rhodecode/templates/admin/users_groups/users_group_add.html:5
-msgid "Add user group"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_add.html:10
-#: rhodecode/templates/admin/users_groups/users_groups.html:11
-#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:92
-msgid "User groups"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_add.html:12
-#: rhodecode/templates/admin/users_groups/users_groups.html:26
-msgid "Add new user group"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:5
-msgid "Edit user group"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:11
-msgid "UserGroups"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:50
-#: rhodecode/templates/admin/users_groups/users_groups.html:38
-msgid "Members"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:58
-msgid "Chosen group members"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:61
-msgid "Remove all elements"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:75
-msgid "Available members"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:79
-msgid "Add all elements"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:109
-msgid "No members yet"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:117
-msgid "Global Permissions"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:5
-msgid "User groups administration"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:55
-#, python-format
-msgid "Confirm to delete this user group: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:62
-msgid "There are no user groups yet"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:42
+#: rhodecode/templates/admin/users/users.html:59
+msgid "Auth type"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:37
 #, python-format
 msgid "Server instance: %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:53
-msgid "Report a bug"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:119
-#: rhodecode/templates/data_table/_dt_elements.html:9
+#: rhodecode/templates/base/base.html:46
+msgid "Support"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:131
+msgid "Create fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:142
 #: rhodecode/templates/data_table/_dt_elements.html:11
-#: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/summary/summary.html:8
+#: rhodecode/templates/data_table/_dt_elements.html:15
+#: rhodecode/templates/summary/summary.html:11
 msgid "Summary"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:120
-#: rhodecode/templates/changelog/changelog.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:17
-#: rhodecode/templates/data_table/_dt_elements.html:19
-#: rhodecode/templates/data_table/_dt_elements.html:21
-msgid "Changelog"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:121
-#: rhodecode/templates/data_table/_dt_elements.html:25
-#: rhodecode/templates/data_table/_dt_elements.html:27
-#: rhodecode/templates/data_table/_dt_elements.html:29
-#: rhodecode/templates/files/files.html:12
-msgid "Files"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:123
-msgid "Switch To"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:129
-msgid "Options"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:135
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:137
-#: rhodecode/templates/base/base.html:310
-#: rhodecode/templates/search/search.html:14
-#: rhodecode/templates/search/search.html:54
-msgid "Search"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:143
-msgid "Lock"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:151
-msgid "Follow"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:152
-msgid "Unfollow"
-msgstr ""
-
+#: rhodecode/templates/changelog/changelog.html:17
+#: rhodecode/templates/data_table/_dt_elements.html:19
+#: rhodecode/templates/data_table/_dt_elements.html:23
+msgid "Changelog"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:144
+#: rhodecode/templates/data_table/_dt_elements.html:27
+#: rhodecode/templates/data_table/_dt_elements.html:31
+#: rhodecode/templates/files/files.html:15
+msgid "Files"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:146
+msgid "Switch To"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:153
 #: rhodecode/templates/base/base.html:155
-#: rhodecode/templates/data_table/_dt_elements.html:33
-#: rhodecode/templates/data_table/_dt_elements.html:35
-#: rhodecode/templates/data_table/_dt_elements.html:37
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/forks/fork.html:9
-msgid "Fork"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:157
-msgid "Create Pull Request"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:163
-#, python-format
-msgid "Show Pull Requests for %s"
+msgid "Options"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:163
-msgid "Pull Requests"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:200
-msgid "Not logged in"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:207
-msgid "Login to your account"
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:165
+#: rhodecode/templates/bookmarks/bookmarks.html:58
+#: rhodecode/templates/bookmarks/bookmarks_data.html:13
+#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/branches/branches_data.html:13
+#: rhodecode/templates/tags/tags.html:58
+#: rhodecode/templates/tags/tags_data.html:13
+msgid "Compare"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:167
+#: rhodecode/templates/base/base.html:334
+#: rhodecode/templates/search/search.html:17
+#: rhodecode/templates/search/search.html:57
+msgid "Search"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:171
+msgid "Unlock"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:173
+msgid "Lock"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:181
+msgid "Follow"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:182
+msgid "Unfollow"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:185
+#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/data_table/_dt_elements.html:39
+#: rhodecode/templates/forks/fork.html:12
+msgid "Fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:187
+msgid "Create Pull Request"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:193
+#, python-format
+msgid "Show Pull Requests for %s"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:230
+msgid "Not logged in"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:237
+msgid "Login to your account"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:260
 msgid "Forgot password ?"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:253
+#: rhodecode/templates/base/base.html:283
 msgid "Log Out"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:272
-msgid "Switch repository"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:284
+#: rhodecode/templates/base/base.html:308
 msgid "Show recent activity"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:285
-#: rhodecode/templates/journal/journal.html:4
-msgid "Journal"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:296
-msgid "Show public gists"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:301
-msgid "All public gists"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:303
-msgid "My public gists"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:304
-msgid "My private gists"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:309
+#: rhodecode/templates/journal/journal.html:4
+msgid "Journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:315
+msgid "Public journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:320
+msgid "Show public gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:321
+msgid "Gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:324
+msgid "Create new gist"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:325
+msgid "All public gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:327
+msgid "My public gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:328
+msgid "My private gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:333
 msgid "Search in repositories"
 msgstr ""
 
+#: rhodecode/templates/base/base.html:394
+msgid "No matches found"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:522
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:531
+msgid "Site-wide shortcuts"
+msgstr ""
+
 #: rhodecode/templates/base/default_perms_box.html:14
-msgid "Inherit default permissions"
-msgstr ""
-
-#: rhodecode/templates/base/default_perms_box.html:18
-#, python-format
-msgid "Select to inherit permissions from %s settings. With this selected below options does not apply."
-msgstr ""
-
-#: rhodecode/templates/base/default_perms_box.html:26
+msgid "Inherit from defaults"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:19
+#, python-format
+msgid "Select to inherit permissions from %s permissions settings, and default IP address whitelist."
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:28
 msgid "Create repositories"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.html:30
+#: rhodecode/templates/base/default_perms_box.html:33
 msgid "Select this option to allow repository creation for this user"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.html:35
+#: rhodecode/templates/base/default_perms_box.html:40
 msgid "Create user groups"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.html:39
+#: rhodecode/templates/base/default_perms_box.html:45
 msgid "Select this option to allow user group creation for this user"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.html:44
+#: rhodecode/templates/base/default_perms_box.html:52
 msgid "Fork repositories"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.html:48
+#: rhodecode/templates/base/default_perms_box.html:57
 msgid "Select this option to allow repository forking for this user"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:11
+#: rhodecode/templates/base/perms_summary.html:13
+msgid "show"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:22
 msgid "No permissions defined yet"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:19
-#: rhodecode/templates/base/perms_summary.html:38
+#: rhodecode/templates/base/perms_summary.html:30
+#: rhodecode/templates/base/perms_summary.html:54
 msgid "Permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:20
-#: rhodecode/templates/base/perms_summary.html:39
+#: rhodecode/templates/base/perms_summary.html:32
+#: rhodecode/templates/base/perms_summary.html:56
 msgid "Edit Permission"
 msgstr ""
 
-#: rhodecode/templates/base/root.html:44
-msgid "Add another comment"
-msgstr ""
-
-#: rhodecode/templates/base/root.html:45
-#: rhodecode/templates/data_table/_dt_elements.html:147
-msgid "Stop following this repository"
-msgstr ""
-
-#: rhodecode/templates/base/root.html:46
-msgid "Start following this repository"
+#: rhodecode/templates/base/perms_summary.html:90
+msgid "No permission defined"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:47
-msgid "Group"
+msgid "Add another comment"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:48
-msgid "members"
+#: rhodecode/templates/data_table/_dt_elements.html:216
+msgid "Stop following this repository"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:49
-#: rhodecode/templates/pullrequests/pullrequest.html:203
-msgid "Loading ..."
+msgid "Start following this repository"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:50
-msgid "loading ..."
+msgid "Group"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:51
-msgid "Search truncated"
+msgid "members"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:52
-msgid "No matching files"
+#: rhodecode/templates/pullrequests/pullrequest.html:202
+msgid "Loading ..."
 msgstr ""
 
 #: rhodecode/templates/base/root.html:53
-#: rhodecode/templates/changelog/changelog.html:45
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:31
-msgid "Open new pull request"
+msgid "loading ..."
 msgstr ""
 
 #: rhodecode/templates/base/root.html:54
-msgid "Open new pull request for selected changesets"
+msgid "Search truncated"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:55
-msgid "Show selected changesets __S -> __E"
+msgid "No matching files"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:56
-msgid "Show selected changeset __S"
+#: rhodecode/templates/changelog/changelog.html:51
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
+msgid "Open new pull request"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:57
-msgid "Selection link"
+msgid "Open new pull request for selected changesets"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:58
-#: rhodecode/templates/changeset/diff_block.html:8
-msgid "Collapse diff"
+msgid "Show selected changesets __S -> __E"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:59
-msgid "Expand diff"
+msgid "Show selected changeset __S"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:60
-msgid "Failed to revoke permission"
+msgid "Selection link"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:61
+#: rhodecode/templates/changeset/diff_block.html:8
+msgid "Collapse diff"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:62
+msgid "Expand diff"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:63
+msgid "Failed to revoke permission"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:64
 msgid "confirm to revoke permission for {0}: {1} ?"
 msgstr ""
 
+#: rhodecode/templates/base/root.html:68
+msgid "specify changeset"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr ""
 
-#: rhodecode/templates/bookmarks/bookmarks.html:26
-msgid "Compare bookmarks"
-msgstr ""
-
-#: rhodecode/templates/bookmarks/bookmarks.html:51
-#: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:50
-#: rhodecode/templates/branches/branches_data.html:8
+#: rhodecode/templates/bookmarks/bookmarks.html:29
+msgid "Compare Bookmarks"
+msgstr ""
+
+#: rhodecode/templates/bookmarks/bookmarks.html:55
+#: rhodecode/templates/bookmarks/bookmarks_data.html:10
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:10
 #: rhodecode/templates/changelog/changelog_summary_data.html:8
-#: rhodecode/templates/tags/tags.html:51
-#: rhodecode/templates/tags/tags_data.html:8
+#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/tags/tags_data.html:10
 msgid "Author"
 msgstr ""
 
-#: rhodecode/templates/bookmarks/bookmarks.html:52
-#: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:51
-#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/bookmarks/bookmarks.html:56
+#: rhodecode/templates/bookmarks/bookmarks_data.html:12
+#: rhodecode/templates/branches/branches.html:55
+#: rhodecode/templates/branches/branches_data.html:12
 #: rhodecode/templates/changelog/changelog_summary_data.html:5
-#: rhodecode/templates/tags/tags.html:52
-#: rhodecode/templates/tags/tags_data.html:9
+#: rhodecode/templates/tags/tags.html:56
+#: rhodecode/templates/tags/tags_data.html:12
 msgid "Revision"
 msgstr ""
 
-#: rhodecode/templates/bookmarks/bookmarks.html:54
-#: rhodecode/templates/bookmarks/bookmarks_data.html:10
-#: rhodecode/templates/branches/branches.html:53
-#: rhodecode/templates/branches/branches_data.html:10
-#: rhodecode/templates/tags/tags.html:54
-#: rhodecode/templates/tags/tags_data.html:10
-msgid "Compare"
-msgstr ""
-
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
 msgstr ""
 
-#: rhodecode/templates/branches/branches.html:26
-msgid "Compare branches"
+#: rhodecode/templates/branches/branches.html:29
+msgid "Compare Branches"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:6
@@ -3553,106 +4471,111 @@
 msgid "%s Changelog"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:19
+#: rhodecode/templates/changelog/changelog.html:21
 #, python-format
 msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changelog/changelog.html:39
+#: rhodecode/templates/changelog/changelog.html:43
 msgid "Clear selection"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:42
+#: rhodecode/templates/changelog/changelog.html:47
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:42
-msgid "Compare fork with parent"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:78
-#: rhodecode/templates/changelog/changelog_summary_data.html:28
+#: rhodecode/templates/changelog/changelog.html:49
+#, python-format
+msgid "Compare fork with Parent(%s)"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:56
+msgid "Show"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:82
+#: rhodecode/templates/changelog/changelog_summary_data.html:19
 #, python-format
 msgid ""
 "Changeset status: %s\n"
 "Click to open associated pull request #%s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:82
-#: rhodecode/templates/compare/compare_cs.html:11
+#: rhodecode/templates/changelog/changelog.html:86
+#: rhodecode/templates/compare/compare_cs.html:18
 #, python-format
 msgid "Changeset status: %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:104
-#: rhodecode/templates/summary/summary.html:403
-msgid "Show more"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:108
+#: rhodecode/templates/changelog/changelog.html:105
+#: rhodecode/templates/compare/compare_cs.html:36
+msgid "Expand commit message"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:114
 msgid "Changeset has comments"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:117
+#: rhodecode/templates/changelog/changelog.html:124
 #: rhodecode/templates/changelog/changelog_summary_data.html:50
-#: rhodecode/templates/changeset/changeset.html:107
-#: rhodecode/templates/changeset/changeset_range.html:86
+#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset_range.html:93
 #, python-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:123
+#: rhodecode/templates/changelog/changelog.html:130
 #: rhodecode/templates/changelog/changelog_summary_data.html:56
-#: rhodecode/templates/changeset/changeset.html:113
-#: rhodecode/templates/changeset/changeset_range.html:92
+#: rhodecode/templates/changeset/changeset.html:100
+#: rhodecode/templates/changeset/changeset_range.html:99
 #, python-format
 msgid "Tag %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:128
+#: rhodecode/templates/changelog/changelog.html:135
 #: rhodecode/templates/changelog/changelog_summary_data.html:61
-#: rhodecode/templates/changeset/changeset.html:117
-#: rhodecode/templates/changeset/changeset_range.html:96
+#: rhodecode/templates/changeset/changeset.html:105
+#: rhodecode/templates/changeset/changeset_range.html:103
 #, python-format
 msgid "Branch %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:294
+#: rhodecode/templates/changelog/changelog.html:299
 msgid "There are no changes yet"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:91
+#: rhodecode/templates/changeset/changeset.html:76
 msgid "Removed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:92
+#: rhodecode/templates/changeset/changeset.html:77
 msgid "Changed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset.html:78
 msgid "Added"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:8
 #: rhodecode/templates/changelog/changelog_details.html:9
 #: rhodecode/templates/changelog/changelog_details.html:10
-#: rhodecode/templates/changeset/changeset.html:95
-#: rhodecode/templates/changeset/changeset.html:96
-#: rhodecode/templates/changeset/changeset.html:97
+#: rhodecode/templates/changeset/changeset.html:80
+#: rhodecode/templates/changeset/changeset.html:81
+#: rhodecode/templates/changeset/changeset.html:82
 #, python-format
 msgid "Affected %s files"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:6
-#: rhodecode/templates/files/files_add.html:81
-#: rhodecode/templates/files/files_edit.html:64
+#: rhodecode/templates/files/files_add.html:65
+#: rhodecode/templates/files/files_delete.html:53
 msgid "Commit message"
 msgstr ""
 
@@ -3669,9 +4592,8 @@
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:89
-#: rhodecode/templates/files/files_add.html:40
-#: rhodecode/templates/files/files_browser.html:31
-msgid "Add new file"
+#: rhodecode/templates/files/files_ypjax.html:9
+msgid "Add New File"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:95
@@ -3687,37 +4609,37 @@
 msgid "%s Changeset"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:39
-msgid "No parents"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:49
-msgid "No children"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:62
+#: rhodecode/templates/changeset/changeset.html:37
+msgid "parent rev."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:43
+msgid "child rev."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:51
 #: rhodecode/templates/changeset/changeset_file_comment.html:41
-#: rhodecode/templates/changeset/changeset_range.html:44
+#: rhodecode/templates/changeset/changeset_range.html:51
 msgid "Changeset status"
 msgstr ""
 
+#: rhodecode/templates/changeset/changeset.html:55
+#: rhodecode/templates/changeset/diff_block.html:27
+#: rhodecode/templates/files/diff_2way.html:52
+msgid "Raw diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:58
+msgid "Patch diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:61
+#: rhodecode/templates/changeset/diff_block.html:30
+#: rhodecode/templates/files/diff_2way.html:55
+msgid "Download diff"
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset.html:67
-#: rhodecode/templates/changeset/diff_block.html:23
-#: rhodecode/templates/files/diff_2way.html:46
-msgid "Raw diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:68
-msgid "Patch diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:69
-#: rhodecode/templates/changeset/diff_block.html:24
-#: rhodecode/templates/files/diff_2way.html:47
-msgid "Download diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:73
 #: rhodecode/templates/changeset/changeset_file_comment.html:111
 #, python-format
 msgid "%d comment"
@@ -3725,7 +4647,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:73
+#: rhodecode/templates/changeset/changeset.html:67
 #: rhodecode/templates/changeset/changeset_file_comment.html:111
 #, python-format
 msgid "(%d inline)"
@@ -3733,45 +4655,50 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:103
-#: rhodecode/templates/changeset/changeset_range.html:82
+#: rhodecode/templates/changeset/changeset.html:88
+#: rhodecode/templates/changeset/changeset_range.html:89
 msgid "merge"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:126
-#: rhodecode/templates/compare/compare_diff.html:40
-#: rhodecode/templates/pullrequests/pullrequest_show.html:120
+#: rhodecode/templates/changeset/changeset.html:124
+#: rhodecode/templates/compare/compare_diff.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:160
 #, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:128
-#: rhodecode/templates/compare/compare_diff.html:42
-#: rhodecode/templates/pullrequests/pullrequest_show.html:122
+#: rhodecode/templates/changeset/changeset.html:126
+#: rhodecode/templates/compare/compare_diff.html:59
+#: rhodecode/templates/pullrequests/pullrequest_show.html:162
 #, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/pullrequests/pullrequest_show.html:138
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
 #: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Showing a huge diff might take some time and resources"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-#: rhodecode/templates/pullrequests/pullrequest_show.html:138
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
 #: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Show full diff"
 msgstr ""
 
+#: rhodecode/templates/changeset/changeset.html:214
+#: rhodecode/templates/changeset/changeset.html:251
+msgid "no revisions"
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset_file_comment.html:23
 #, python-format
 msgid "Vote on pull request #%s"
@@ -3815,21 +4742,17 @@
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:80
-#: rhodecode/templates/changeset/changeset_file_comment.html:188
+#: rhodecode/templates/changeset/changeset_file_comment.html:189
 msgid "Comment preview"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:88
-#: rhodecode/templates/changeset/changeset_file_comment.html:195
+#: rhodecode/templates/changeset/changeset_file_comment.html:196
 #: rhodecode/templates/email_templates/changeset_comment.html:11
 #: rhodecode/templates/email_templates/pull_request_comment.html:16
 msgid "Comment"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:89
-msgid "Cancel"
-msgstr ""
-
 #: rhodecode/templates/changeset/changeset_file_comment.html:96
 msgid "You need to be logged in to comment."
 msgstr ""
@@ -3850,7 +4773,7 @@
 msgid "Change changeset status"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:178
+#: rhodecode/templates/changeset/changeset_file_comment.html:179
 msgid "Close (when approved or rejected)"
 msgstr ""
 
@@ -3859,29 +4782,30 @@
 msgid "%s Changesets"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_range.html:52
+#: rhodecode/templates/changeset/changeset_range.html:59
 msgid "Files affected"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:21
-#: rhodecode/templates/files/diff_2way.html:44
+#: rhodecode/templates/files/diff_2way.html:46
 msgid "Show full diff for this file"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:22
-#: rhodecode/templates/files/diff_2way.html:45
+#: rhodecode/templates/changeset/diff_block.html:24
+#: rhodecode/templates/changeset/diff_block.html:68
+#: rhodecode/templates/files/diff_2way.html:49
 msgid "Show full side-by-side diff for this file"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:30
+#: rhodecode/templates/changeset/diff_block.html:38
 msgid "Show inline comments"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:54
+#: rhodecode/templates/changeset/diff_block.html:62
 msgid "Show file at latest version in this repo"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:55
+#: rhodecode/templates/changeset/diff_block.html:64
 msgid "Show file at initial version in this repo"
 msgstr ""
 
@@ -3889,77 +4813,79 @@
 msgid "No changesets"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_cs.html:32
+#: rhodecode/templates/compare/compare_cs.html:8
 msgid "Ancestor"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:5
+#: rhodecode/templates/compare/compare_diff.html:6
+#: rhodecode/templates/compare/compare_diff.html:8
 #, python-format
 msgid "%s Compare"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:9
+#: rhodecode/templates/compare/compare_diff.html:16
 msgid "Compare revisions"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:33
-#: rhodecode/templates/pullrequests/pullrequest_show.html:113
+#: rhodecode/templates/compare/compare_diff.html:36
+msgid "Swap"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:38
+msgid "Compare Revisions"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:45
+msgid "Compare revisions, branches, bookmarks or tags."
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:50
+#: rhodecode/templates/pullrequests/pullrequest_show.html:153
 #, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/compare/compare_diff.html:48
-#: rhodecode/templates/pullrequests/pullrequest_show.html:128
+#: rhodecode/templates/compare/compare_diff.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:168
 msgid "No files"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:54
-#: rhodecode/templates/summary/summary.html:69
+#: rhodecode/templates/data_table/_dt_elements.html:63
 msgid "Mercurial repository"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:56
-#: rhodecode/templates/summary/summary.html:72
+#: rhodecode/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#, python-format
-msgid "Fork of %s"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.html:88
+#: rhodecode/templates/data_table/_dt_elements.html:72
+msgid "Public repository"
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:82
+msgid "Repository creating in progress..."
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:95
-#: rhodecode/templates/data_table/_dt_elements.html:97
-#, python-format
-msgid "Subscribe to %s rss feed"
-msgstr ""
-
 #: rhodecode/templates/data_table/_dt_elements.html:103
 #: rhodecode/templates/data_table/_dt_elements.html:105
 #, python-format
+msgid "Subscribe to %s rss feed"
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:111
+#: rhodecode/templates/data_table/_dt_elements.html:113
+#, python-format
 msgid "Subscribe to %s atom feed"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:122
-#, python-format
-msgid "Confirm to delete this repository: %s"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.html:137
-#, python-format
-msgid "Confirm to delete this user: %s"
-msgstr ""
-
-#: rhodecode/templates/email_templates/changeset_comment.html:4
-#: rhodecode/templates/email_templates/pull_request.html:4
-#: rhodecode/templates/email_templates/pull_request_comment.html:4
-msgid "URL"
+#: rhodecode/templates/data_table/_dt_elements.html:141
+msgid "Creating"
 msgstr ""
 
 #: rhodecode/templates/email_templates/changeset_comment.html:6
@@ -3998,9 +4924,9 @@
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:8
-#: rhodecode/templates/pullrequests/pullrequest.html:34
+#: rhodecode/templates/pullrequests/pullrequest.html:31
 #: rhodecode/templates/pullrequests/pullrequest_data.html:14
-#: rhodecode/templates/pullrequests/pullrequest_show.html:24
+#: rhodecode/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr ""
 
@@ -4021,26 +4947,26 @@
 msgid "View this user here"
 msgstr ""
 
-#: rhodecode/templates/errors/error_document.html:55
+#: rhodecode/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr ""
 
-#: rhodecode/templates/files/diff_2way.html:16
+#: rhodecode/templates/files/diff_2way.html:15
 #, python-format
 msgid "%s File side-by-side diff"
 msgstr ""
 
-#: rhodecode/templates/files/diff_2way.html:20
-#: rhodecode/templates/files/file_diff.html:8
+#: rhodecode/templates/files/diff_2way.html:22
+#: rhodecode/templates/files/file_diff.html:11
 msgid "File diff"
 msgstr ""
 
-#: rhodecode/templates/files/diff_2way.html:48
+#: rhodecode/templates/files/diff_2way.html:58
 msgid "ignore white space"
 msgstr ""
 
-#: rhodecode/templates/files/diff_2way.html:49
+#: rhodecode/templates/files/diff_2way.html:59
 msgid "turn on edit mode"
 msgstr ""
 
@@ -4050,65 +4976,55 @@
 msgstr ""
 
 #: rhodecode/templates/files/files.html:4
-#: rhodecode/templates/files/files.html:76
+#: rhodecode/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr ""
 
-#: rhodecode/templates/files/files.html:30
-#: rhodecode/templates/files/files_add.html:33
-#: rhodecode/templates/files/files_edit.html:33
-msgid "Branch"
-msgstr ""
-
 #: rhodecode/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:21
-msgid "Add file"
+#: rhodecode/templates/files/files_add.html:25
+msgid "Add new file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:45
-msgid "File Name"
+#: rhodecode/templates/files/files_edit.html:43
+#: rhodecode/templates/files/files_ypjax.html:3
+msgid "Location"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:47
+msgid "Enter filename..."
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:49
-#: rhodecode/templates/files/files_add.html:58
+#: rhodecode/templates/files/files_add.html:53
 msgid "or"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:49
-#: rhodecode/templates/files/files_add.html:54
-msgid "Upload file"
+msgid "Upload File"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:53
+msgid "Create New File"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:58
-msgid "Create new file"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.html:63
-#: rhodecode/templates/files/files_edit.html:39
-#: rhodecode/templates/files/files_ypjax.html:3
-msgid "Location"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.html:67
-msgid "use / to separate directories"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.html:74
 msgid "New file mode"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:85
-#: rhodecode/templates/files/files_edit.html:68
+#: rhodecode/templates/files/files_add.html:69
+#: rhodecode/templates/files/files_delete.html:57
+#: rhodecode/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:13
-msgid "View"
+msgid "revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:14
@@ -4119,115 +5035,129 @@
 msgid "Next revision"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:23
+#: rhodecode/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:27
-msgid "Search file list"
-msgstr ""
-
-#: rhodecode/templates/files/files_browser.html:35
+#: rhodecode/templates/files/files_browser.html:25
+msgid "Search File List"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:48
+#: rhodecode/templates/files/files_browser.html:42
 msgid "Size"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:49
+#: rhodecode/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:50
+#: rhodecode/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:51
+#: rhodecode/templates/files/files_browser.html:45
 msgid "Last modified"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:52
+#: rhodecode/templates/files/files_browser.html:46
 msgid "Last committer"
 msgstr ""
 
+#: rhodecode/templates/files/files_delete.html:4
+#, python-format
+msgid "%s Files Delete"
+msgstr ""
+
+#: rhodecode/templates/files/files_delete.html:25
+#: rhodecode/templates/files/files_delete.html:45
+msgid "Delete file"
+msgstr ""
+
 #: rhodecode/templates/files/files_edit.html:4
 #, python-format
-msgid "%s Files Edit"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:21
+msgid "%s File Edit"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:25
 msgid "Edit file"
 msgstr ""
 
-#: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:23
-msgid "Show annotation"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:51
-#: rhodecode/templates/files/files_source.html:26
-msgid "Download as raw"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:54
+#: rhodecode/templates/files/files_edit.html:53
+#: rhodecode/templates/files/files_source.html:32
+msgid "Show Annotation"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:55
+#: rhodecode/templates/files/files_source.html:35
+msgid "Download as Raw"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:58
 msgid "Source"
 msgstr ""
 
-#: rhodecode/templates/files/files_edit.html:59
+#: rhodecode/templates/files/files_edit.html:63
 msgid "Editing file"
 msgstr ""
 
+#: rhodecode/templates/files/files_edit.html:68
+msgid "Commit Message"
+msgstr ""
+
 #: rhodecode/templates/files/files_history_box.html:2
-msgid "History"
-msgstr ""
-
-#: rhodecode/templates/files/files_history_box.html:9
-msgid "Diff to revision"
-msgstr ""
-
-#: rhodecode/templates/files/files_history_box.html:10
-msgid "Show at revision"
-msgstr ""
-
-#: rhodecode/templates/files/files_history_box.html:11
-msgid "Show full history"
-msgstr ""
-
-#: rhodecode/templates/files/files_history_box.html:16
 #, python-format
 msgid "%s author"
 msgid_plural "%s authors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/files/files_source.html:6
-msgid "Load file history"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.html:21
-msgid "Show source"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.html:29
-#, python-format
-msgid "Edit on branch:%s"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.html:31
-msgid "Edit on branch:?"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.html:31
+#: rhodecode/templates/files/files_source.html:7
+msgid "Diff to Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:8
+msgid "Show at Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:10
+msgid "Show Full History"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:11
+msgid "Show Authors"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:30
+msgid "Show Source"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:38
+#, python-format
+msgid "Edit on Branch:%s"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:41
+msgid "Editing binary files not allowed"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:44
 msgid "Editing files allowed only when on branch head revision"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:46
+#: rhodecode/templates/files/files_source.html:45
+msgid "Deleting files allowed only when on branch head revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:61
 #, python-format
 msgid "Binary file (%s)"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:55
+#: rhodecode/templates/files/files_source.html:71
 msgid "File is too big to display"
 msgstr ""
 
@@ -4235,11 +5165,11 @@
 msgid "annotation"
 msgstr ""
 
-#: rhodecode/templates/files/files_ypjax.html:15
-msgid "Go back"
-msgstr ""
-
-#: rhodecode/templates/files/files_ypjax.html:16
+#: rhodecode/templates/files/files_ypjax.html:23
+msgid "Go Back"
+msgstr ""
+
+#: rhodecode/templates/files/files_ypjax.html:24
 msgid "No files at given path"
 msgstr ""
 
@@ -4248,9 +5178,9 @@
 msgid "%s Followers"
 msgstr ""
 
-#: rhodecode/templates/followers/followers.html:9
-#: rhodecode/templates/summary/summary.html:183
-#: rhodecode/templates/summary/summary.html:184
+#: rhodecode/templates/followers/followers.html:12
+#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/templates/summary/summary.html:150
 msgid "Followers"
 msgstr ""
 
@@ -4260,35 +5190,35 @@
 
 #: rhodecode/templates/forks/fork.html:5
 #, python-format
-msgid "%s Fork"
-msgstr ""
-
-#: rhodecode/templates/forks/fork.html:28
+msgid "Fork repository %s"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:30
 msgid "Fork name"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:65
+#: rhodecode/templates/forks/fork.html:71
 msgid "Private"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:74
+#: rhodecode/templates/forks/fork.html:80
 msgid "Copy permissions"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:78
-msgid "Copy permissions from forked repository"
-msgstr ""
-
 #: rhodecode/templates/forks/fork.html:84
+msgid "Copy permissions from forked repository"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:90
 msgid "Update after clone"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:88
+#: rhodecode/templates/forks/fork.html:94
 msgid "Checkout source after making a clone"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:93
-msgid "Fork this repository"
+#: rhodecode/templates/forks/fork.html:99
+msgid "Fork this Repository"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.html:5
@@ -4296,9 +5226,9 @@
 msgid "%s Forks"
 msgstr ""
 
-#: rhodecode/templates/forks/forks.html:9
-#: rhodecode/templates/summary/summary.html:189
-#: rhodecode/templates/summary/summary.html:190
+#: rhodecode/templates/forks/forks.html:12
+#: rhodecode/templates/summary/summary.html:155
+#: rhodecode/templates/summary/summary.html:156
 msgid "Forks"
 msgstr ""
 
@@ -4310,25 +5240,16 @@
 msgid "There are no forks yet"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:21
+#: rhodecode/templates/journal/journal.html:24
 msgid "ATOM journal feed"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:22
+#: rhodecode/templates/journal/journal.html:25
 msgid "RSS journal feed"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:32
-msgid "Refresh"
-msgstr ""
-
-#: rhodecode/templates/journal/journal.html:35
-#: rhodecode/templates/journal/public_journal.html:24
-msgid "ATOM feed"
-msgstr ""
-
-#: rhodecode/templates/journal/journal.html:51
-msgid "Watched"
+#: rhodecode/templates/journal/journal.html:57
+msgid "My repos"
 msgstr ""
 
 #: rhodecode/templates/journal/journal_data.html:55
@@ -4336,15 +5257,15 @@
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.html:4
-#: rhodecode/templates/journal/public_journal.html:21
+#: rhodecode/templates/journal/public_journal.html:24
 msgid "Public Journal"
 msgstr ""
 
-#: rhodecode/templates/journal/public_journal.html:13
+#: rhodecode/templates/journal/public_journal.html:16
 msgid "ATOM public journal feed"
 msgstr ""
 
-#: rhodecode/templates/journal/public_journal.html:14
+#: rhodecode/templates/journal/public_journal.html:17
 msgid "RSS public journal feed"
 msgstr ""
 
@@ -4353,46 +5274,42 @@
 msgid "New pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:25
-msgid "Create new pull request"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.html:47
+#: rhodecode/templates/pullrequests/pullrequest.html:44
 msgid "Write a short description on this pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:53
+#: rhodecode/templates/pullrequests/pullrequest.html:50
 msgid "Changeset flow"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:60
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+#: rhodecode/templates/pullrequests/pullrequest.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:68
 msgid "Origin repository"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:85
-msgid "Send pull request"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.html:94
-#: rhodecode/templates/pullrequests/pullrequest_show.html:144
+#: rhodecode/templates/pullrequests/pullrequest.html:82
+msgid "Send Pull Request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:91
+#: rhodecode/templates/pullrequests/pullrequest_show.html:104
 msgid "Pull request reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:103
-#: rhodecode/templates/pullrequests/pullrequest_show.html:156
+#: rhodecode/templates/pullrequests/pullrequest.html:100
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
 msgid "owner"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:115
+#: rhodecode/templates/pullrequests/pullrequest.html:114
 msgid "Add reviewer to this pull request."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:129
+#: rhodecode/templates/pullrequests/pullrequest.html:128
 msgid "Detailed compare view"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:150
+#: rhodecode/templates/pullrequests/pullrequest.html:149
 msgid "Destination repository"
 msgstr ""
 
@@ -4401,78 +5318,74 @@
 msgid "%s Pull Request #%s"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:34
+#: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Review status"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:39
-#: rhodecode/templates/pullrequests/pullrequest_show.html:40
+#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:43
 msgid "Pull request status calculated from votes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:53
+#: rhodecode/templates/pullrequests/pullrequest_show.html:56
 msgid "Still not reviewed by"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:60
 #, python-format
 msgid "%d reviewer"
 msgid_plural "%d reviewers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:59
+#: rhodecode/templates/pullrequests/pullrequest_show.html:62
 msgid "Pull request was reviewed by all reviewers"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest_show.html:77
 #: rhodecode/templates/pullrequests/pullrequest_show.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:81
 msgid "Pull changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:96
-msgid "Created on"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:109
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
+msgid "reviewer"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:133
+msgid "Add or remove reviewer to this pull request."
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:137
+msgid "Save Changes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "Compare view"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:156
-msgid "reviewer"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:171
-msgid "Add or remove reviewer to this pull request."
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:175
-msgid "Save changes"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
 #, python-format
 msgid "%s Pull Requests"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:9
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
 #, python-format
 msgid "Pull requests from %s"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:11
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:14
 #, python-format
 msgid "Pull requests to %s"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:42
-#, python-format
-msgid "Instead, show pull requests to %s"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:44
-#, python-format
-msgid "Instead, show pull requests from %s"
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:38
+#, python-format
+msgid "Show pull requests to %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:40
+#, python-format
+msgid "Show pull requests from %s"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:50
@@ -4484,31 +5397,32 @@
 msgstr ""
 
 #: rhodecode/templates/search/search.html:6
-msgid "Search repository"
+#, python-format
+msgid "%s Search"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:8
-#: rhodecode/templates/search/search.html:16
+#: rhodecode/templates/search/search.html:19
 msgid "Search in all repositories"
 msgstr ""
 
-#: rhodecode/templates/search/search.html:50
+#: rhodecode/templates/search/search.html:53
 msgid "Search term"
 msgstr ""
 
-#: rhodecode/templates/search/search.html:62
-msgid "Search in"
-msgstr ""
-
 #: rhodecode/templates/search/search.html:65
+msgid "Search in"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:68
 msgid "File contents"
 msgstr ""
 
-#: rhodecode/templates/search/search.html:66
+#: rhodecode/templates/search/search.html:69
 msgid "Commit messages"
 msgstr ""
 
-#: rhodecode/templates/search/search.html:67
+#: rhodecode/templates/search/search.html:70
 msgid "File names"
 msgstr ""
 
@@ -4518,6 +5432,75 @@
 msgid "Permission denied"
 msgstr ""
 
+#: rhodecode/templates/summary/statistics.html:4
+#, python-format
+msgid "%s Statistics"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:19
+#: rhodecode/templates/summary/summary.html:42
+#, python-format
+msgid "%s ATOM feed"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:20
+#: rhodecode/templates/summary/summary.html:43
+#, python-format
+msgid "%s RSS feed"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:39
+#: rhodecode/templates/summary/summary.html:107
+#: rhodecode/templates/summary/summary.html:123
+msgid "Enable"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:42
+msgid "Stats gathered: "
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:91
+#: rhodecode/templates/summary/summary.html:354
+msgid "files"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:115
+#: rhodecode/templates/summary/summary.html:378
+msgid "Show more"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:392
+msgid "commits"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:393
+msgid "files added"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:394
+msgid "files changed"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:395
+msgid "files removed"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:397
+msgid "commit"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:398
+msgid "file added"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:399
+msgid "file changed"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:400
+msgid "file removed"
+msgstr ""
+
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
 msgid "%s Summary"
@@ -4525,171 +5508,86 @@
 
 #: rhodecode/templates/summary/summary.html:16
 #, python-format
-msgid "%s ATOM feed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:17
-#, python-format
-msgid "%s RSS feed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:62
-#, python-format
 msgid "Repository locked by %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:64
+#: rhodecode/templates/summary/summary.html:18
 msgid "Repository unlocked"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:83
-#, python-format
-msgid "Non changable ID %s"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:88
-msgid "Public"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:88
-#: rhodecode/templates/summary/summary.html:89
-msgid "Fork of"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:97
-msgid "Remote clone"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:117
-msgid "Contact"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:131
+#: rhodecode/templates/summary/summary.html:76
 msgid "Clone url"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:136
+#: rhodecode/templates/summary/summary.html:81
 msgid "Show by Name"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:137
+#: rhodecode/templates/summary/summary.html:82
 msgid "Show by ID"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:143
+#: rhodecode/templates/summary/summary.html:99
 msgid "Trending files"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:151
-#: rhodecode/templates/summary/summary.html:167
-msgid "Enable"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:159
+#: rhodecode/templates/summary/summary.html:115
 msgid "Download"
 msgstr ""
 
+#: rhodecode/templates/summary/summary.html:119
+msgid "There are no downloads yet"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:121
+msgid "Downloads are disabled for this repository"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:127
+msgid "Download as zip"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:132
+msgid "Check this to download archive with subrepos"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:132
+msgid "with subrepos"
+msgstr ""
+
 #: rhodecode/templates/summary/summary.html:163
-msgid "There are no downloads yet"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:165
-msgid "Downloads are disabled for this repository"
+msgid "Repository Size"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:170
-msgid "Download as zip"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:174
-msgid "Check this to download archive with subrepos"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:174
-msgid "with subrepos"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:197
-msgid "Repository Size"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:204
-#: rhodecode/templates/summary/summary.html:206
+#: rhodecode/templates/summary/summary.html:172
 msgid "Feed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:224
-msgid "Commit activity by day / author"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:232
-msgid "enable"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:235
-msgid "Stats gathered: "
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:256
+#: rhodecode/templates/summary/summary.html:193
 msgid "Latest changes"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:258
+#: rhodecode/templates/summary/summary.html:195
 msgid "Quick start"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:272
-#, python-format
-msgid "Readme file from revision %s"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:332
+#: rhodecode/templates/summary/summary.html:209
+#, python-format
+msgid "Readme file from revision %s:%s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:299
 #, python-format
 msgid "Download %s as %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:379
-msgid "files"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:689
-msgid "commits"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:690
-msgid "files added"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:691
-msgid "files changed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:692
-msgid "files removed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:694
-msgid "commit"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:695
-msgid "file added"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:696
-msgid "file changed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:697
-msgid "file removed"
-msgstr ""
-
 #: rhodecode/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr ""
 
-#: rhodecode/templates/tags/tags.html:26
+#: rhodecode/templates/tags/tags.html:29
 msgid "Compare tags"
 msgstr ""
 
--- a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po	Wed Jul 02 19:03:19 2014 -0400
+++ b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po	Wed Jul 02 19:03:20 2014 -0400
@@ -1,26 +1,32 @@
 # Translations template for RhodeCode.
-# Copyright (C) 2013 Marcin Kuzminski RhodeCode
+# Copyright (C) 2014 RhodeCode GmbH
 # This file is distributed under the same license as the RhodeCode project.
 # Translators:
 # ArcheR <aleclitvinov1980@gmail.com>, 2013
 # mokeev1995 <mokeev_andre@mail.ru>, 2013
 # Andrey Mivrenik <myvrenik@gmail.com>, 2013
+# ArcheR <aleclitvinov1980@gmail.com>, 2013
+# invision70 <invision70@gmail.com>, 2014
 # ivlevdenis <ivlevdenis.ru@gmail.com>, 2013
 # ivlevdenis <ivlevdenis.ru@gmail.com>, 2013
-# Михаил Жолобов <legal90@gmail.com>, 2013
+# Mikhail Zholobov <legal90@gmail.com>, 2013
+# Mikhail Zholobov <legal90@gmail.com>, 2013
 # mokeev1995 <mokeev_andre@mail.ru>, 2013
 # Andrey Mivrenik <myvrenik@gmail.com>, 2013
 # Ruslan Bekenev <furyinbox@gmail.com>, 2013
+# Ruslan Bekenev <furyinbox@gmail.com>, 2013
+# SkryabinD <skryabind@gmail.com>, 2014
+# softforwinxp <softforwinxp@gmail.com>, 2013
 # softforwinxp <softforwinxp@gmail.com>, 2013
 # zhmylove <zhmylove@narod.ru>, 2013
-# Михаил Жолобов <legal90@gmail.com>, 2013
+# Mikhail Zholobov <legal90@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: RhodeCode\n"
-"Report-Msgid-Bugs-To: marcin@maq.io\n"
-"POT-Creation-Date: 2013-06-05 19:55+0200\n"
-"PO-Revision-Date: 2013-06-07 13:54+0000\n"
-"Last-Translator: Михаил Жолобов <legal90@gmail.com>\n"
+"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
+"POT-Creation-Date: 2014-02-13 15:30+0100\n"
+"PO-Revision-Date: 2014-02-13 14:34+0000\n"
+"Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/RhodeCode/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,1014 +35,1146 @@
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: rhodecode/controllers/changelog.py:149
+#: rhodecode/controllers/changelog.py:88 rhodecode/controllers/compare.py:88
+#: rhodecode/controllers/pullrequests.py:263
+msgid "There are no changesets yet"
+msgstr "Ещё не было изменений"
+
+#: rhodecode/controllers/changelog.py:184
 msgid "All Branches"
 msgstr "Все ветки"
 
-#: rhodecode/controllers/changeset.py:84
+#: rhodecode/controllers/changelog.py:187
+msgid "(closed)"
+msgstr "(закрыто)"
+
+#: rhodecode/controllers/changeset.py:85
 msgid "Show white space"
 msgstr "Отображать пробелы"
 
-#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
+#: rhodecode/controllers/changeset.py:92 rhodecode/controllers/changeset.py:99
 msgid "Ignore white space"
 msgstr "Игнорировать пробелы"
 
-#: rhodecode/controllers/changeset.py:164
-#, python-format
-msgid "%s line context"
-msgstr "контекст строки %s"
-
-#: rhodecode/controllers/changeset.py:345
-#: rhodecode/controllers/pullrequests.py:478
+#: rhodecode/controllers/changeset.py:165
+#, python-format
+msgid "increase diff context to %(num)s lines"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:207 rhodecode/controllers/files.py:96
+#: rhodecode/controllers/files.py:119
+msgid "Such revision does not exist for this repository"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:353
+#: rhodecode/controllers/pullrequests.py:480
 #, python-format
 msgid "Status change -> %s"
 msgstr "Изменение статуса -> %s"
 
-#: rhodecode/controllers/changeset.py:376
+#: rhodecode/controllers/changeset.py:384
 msgid ""
 "Changing status on a changeset associated with a closed pull request is not "
 "allowed"
-msgstr "Изменение статуса в наборе изменений ассоциированных с закрытым запросом на внесение изменений не разрешён."
-
-#: rhodecode/controllers/compare.py:74
-#: rhodecode/controllers/pullrequests.py:256
-msgid "There are no changesets yet"
-msgstr "Ещё не было изменений"
-
-#: rhodecode/controllers/error.py:69
+msgstr "Нельзя редактировать статус изменений, связанных  с закрытыми pull-request'ами."
+
+#: rhodecode/controllers/compare.py:192 rhodecode/templates/base/root.html:67
+msgid "Select changeset"
+msgstr "Выбрать набор изменений"
+
+#: rhodecode/controllers/error.py:70
 msgid "Home page"
 msgstr "Домашняя страница"
 
-#: rhodecode/controllers/error.py:98
+#: rhodecode/controllers/error.py:99
 msgid ""
 "The request could not be understood by the server due to malformed syntax."
 msgstr "Запрос не распознан сервером из-за неправильного синтаксиса."
 
-#: rhodecode/controllers/error.py:101
+#: rhodecode/controllers/error.py:102
 msgid "Unauthorized access to resource"
 msgstr "Несанкционированный доступ к ресурсу"
 
-#: rhodecode/controllers/error.py:103
+#: rhodecode/controllers/error.py:104
 msgid "You don't have permission to view this page"
 msgstr "У вас нет прав для просмотра этой страницы"
 
-#: rhodecode/controllers/error.py:105
+#: rhodecode/controllers/error.py:106
 msgid "The resource could not be found"
 msgstr "Ресурс не найден"
 
-#: rhodecode/controllers/error.py:107
+#: rhodecode/controllers/error.py:108
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr "Сервер не может выполнить запрос, из-за неправильного условия в запросе"
 
-#: rhodecode/controllers/feed.py:52
+#: rhodecode/controllers/feed.py:53
 #, python-format
 msgid "Changes on %s repository"
 msgstr "Изменения в репозитарии %s"
 
-#: rhodecode/controllers/feed.py:53
+#: rhodecode/controllers/feed.py:54
 #, python-format
 msgid "%s %s feed"
 msgstr "Лента новостей %s %s"
 
-#: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/controllers/feed.py:87
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr "Изменения оказались слишком большими и были вырезаны..."
 
-#: rhodecode/controllers/feed.py:90
+#: rhodecode/controllers/feed.py:91
 #, python-format
 msgid "%s committed on %s"
-msgstr "%s сделал изменения в %s"
-
-#: rhodecode/controllers/files.py:89
+msgstr "%s выполнил commit в %s"
+
+#: rhodecode/controllers/files.py:90
 msgid "Click here to add new file"
 msgstr "Нажмите чтобы добавить новый файл"
 
-#: rhodecode/controllers/files.py:90
-#, python-format
-msgid "There are no files yet %s"
-msgstr "Отсутствуют файлы %s"
-
-#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339
+#: rhodecode/controllers/files.py:91
+#, python-format
+msgid "There are no files yet. %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:299 rhodecode/controllers/files.py:359
+#: rhodecode/controllers/files.py:426
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr "Репозиторий заблокировал %s в %s"
 
-#: rhodecode/controllers/files.py:283
+#: rhodecode/controllers/files.py:311
+msgid "You can only delete files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:322
+#, python-format
+msgid "Deleted file %s via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:344
+#, python-format
+msgid "Successfully deleted file %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:348 rhodecode/controllers/files.py:414
+#: rhodecode/controllers/files.py:496
+msgid "Error occurred during commit"
+msgstr "Во время фиксации изменений произошла ошибка"
+
+#: rhodecode/controllers/files.py:371
 msgid "You can only edit files with revision being a valid branch "
-msgstr ""
-
-#: rhodecode/controllers/files.py:297
+msgstr "Вы можете редактировать файлы только в редакции, связанной с существующей веткой"
+
+#: rhodecode/controllers/files.py:385
 #, python-format
 msgid "Edited file %s via RhodeCode"
 msgstr "Файл %s отредактирован с помощью RhodeCode"
 
-#: rhodecode/controllers/files.py:313
+#: rhodecode/controllers/files.py:401
 msgid "No changes"
 msgstr "Без изменений"
 
-#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394
+#: rhodecode/controllers/files.py:410 rhodecode/controllers/files.py:485
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Изменения применены в %s"
 
-#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405
-msgid "Error occurred during commit"
-msgstr "Во время фиксации произошла ошибка"
-
-#: rhodecode/controllers/files.py:351
+#: rhodecode/controllers/files.py:438
 msgid "Added file via RhodeCode"
 msgstr "Файл добавлен с помощью RhodeCode"
 
-#: rhodecode/controllers/files.py:368
+#: rhodecode/controllers/files.py:459
 msgid "No content"
 msgstr "Пусто"
 
-#: rhodecode/controllers/files.py:372
+#: rhodecode/controllers/files.py:463
 msgid "No filename"
 msgstr "Безымянный"
 
-#: rhodecode/controllers/files.py:397
+#: rhodecode/controllers/files.py:488
 msgid "Location must be relative path and must not contain .. in path"
 msgstr "Расположение должно быть относительным путем, и не должно содержать \"..\" в пути"
 
-#: rhodecode/controllers/files.py:431
+#: rhodecode/controllers/files.py:522
 msgid "Downloads disabled"
 msgstr "Возможность скачивать отключена"
 
-#: rhodecode/controllers/files.py:442
+#: rhodecode/controllers/files.py:533
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Неизвестная версия %s"
 
-#: rhodecode/controllers/files.py:444
+#: rhodecode/controllers/files.py:535
 msgid "Empty repository"
 msgstr "Пустой репозитарий"
 
-#: rhodecode/controllers/files.py:446
+#: rhodecode/controllers/files.py:537
 msgid "Unknown archive type"
 msgstr "Неизвестный тип архива"
 
-#: rhodecode/controllers/files.py:631
-#: rhodecode/templates/changeset/changeset_range.html:9
+#: rhodecode/controllers/files.py:773
+#: rhodecode/templates/changeset/changeset_range.html:12
 #: rhodecode/templates/email_templates/pull_request.html:12
-#: rhodecode/templates/pullrequests/pullrequest.html:124
+#: rhodecode/templates/pullrequests/pullrequest.html:123
 msgid "Changesets"
 msgstr "Набор изменений"
 
-#: rhodecode/controllers/files.py:632
-#: rhodecode/controllers/pullrequests.py:149
-#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682
+#: rhodecode/controllers/files.py:774
+#: rhodecode/controllers/pullrequests.py:158
+#: rhodecode/controllers/summary.py:74 rhodecode/model/scm.py:816
 #: rhodecode/templates/switch_to_list.html:3
-#: rhodecode/templates/branches/branches.html:10
+#: rhodecode/templates/branches/branches.html:13
 msgid "Branches"
 msgstr "Ветки"
 
-#: rhodecode/controllers/files.py:633
-#: rhodecode/controllers/pullrequests.py:150
-#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693
-#: rhodecode/templates/switch_to_list.html:15
-#: rhodecode/templates/tags/tags.html:10
+#: rhodecode/controllers/files.py:775
+#: rhodecode/controllers/pullrequests.py:159
+#: rhodecode/controllers/summary.py:75 rhodecode/model/scm.py:827
+#: rhodecode/templates/switch_to_list.html:25
+#: rhodecode/templates/tags/tags.html:13
 msgid "Tags"
 msgstr "Метки"
 
-#: rhodecode/controllers/forks.py:176
-#, python-format
-msgid "Forked repository %s as %s"
-msgstr "Сделан форк(копия) репозитория %s на %s"
-
-#: rhodecode/controllers/forks.py:190
+#: rhodecode/controllers/forks.py:189
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "Произошла ошибка во время создания форка репозитория %s"
 
-#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153
+#: rhodecode/controllers/home.py:81
+msgid "Groups"
+msgstr ""
+
+#: rhodecode/controllers/home.py:86
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:106
+#: rhodecode/templates/admin/repos/repo_add.html:15
+#: rhodecode/templates/admin/repos/repo_add.html:19
+#: rhodecode/templates/admin/users/user_edit_advanced.html:6
+#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:87
+#: rhodecode/templates/base/base.html:136
+#: rhodecode/templates/base/base.html:389
+#: rhodecode/templates/base/base.html:560
+msgid "Repositories"
+msgstr "Репозитории"
+
+#: rhodecode/controllers/home.py:127 rhodecode/templates/files/files.html:33
+#: rhodecode/templates/files/files_add.html:37
+#: rhodecode/templates/files/files_delete.html:37
+#: rhodecode/templates/files/files_edit.html:37
+msgid "Branch"
+msgstr "Ветка"
+
+#: rhodecode/controllers/home.py:133
+msgid "Tag"
+msgstr "Тэги"
+
+#: rhodecode/controllers/home.py:139
+msgid "Bookmark"
+msgstr "Закладки"
+
+#: rhodecode/controllers/journal.py:112 rhodecode/controllers/journal.py:155
 msgid "public journal"
 msgstr "общедоступный журнал"
 
-#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157
-#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/controllers/journal.py:116 rhodecode/controllers/journal.py:159
+#: rhodecode/templates/journal/journal.html:15
 msgid "journal"
 msgstr "журнал"
 
-#: rhodecode/controllers/login.py:138
+#: rhodecode/controllers/login.py:185 rhodecode/controllers/login.py:230
+msgid "bad captcha"
+msgstr ""
+
+#: rhodecode/controllers/login.py:191
 msgid "You have successfully registered into RhodeCode"
 msgstr "Регистрация в RhodeCode прошла успешно"
 
-#: rhodecode/controllers/login.py:159
+#: rhodecode/controllers/login.py:235
 msgid "Your password reset link was sent"
 msgstr "Ссылка для сброса пароля отправлена"
 
-#: rhodecode/controllers/login.py:179
+#: rhodecode/controllers/login.py:255
 msgid ""
 "Your password reset was successful, new password has been sent to your email"
 msgstr "Сброс пароля прошел успешно, новый пароль был отправлен на ваш email"
 
-#: rhodecode/controllers/pullrequests.py:136
-#: rhodecode/templates/changeset/changeset.html:10
-#: rhodecode/templates/email_templates/changeset_comment.html:8
+#: rhodecode/controllers/pullrequests.py:138
+#: rhodecode/templates/changeset/changeset.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:15
 msgid "Changeset"
 msgstr "Изменения"
 
-#: rhodecode/controllers/pullrequests.py:146
+#: rhodecode/controllers/pullrequests.py:155
 msgid "Special"
 msgstr "Специальный"
 
-#: rhodecode/controllers/pullrequests.py:147
+#: rhodecode/controllers/pullrequests.py:156
 msgid "Peer branches"
-msgstr ""
-
-#: rhodecode/controllers/pullrequests.py:148 rhodecode/model/scm.py:688
-#: rhodecode/templates/switch_to_list.html:28
-#: rhodecode/templates/bookmarks/bookmarks.html:10
+msgstr "Ветки участника"
+
+#: rhodecode/controllers/pullrequests.py:157 rhodecode/model/scm.py:822
+#: rhodecode/templates/switch_to_list.html:38
+#: rhodecode/templates/bookmarks/bookmarks.html:13
 msgid "Bookmarks"
 msgstr "Закладки"
 
-#: rhodecode/controllers/pullrequests.py:321
+#: rhodecode/controllers/pullrequests.py:328
 msgid "Pull request requires a title with min. 3 chars"
 msgstr "Заголовок Pull запроса должен быть не менее 3-х символов"
 
-#: rhodecode/controllers/pullrequests.py:323
-msgid "Error creating pull request"
-msgstr "Произошла ошибка при создании Pull запроса"
-
-#: rhodecode/controllers/pullrequests.py:343
+#: rhodecode/controllers/pullrequests.py:330
+#, python-format
+msgid "Error creating pull request: %s"
+msgstr "Ошибка при создании pull запроса: %s"
+
+#: rhodecode/controllers/pullrequests.py:352
 msgid "Successfully opened new pull request"
 msgstr "Pull запрос создан успешно"
 
-#: rhodecode/controllers/pullrequests.py:346
+#: rhodecode/controllers/pullrequests.py:355
 msgid "Error occurred during sending pull request"
 msgstr "Произошла ошибка при создании Pull запроса"
 
-#: rhodecode/controllers/pullrequests.py:385
+#: rhodecode/controllers/pullrequests.py:395
 msgid "Successfully deleted pull request"
 msgstr "Pull запрос успешно удалён"
 
-#: rhodecode/controllers/pullrequests.py:481
+#: rhodecode/controllers/pullrequests.py:483
 msgid "Closing with"
 msgstr "Закрытый с"
 
-#: rhodecode/controllers/pullrequests.py:518
+#: rhodecode/controllers/pullrequests.py:520
 msgid ""
 "Closing pull request on other statuses than rejected or approved forbidden"
-msgstr ""
-
-#: rhodecode/controllers/search.py:132
+msgstr "Закрытие pull-requst'а со статусом, отличным от 'Одобрено' или 'Отклонено' "
+
+#: rhodecode/controllers/search.py:133
 msgid "Invalid search query. Try quoting it."
 msgstr "Недопустимый поисковый запрос. Попробуйте заключить его в кавычки."
 
-#: rhodecode/controllers/search.py:137
+#: rhodecode/controllers/search.py:138
 msgid "There is no index to search in. Please run whoosh indexer"
-msgstr "Индексы отсутствуют. Пожалуйста, запустите индексатор."
-
-#: rhodecode/controllers/search.py:141
+msgstr "Индексы отсутствуют. Пожалуйста, запустите индексатор Whoosh."
+
+#: rhodecode/controllers/search.py:142
 msgid "An error occurred during this search operation"
 msgstr "Произошла ошибка при выполнении этого поиска"
 
-#: rhodecode/controllers/summary.py:182
+#: rhodecode/controllers/summary.py:201
 msgid "No data loaded yet"
 msgstr "Данные пока не загружены"
 
-#: rhodecode/controllers/summary.py:188
-#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/controllers/summary.py:204
+#: rhodecode/templates/summary/summary.html:105
 msgid "Statistics are disabled for this repository"
 msgstr "Статистические данные отключены для этого репозитария"
 
-#: rhodecode/controllers/admin/defaults.py:96
+#: rhodecode/controllers/admin/auth_settings.py:125
+msgid "Auth settings updated successfully"
+msgstr "Настройки авторизации успешно обновлены"
+
+#: rhodecode/controllers/admin/auth_settings.py:136
+msgid "error occurred during update of auth settings"
+msgstr "произошла ошибка при обновлении настроек авторизации"
+
+#: rhodecode/controllers/admin/defaults.py:95
 msgid "Default settings updated successfully"
 msgstr "Стандартные настройки успешно обновлены"
 
-#: rhodecode/controllers/admin/defaults.py:110
+#: rhodecode/controllers/admin/defaults.py:109
 msgid "Error occurred during update of defaults"
 msgstr "Произошла ошибка при обновлении стандартных настроек"
 
-#: rhodecode/controllers/admin/gists.py:56
+#: rhodecode/controllers/admin/gists.py:58
+#: rhodecode/controllers/admin/my_account.py:255
+#: rhodecode/controllers/admin/users.py:287
 msgid "forever"
 msgstr "навсегда"
 
-#: rhodecode/controllers/admin/gists.py:57
+#: rhodecode/controllers/admin/gists.py:59
+#: rhodecode/controllers/admin/my_account.py:256
+#: rhodecode/controllers/admin/users.py:288
 msgid "5 minutes"
 msgstr "5 минут"
 
-#: rhodecode/controllers/admin/gists.py:58
+#: rhodecode/controllers/admin/gists.py:60
+#: rhodecode/controllers/admin/my_account.py:257
+#: rhodecode/controllers/admin/users.py:289
 msgid "1 hour"
 msgstr "1 час"
 
-#: rhodecode/controllers/admin/gists.py:59
+#: rhodecode/controllers/admin/gists.py:61
+#: rhodecode/controllers/admin/my_account.py:258
+#: rhodecode/controllers/admin/users.py:290
 msgid "1 day"
 msgstr "1 день"
 
-#: rhodecode/controllers/admin/gists.py:60
+#: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/my_account.py:259
+#: rhodecode/controllers/admin/users.py:291
 msgid "1 month"
 msgstr "1 месяц"
 
-#: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/gists.py:66
+#: rhodecode/controllers/admin/my_account.py:261
+#: rhodecode/controllers/admin/users.py:293
 msgid "Lifetime"
 msgstr "Срок"
 
-#: rhodecode/controllers/admin/gists.py:127
+#: rhodecode/controllers/admin/gists.py:145
 msgid "Error occurred during gist creation"
 msgstr "Произошла ошибка во время создания сути"
 
-#: rhodecode/controllers/admin/gists.py:165
+#: rhodecode/controllers/admin/gists.py:183
 #, python-format
 msgid "Deleted gist %s"
 msgstr "Запись gist %s удалена"
 
-#: rhodecode/controllers/admin/ldap_settings.py:50
-msgid "BASE"
-msgstr "BASE"
-
-#: rhodecode/controllers/admin/ldap_settings.py:51
-msgid "ONELEVEL"
-msgstr "ONELEVEL"
-
-#: rhodecode/controllers/admin/ldap_settings.py:52
-msgid "SUBTREE"
-msgstr "SUBTREE"
-
-#: rhodecode/controllers/admin/ldap_settings.py:56
-msgid "NEVER"
-msgstr "NEVER"
-
-#: rhodecode/controllers/admin/ldap_settings.py:57
-msgid "ALLOW"
-msgstr "ALLOW"
-
-#: rhodecode/controllers/admin/ldap_settings.py:58
-msgid "TRY"
-msgstr "TRY"
-
-#: rhodecode/controllers/admin/ldap_settings.py:59
-msgid "DEMAND"
-msgstr "DEMAND"
-
-#: rhodecode/controllers/admin/ldap_settings.py:60
-msgid "HARD"
-msgstr "HARD"
-
-#: rhodecode/controllers/admin/ldap_settings.py:64
-msgid "No encryption"
-msgstr "Без шифрования"
-
-#: rhodecode/controllers/admin/ldap_settings.py:65
-msgid "LDAPS connection"
-msgstr "Соединение LDAPS"
-
-#: rhodecode/controllers/admin/ldap_settings.py:66
-msgid "START_TLS on LDAP connection"
-msgstr "Использовать START_TLS при соединении по LDAP"
-
-#: rhodecode/controllers/admin/ldap_settings.py:124
-msgid "LDAP settings updated successfully"
-msgstr "Настройки LDAP успешно обновлены"
-
-#: rhodecode/controllers/admin/ldap_settings.py:128
-msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
-msgstr "Невозможно использовать LDAP. Библиотека \"python-ldap\" недоступна."
-
-#: rhodecode/controllers/admin/ldap_settings.py:145
-msgid "Error occurred during update of ldap settings"
-msgstr "Произошла ошибка при обновлении настроек LDAP"
-
-#: rhodecode/controllers/admin/permissions.py:58
-#: rhodecode/controllers/admin/permissions.py:62
-#: rhodecode/controllers/admin/permissions.py:66
-msgid "None"
-msgstr "Ничего"
-
-#: rhodecode/controllers/admin/permissions.py:59
-#: rhodecode/controllers/admin/permissions.py:63
-#: rhodecode/controllers/admin/permissions.py:67
-msgid "Read"
-msgstr "Чтение"
+#: rhodecode/controllers/admin/gists.py:232
+msgid "unmodified"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:261
+msgid "Successfully updated gist content"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:266
+msgid "Successfully updated gist data"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:269
+#, python-format
+msgid "Error occurred during update of gist %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:68
+msgid "You can't edit this user since it's crucial for entire application"
+msgstr "Вы не можете изменить данные пользователя, поскольку это критично для работы всего приложения"
+
+#: rhodecode/controllers/admin/my_account.py:125
+msgid "Your account was updated successfully"
+msgstr "Ваша учетная запись успешно обновлена"
+
+#: rhodecode/controllers/admin/my_account.py:139
+#: rhodecode/controllers/admin/users.py:205
+#, python-format
+msgid "Error occurred during update of user %s"
+msgstr "Произошла ошибка при обновлении пользователя %s"
+
+#: rhodecode/controllers/admin/my_account.py:159
+msgid "Successfully updated password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:169
+msgid "Error occurred during update of user password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:211
+#: rhodecode/controllers/admin/users.py:430
+#, python-format
+msgid "Added email %s to user"
+msgstr "Пользователю добавлен E-mail %s"
+
+#: rhodecode/controllers/admin/my_account.py:217
+#: rhodecode/controllers/admin/users.py:436
+msgid "An error occurred during email saving"
+msgstr "Произошла ошибка при сохранении E-mail"
+
+#: rhodecode/controllers/admin/my_account.py:226
+#: rhodecode/controllers/admin/users.py:447
+msgid "Removed email from user"
+msgstr "E-mail пользователя удалён"
+
+#: rhodecode/controllers/admin/my_account.py:272
+#: rhodecode/controllers/admin/users.py:313
+msgid "Api key successfully created"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:284
+#: rhodecode/controllers/admin/users.py:329
+msgid "Api key successfully reset"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:288
+#: rhodecode/controllers/admin/users.py:333
+msgid "Api key successfully deleted"
+msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:60
 #: rhodecode/controllers/admin/permissions.py:64
 #: rhodecode/controllers/admin/permissions.py:68
-msgid "Write"
-msgstr "Запись"
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:104
+msgid "None"
+msgstr "Ничего"
 
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
 #: rhodecode/controllers/admin/permissions.py:69
-#: rhodecode/templates/admin/defaults/defaults.html:9
-#: rhodecode/templates/admin/ldap/ldap.html:9
-#: rhodecode/templates/admin/permissions/permissions.html:9
-#: rhodecode/templates/admin/repos/repo_add.html:10
-#: rhodecode/templates/admin/repos/repo_add.html:14
-#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:9
-#: rhodecode/templates/admin/users/user_add.html:8
-#: rhodecode/templates/admin/users/user_edit.html:9
-#: rhodecode/templates/admin/users/user_edit.html:133
-#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/admin/users_groups/users_group_add.html:8
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:9
-#: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:317
-#: rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:325
+msgid "Read"
+msgstr "Чтение"
+
+#: rhodecode/controllers/admin/permissions.py:62
+#: rhodecode/controllers/admin/permissions.py:66
+#: rhodecode/controllers/admin/permissions.py:70
+msgid "Write"
+msgstr "Запись"
+
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
+#: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/templates/admin/auth/auth_settings.html:12
+#: rhodecode/templates/admin/defaults/defaults.html:12
+#: rhodecode/templates/admin/permissions/permissions.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:17
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/settings/settings.html:12
+#: rhodecode/templates/admin/user_groups/user_group_add.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+#: rhodecode/templates/admin/users/user_add.html:11
+#: rhodecode/templates/admin/users/user_edit.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:114
+#: rhodecode/templates/admin/users/users.html:13
+#: rhodecode/templates/admin/users/users.html:58
+#: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:340
+#: rhodecode/templates/base/base.html:346
+#: rhodecode/templates/base/base.html:347
 msgid "Admin"
 msgstr "Администратор"
 
-#: rhodecode/controllers/admin/permissions.py:72
-#: rhodecode/controllers/admin/permissions.py:83
-#: rhodecode/controllers/admin/permissions.py:86
-#: rhodecode/controllers/admin/permissions.py:89
-#: rhodecode/controllers/admin/permissions.py:92
-msgid "Disabled"
-msgstr "Отключено"
-
 #: rhodecode/controllers/admin/permissions.py:74
-msgid "Allowed with manual account activation"
-msgstr "Разрешено, с ручной активацией учётной записи"
+#: rhodecode/controllers/admin/permissions.py:85
+#: rhodecode/controllers/admin/permissions.py:90
+#: rhodecode/controllers/admin/permissions.py:93
+#: rhodecode/controllers/admin/permissions.py:96
+#: rhodecode/controllers/admin/permissions.py:99
+msgid "Disabled"
+msgstr "Отключено"
 
 #: rhodecode/controllers/admin/permissions.py:76
+msgid "Allowed with manual account activation"
+msgstr "Разрешена, с ручной активацией учётной записи"
+
+#: rhodecode/controllers/admin/permissions.py:78
 msgid "Allowed with automatic account activation"
-msgstr "Разрешено, с автоматической активацией учётной записи"
-
-#: rhodecode/controllers/admin/permissions.py:79
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444
+msgstr "Разрешена, с автоматической активацией учётной записи"
+
+#: rhodecode/controllers/admin/permissions.py:81
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1485
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1542
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1564
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1603
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1655
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1682 rhodecode/model/db.py:1692
 msgid "Manual activation of external account"
 msgstr "Ручная активация внешней учетной записи"
 
-#: rhodecode/controllers/admin/permissions.py:80
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445
+#: rhodecode/controllers/admin/permissions.py:82
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1486
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1565
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1604
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1656
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1683 rhodecode/model/db.py:1693
 msgid "Automatic activation of external account"
 msgstr "Автоматическая активация внешней учетной записи"
 
-#: rhodecode/controllers/admin/permissions.py:84
-#: rhodecode/controllers/admin/permissions.py:87
-#: rhodecode/controllers/admin/permissions.py:90
-#: rhodecode/controllers/admin/permissions.py:93
+#: rhodecode/controllers/admin/permissions.py:86
+#: rhodecode/controllers/admin/permissions.py:89
+#: rhodecode/controllers/admin/permissions.py:94
+#: rhodecode/controllers/admin/permissions.py:97
+#: rhodecode/controllers/admin/permissions.py:100
 msgid "Enabled"
 msgstr "Включено"
 
-#: rhodecode/controllers/admin/permissions.py:138
-msgid "Default permissions updated successfully"
-msgstr "Стандартные привилегии успешно обновлены"
-
-#: rhodecode/controllers/admin/permissions.py:152
+#: rhodecode/controllers/admin/permissions.py:123
+msgid "Global permissions updated successfully"
+msgstr "Глобальные привилегии успешно обновлены"
+
+#: rhodecode/controllers/admin/permissions.py:137
 msgid "Error occurred during update of permissions"
-msgstr "Произошла ошибка во время обновления привелегий"
-
-#: rhodecode/controllers/admin/repos.py:128
-msgid "--REMOVE FORK--"
-msgstr "--УДАЛИТЬ ФОРК--"
-
-#: rhodecode/controllers/admin/repos.py:168
+msgstr "Произошла ошибка во время обновления привилегий"
+
+#: rhodecode/controllers/admin/repo_groups.py:184
+#, python-format
+msgid "Created repository group %s"
+msgstr "Создана новая группа репозиториев %s"
+
+#: rhodecode/controllers/admin/repo_groups.py:196
+#, python-format
+msgid "Error occurred during creation of repository group %s"
+msgstr "Произошла ошибка при создании группы репозиториев %s"
+
+#: rhodecode/controllers/admin/repo_groups.py:254
+#, python-format
+msgid "Updated repository group %s"
+msgstr "Группа репозиториев %s обновлена"
+
+#: rhodecode/controllers/admin/repo_groups.py:269
+#, python-format
+msgid "Error occurred during update of repository group %s"
+msgstr "Произошла ошибка при обновлении группы репозиториев %s"
+
+#: rhodecode/controllers/admin/repo_groups.py:287
+#, python-format
+msgid "This group contains %s repositores and cannot be deleted"
+msgstr "Данная группа содержит %s репозитариев и не может быть удалена"
+
+#: rhodecode/controllers/admin/repo_groups.py:294
+#, python-format
+msgid "This group contains %s subgroups and cannot be deleted"
+msgstr "Группа содержит в себе %s подгрупп и не может быть удалён"
+
+#: rhodecode/controllers/admin/repo_groups.py:300
+#, python-format
+msgid "Removed repository group %s"
+msgstr "Группа репозиториев %s удалена"
+
+#: rhodecode/controllers/admin/repo_groups.py:305
+#, python-format
+msgid "Error occurred during deletion of repository group %s"
+msgstr "Произошла ошибка при удалении группы репозиториев %s"
+
+#: rhodecode/controllers/admin/repo_groups.py:417
+#: rhodecode/controllers/admin/repo_groups.py:452
+#: rhodecode/controllers/admin/user_groups.py:335
+msgid "Cannot revoke permission for yourself as admin"
+msgstr "Администратор не может отозвать свои привелегии"
+
+#: rhodecode/controllers/admin/repo_groups.py:432
+msgid "Repository Group permissions updated"
+msgstr "Привилегии группы репозиториев обновлены"
+
+#: rhodecode/controllers/admin/repo_groups.py:469
+#: rhodecode/controllers/admin/repos.py:424
+#: rhodecode/controllers/admin/user_groups.py:347
+msgid "An error occurred during revoking of permission"
+msgstr "Произошла ошибка при отзыве привелегии"
+
+#: rhodecode/controllers/admin/repos.py:160
+#, python-format
+msgid "Error creating repository %s"
+msgstr "Произошла ошибка при создании репозитория %s"
+
+#: rhodecode/controllers/admin/repos.py:235
 #, python-format
 msgid "Created repository %s from %s"
 msgstr "Репозиторий %s создан из %s"
 
-#: rhodecode/controllers/admin/repos.py:174
+#: rhodecode/controllers/admin/repos.py:244
+#, python-format
+msgid "Forked repository %s as %s"
+msgstr "Сделан форк(копия) репозитория %s на %s"
+
+#: rhodecode/controllers/admin/repos.py:247
 #, python-format
 msgid "Created repository %s"
 msgstr "Репозиторий %s создан"
 
-#: rhodecode/controllers/admin/repos.py:197
-#, python-format
-msgid "Error creating repository %s"
-msgstr "Произошла ошибка при создании репозитория %s"
-
-#: rhodecode/controllers/admin/repos.py:270
+#: rhodecode/controllers/admin/repos.py:287
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "Репозитарий %s успешно обновлён"
 
-#: rhodecode/controllers/admin/repos.py:288
+#: rhodecode/controllers/admin/repos.py:305
 #, python-format
 msgid "Error occurred during update of repository %s"
 msgstr "Произошла ошибка во время обновления репозитория %s"
 
-#: rhodecode/controllers/admin/repos.py:315
+#: rhodecode/controllers/admin/repos.py:332
 #, python-format
 msgid "Detached %s forks"
 msgstr "Форки %s отсоединены"
 
-#: rhodecode/controllers/admin/repos.py:318
+#: rhodecode/controllers/admin/repos.py:335
 #, python-format
 msgid "Deleted %s forks"
 msgstr "Удалены форки репозитория %s"
 
-#: rhodecode/controllers/admin/repos.py:323
+#: rhodecode/controllers/admin/repos.py:340
 #, python-format
 msgid "Deleted repository %s"
 msgstr "Репозиторий %s удалён"
 
-#: rhodecode/controllers/admin/repos.py:326
+#: rhodecode/controllers/admin/repos.py:343
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr "Невозможно удалить %s, он всё-ещё содержит форки"
 
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/admin/repos.py:348
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "Произошла ошибка во время удаления %s"
 
-#: rhodecode/controllers/admin/repos.py:345
+#: rhodecode/controllers/admin/repos.py:400
 msgid "Repository permissions updated"
 msgstr "Привилегии репозитория обновлены"
 
-#: rhodecode/controllers/admin/repos.py:375
-#: rhodecode/controllers/admin/repos_groups.py:332
-#: rhodecode/controllers/admin/users_groups.py:312
-msgid "An error occurred during revoking of permission"
-msgstr "Произошла ошибка при отзыве привелегии"
-
-#: rhodecode/controllers/admin/repos.py:392
-msgid "An error occurred during deletion of repository stats"
-msgstr "Произошла ошибка при удалении статистики репозитория"
-
-#: rhodecode/controllers/admin/repos.py:409
-msgid "An error occurred during cache invalidation"
-msgstr "Произошла ошибка при очистке кэша"
-
-#: rhodecode/controllers/admin/repos.py:429
 #: rhodecode/controllers/admin/repos.py:456
+msgid "An error occurred during creation of field"
+msgstr "Произошла ошибка при создании поля"
+
+#: rhodecode/controllers/admin/repos.py:470
+msgid "An error occurred during removal of field"
+msgstr "Произошла ошибка при удалении поля"
+
+#: rhodecode/controllers/admin/repos.py:486
+msgid "-- Not a fork --"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:520
+msgid "Updated repository visibility in public journal"
+msgstr "Видимость репозитория в публичном журнале обновлена"
+
+#: rhodecode/controllers/admin/repos.py:524
+msgid "An error occurred during setting this repository in public journal"
+msgstr "Произошла ошибка при установке репозитария в общедоступный журнал"
+
+#: rhodecode/controllers/admin/repos.py:529 rhodecode/model/validators.py:359
+msgid "Token mismatch"
+msgstr "Несовпадение токенов"
+
+#: rhodecode/controllers/admin/repos.py:544
+msgid "Nothing"
+msgstr "Ничего"
+
+#: rhodecode/controllers/admin/repos.py:546
+#, python-format
+msgid "Marked repo %s as fork of %s"
+msgstr "Репозиторий %s отмечен как форк %s"
+
+#: rhodecode/controllers/admin/repos.py:553
+msgid "An error occurred during this operation"
+msgstr "Произошла ошибка при выполнении операции"
+
+#: rhodecode/controllers/admin/repos.py:569
+msgid "Locked repository"
+msgstr "Закрытый репозиторий"
+
+#: rhodecode/controllers/admin/repos.py:572
+msgid "Unlocked repository"
+msgstr "Открытый репозиторий"
+
+#: rhodecode/controllers/admin/repos.py:575
+#: rhodecode/controllers/admin/repos.py:602
 msgid "An error occurred during unlocking"
 msgstr "Произошла ошибка во время разблокирования"
 
-#: rhodecode/controllers/admin/repos.py:447
+#: rhodecode/controllers/admin/repos.py:593
 msgid "Unlocked"
 msgstr "Разблокировано"
 
-#: rhodecode/controllers/admin/repos.py:450
+#: rhodecode/controllers/admin/repos.py:596
 msgid "Locked"
 msgstr "Заблокировано"
 
-#: rhodecode/controllers/admin/repos.py:452
+#: rhodecode/controllers/admin/repos.py:598
 #, python-format
 msgid "Repository has been %s"
 msgstr "Репозиторий %s"
 
-#: rhodecode/controllers/admin/repos.py:476
-msgid "Updated repository visibility in public journal"
-msgstr "Видимость репозитория в публичном журнале обновлена"
-
-#: rhodecode/controllers/admin/repos.py:480
-msgid "An error occurred during setting this repository in public journal"
-msgstr "Произошла ошибка при установке репозитария в общедоступный журнал"
-
-#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302
-msgid "Token mismatch"
-msgstr "Несовпадение токенов"
-
-#: rhodecode/controllers/admin/repos.py:498
+#: rhodecode/controllers/admin/repos.py:616
+msgid "Cache invalidation successful"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:620
+msgid "An error occurred during cache invalidation"
+msgstr "Произошла ошибка при очистке кэша"
+
+#: rhodecode/controllers/admin/repos.py:635
 msgid "Pulled from remote location"
-msgstr "Обновлено из удалённого репозитория"
-
-#: rhodecode/controllers/admin/repos.py:501
+msgstr "Внесены изменения из удалённого репозитория"
+
+#: rhodecode/controllers/admin/repos.py:638
 msgid "An error occurred during pull from remote location"
-msgstr "Произошла ошибка при получении данных из удалённого репозитория "
-
-#: rhodecode/controllers/admin/repos.py:517
-msgid "Nothing"
-msgstr "Ничего"
-
-#: rhodecode/controllers/admin/repos.py:519
-#, python-format
-msgid "Marked repo %s as fork of %s"
-msgstr "Отмеченный репозиторий %s форком %s"
-
-#: rhodecode/controllers/admin/repos.py:523
-msgid "An error occurred during this operation"
-msgstr "Произошла ошибка при выполнении операции"
-
-#: rhodecode/controllers/admin/repos.py:562
-msgid "An error occurred during creation of field"
-msgstr "Произошла ошибка при создании поля"
-
-#: rhodecode/controllers/admin/repos.py:576
-msgid "An error occurred during removal of field"
-msgstr "Произошла ошибка при удалении поля"
-
-#: rhodecode/controllers/admin/repos_groups.py:147
-#, python-format
-msgid "Created repository group %s"
-msgstr "Создана новая группа репозиториев %s"
-
-#: rhodecode/controllers/admin/repos_groups.py:159
-#, python-format
-msgid "Error occurred during creation of repository group %s"
-msgstr "Произошла ошибка при создании группы репозиториев %s"
-
-#: rhodecode/controllers/admin/repos_groups.py:217
-#, python-format
-msgid "Updated repository group %s"
-msgstr "Группа репозиториев %s обновлена"
-
-#: rhodecode/controllers/admin/repos_groups.py:232
-#, python-format
-msgid "Error occurred during update of repository group %s"
-msgstr "Произошла ошибка при обновлении группы репозиториев %s"
-
-#: rhodecode/controllers/admin/repos_groups.py:250
-#, python-format
-msgid "This group contains %s repositores and cannot be deleted"
-msgstr "Данная группа содержит %s репозитариев и не может быть удалена"
-
-#: rhodecode/controllers/admin/repos_groups.py:257
-#, python-format
-msgid "This group contains %s subgroups and cannot be deleted"
-msgstr "Группа содержит в себе %s подгрупп и не может быть удалён"
-
-#: rhodecode/controllers/admin/repos_groups.py:263
-#, python-format
-msgid "Removed repository group %s"
-msgstr "Группа репозиториев %s удалена"
-
-#: rhodecode/controllers/admin/repos_groups.py:268
-#, python-format
-msgid "Error occurred during deletion of repository group %s"
-msgstr "Произошла ошибка при удалении группы репозиториев %s"
-
-#: rhodecode/controllers/admin/repos_groups.py:279
-#: rhodecode/controllers/admin/repos_groups.py:314
-#: rhodecode/controllers/admin/users_groups.py:300
-msgid "Cannot revoke permission for yourself as admin"
-msgstr "Администратор не может отозвать свои привелегии"
-
-#: rhodecode/controllers/admin/repos_groups.py:294
-msgid "Repository Group permissions updated"
-msgstr "Привилегии группы репозиториев обновлены"
-
-#: rhodecode/controllers/admin/settings.py:123
+msgstr "Произошла ошибка при внесении изменений из удалённого репозитория"
+
+#: rhodecode/controllers/admin/repos.py:671
+msgid "An error occurred during deletion of repository stats"
+msgstr "Произошла ошибка при удалении статистики репозитория"
+
+#: rhodecode/controllers/admin/settings.py:171
+msgid "Updated VCS settings"
+msgstr "Обновлены настройки VCS"
+
+#: rhodecode/controllers/admin/settings.py:175
+msgid ""
+"Unable to activate hgsubversion support. The \"hgsubversion\" library is "
+"missing"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:181
+#: rhodecode/controllers/admin/settings.py:273
+msgid "Error occurred during updating application settings"
+msgstr "Произошла ошибка при обновлении настроек приложения"
+
+#: rhodecode/controllers/admin/settings.py:214
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr "Репозитории успешно пересканированы, добавлено: %s ; удалено: %s"
 
-#: rhodecode/controllers/admin/settings.py:132
-msgid "Whoosh reindex task scheduled"
-msgstr "Запланирована переиндексация базы Whoosh"
-
-#: rhodecode/controllers/admin/settings.py:163
+#: rhodecode/controllers/admin/settings.py:269
 msgid "Updated application settings"
 msgstr "Обновленные параметры настройки приложения"
 
-#: rhodecode/controllers/admin/settings.py:167
-#: rhodecode/controllers/admin/settings.py:304
-msgid "Error occurred during updating application settings"
-msgstr "Произошла ошибка при обновлении настроек приложения"
-
-#: rhodecode/controllers/admin/settings.py:219
+#: rhodecode/controllers/admin/settings.py:326
 msgid "Updated visualisation settings"
 msgstr "Настройки визуализации обновлены"
 
-#: rhodecode/controllers/admin/settings.py:224
+#: rhodecode/controllers/admin/settings.py:331
 msgid "Error occurred during updating visualisation settings"
 msgstr "Произошла ошибка при обновлении настроек визуализации"
 
-#: rhodecode/controllers/admin/settings.py:300
-msgid "Updated VCS settings"
-msgstr "Обновлены настройки VCS"
-
-#: rhodecode/controllers/admin/settings.py:314
+#: rhodecode/controllers/admin/settings.py:357
+msgid "Please enter email address"
+msgstr "Пожалуйста, введите адрес электронной почты"
+
+#: rhodecode/controllers/admin/settings.py:369
+msgid "Send email task created"
+msgstr "Задача отправки Email создана"
+
+#: rhodecode/controllers/admin/settings.py:399
 msgid "Added new hook"
-msgstr "Добавлен новый хук"
-
-#: rhodecode/controllers/admin/settings.py:326
+msgstr "Добавлена новая ловушка"
+
+#: rhodecode/controllers/admin/settings.py:413
 msgid "Updated hooks"
-msgstr "Обновлённые хуки"
-
-#: rhodecode/controllers/admin/settings.py:330
+msgstr "Обновлённые ловушки"
+
+#: rhodecode/controllers/admin/settings.py:417
 msgid "Error occurred during hook creation"
 msgstr "произошла ошибка при создании хука"
 
-#: rhodecode/controllers/admin/settings.py:349
-msgid "Email task created"
-msgstr "Письмо поставлено в очередь"
-
-#: rhodecode/controllers/admin/settings.py:413
-msgid "You can't edit this user since it's crucial for entire application"
-msgstr "Вы не можете изменить данные пользователя, поскольку это критично для работы всего приложения"
-
-#: rhodecode/controllers/admin/settings.py:455
-msgid "Your account was updated successfully"
-msgstr "Ваша учетная запись успешно обновлена"
-
-#: rhodecode/controllers/admin/settings.py:470
-#: rhodecode/controllers/admin/users.py:198
-#, python-format
-msgid "Error occurred during update of user %s"
-msgstr "Произошла ошибка при обновлении пользователя %s"
-
-#: rhodecode/controllers/admin/users.py:130
+#: rhodecode/controllers/admin/settings.py:443
+msgid "Whoosh reindex task scheduled"
+msgstr "Запланирована переиндексация базы Whoosh"
+
+#: rhodecode/controllers/admin/settings.py:535
+msgid "Updated license information"
+msgstr "Обновленная информация о лицензии"
+
+#: rhodecode/controllers/admin/settings.py:540
+msgid "Error occurred during updating license info"
+msgstr "Во время обновления лицензии произошла ошибка"
+
+#: rhodecode/controllers/admin/settings.py:563
+#, python-format
+msgid ""
+"Your license will expire on %s, please contact support to extend your "
+"license."
+msgstr "Ваша лицензия истекает %s, пожалуйста, свяжитесь с поддержкой для продления вашей лицензии."
+
+#: rhodecode/controllers/admin/settings.py:566
+#, python-format
+msgid ""
+"Your license has expired on %s, please contact support to extend your "
+"license."
+msgstr "Ваша лицензия истекла %s, пожалуйста, свяжитесь с поддержкой для продления вашей лицензии."
+
+#: rhodecode/controllers/admin/settings.py:571
+msgid ""
+"Unexpected error while reading license key. Please make sure your license "
+"token and key are correct"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:148
+#, python-format
+msgid "Created user group %s"
+msgstr "Создана группа пользователей %s"
+
+#: rhodecode/controllers/admin/user_groups.py:159
+#, python-format
+msgid "Error occurred during creation of user group %s"
+msgstr "Произошла ошибка при создании группы пользователей %s"
+
+#: rhodecode/controllers/admin/user_groups.py:197
+#, python-format
+msgid "Updated user group %s"
+msgstr "Группа пользователей %s обновлена"
+
+#: rhodecode/controllers/admin/user_groups.py:219
+#, python-format
+msgid "Error occurred during update of user group %s"
+msgstr "Произошла ошибка при обновлении группы пользователей %s"
+
+#: rhodecode/controllers/admin/user_groups.py:237
+msgid "Successfully deleted user group"
+msgstr "Группа пользователей успешно удалена"
+
+#: rhodecode/controllers/admin/user_groups.py:242
+msgid "An error occurred during deletion of user group"
+msgstr "Произошла ошибка при удалении группы пользователей"
+
+#: rhodecode/controllers/admin/user_groups.py:309
+msgid "Target group cannot be the same"
+msgstr "Целевая группа не может быть такой же"
+
+#: rhodecode/controllers/admin/user_groups.py:315
+msgid "User Group permissions updated"
+msgstr "Привилегии группы пользователей обновлены"
+
+#: rhodecode/controllers/admin/user_groups.py:435
+#: rhodecode/controllers/admin/users.py:395
+msgid "Updated permissions"
+msgstr "Обновлены привилегии"
+
+#: rhodecode/controllers/admin/user_groups.py:439
+#: rhodecode/controllers/admin/users.py:399
+msgid "An error occurred during permissions saving"
+msgstr "Произошла ошибка при сохранении привилегий"
+
+#: rhodecode/controllers/admin/users.py:133
 #, python-format
 msgid "Created user %s"
 msgstr "Пользователь %s создан"
 
-#: rhodecode/controllers/admin/users.py:142
+#: rhodecode/controllers/admin/users.py:147
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr "Произошла ошибка при создании пользователя %s"
 
-#: rhodecode/controllers/admin/users.py:176
+#: rhodecode/controllers/admin/users.py:186
 msgid "User updated successfully"
 msgstr "Пользователь успешно обновлён"
 
-#: rhodecode/controllers/admin/users.py:214
+#: rhodecode/controllers/admin/users.py:221
 msgid "Successfully deleted user"
 msgstr "Пользователь успешно удалён"
 
-#: rhodecode/controllers/admin/users.py:219
+#: rhodecode/controllers/admin/users.py:226
 msgid "An error occurred during deletion of user"
 msgstr "Произошла ошибка при удалении пользователя"
 
-#: rhodecode/controllers/admin/users.py:234
+#: rhodecode/controllers/admin/users.py:240
+#: rhodecode/controllers/admin/users.py:258
+#: rhodecode/controllers/admin/users.py:281
+#: rhodecode/controllers/admin/users.py:306
+#: rhodecode/controllers/admin/users.py:319
+#: rhodecode/controllers/admin/users.py:343
+#: rhodecode/controllers/admin/users.py:406
+#: rhodecode/controllers/admin/users.py:453
 msgid "You can't edit this user"
 msgstr "Вы не можете редактировать данного пользователя"
 
-#: rhodecode/controllers/admin/users.py:293
-#: rhodecode/controllers/admin/users_groups.py:372
-msgid "Updated permissions"
-msgstr "Обновлены привилегии"
-
-#: rhodecode/controllers/admin/users.py:297
-#: rhodecode/controllers/admin/users_groups.py:376
-msgid "An error occurred during permissions saving"
-msgstr "Произошла ошибка при сохранении привилегий"
-
-#: rhodecode/controllers/admin/users.py:311
-#, python-format
-msgid "Added email %s to user"
-msgstr "Пользователю добавлен E-mail %s"
-
-#: rhodecode/controllers/admin/users.py:317
-msgid "An error occurred during email saving"
-msgstr "Произошла ошибка при сохранении E-mail"
-
-#: rhodecode/controllers/admin/users.py:327
-msgid "Removed email from user"
-msgstr "E-mail пользователя удалён"
-
-#: rhodecode/controllers/admin/users.py:340
-#, python-format
-msgid "Added ip %s to user"
-msgstr "Пользователю добавлен ip %s"
-
-#: rhodecode/controllers/admin/users.py:346
+#: rhodecode/controllers/admin/users.py:481
+#, python-format
+msgid "Added ip %s to user whitelist"
+msgstr "Добавлен IP %s в белый список пользователя"
+
+#: rhodecode/controllers/admin/users.py:487
 msgid "An error occurred during ip saving"
 msgstr "Произошла ошибка при сохранении IP"
 
-#: rhodecode/controllers/admin/users.py:358
-msgid "Removed ip from user"
-msgstr "Ip пользователя удалён"
-
-#: rhodecode/controllers/admin/users_groups.py:162
-#, python-format
-msgid "Created user group %s"
-msgstr "Создана группа пользователей %s"
-
-#: rhodecode/controllers/admin/users_groups.py:173
-#, python-format
-msgid "Error occurred during creation of user group %s"
-msgstr "Произошла ошибка при создании группы пользователей %s"
-
-#: rhodecode/controllers/admin/users_groups.py:210
-#, python-format
-msgid "Updated user group %s"
-msgstr "Группа пользователей %s обновлена"
-
-#: rhodecode/controllers/admin/users_groups.py:232
-#, python-format
-msgid "Error occurred during update of user group %s"
-msgstr "Произошла ошибка при обновлении группы пользователей %s"
-
-#: rhodecode/controllers/admin/users_groups.py:250
-msgid "Successfully deleted user group"
-msgstr "Группа пользователей успешно удалена"
-
-#: rhodecode/controllers/admin/users_groups.py:255
-msgid "An error occurred during deletion of user group"
-msgstr "Произошла ошибка при удалении группы пользователей"
-
-#: rhodecode/controllers/admin/users_groups.py:274
-msgid "Target group cannot be the same"
-msgstr "Целевая группа не может быть такой же"
-
-#: rhodecode/controllers/admin/users_groups.py:280
-msgid "User Group permissions updated"
-msgstr "Привилегии группы пользователей обновлены"
-
-#: rhodecode/lib/auth.py:544
+#: rhodecode/controllers/admin/users.py:501
+msgid "Removed ip address from user whitelist"
+msgstr "Удален IP %s из белого списка пользователя"
+
+#: rhodecode/lib/auth.py:746
 #, python-format
 msgid "IP %s not allowed"
 msgstr "IP %s заблокирован"
 
-#: rhodecode/lib/auth.py:593
+#: rhodecode/lib/auth.py:807
 msgid "You need to be a registered user to perform this action"
 msgstr "Вы должны быть зарегистрированным пользователем, чтобы выполнить это действие"
 
-#: rhodecode/lib/auth.py:634
+#: rhodecode/lib/auth.py:844
 msgid "You need to be a signed in to view this page"
 msgstr "Страница доступна только авторизованным пользователям"
 
-#: rhodecode/lib/diffs.py:66
+#: rhodecode/lib/diffs.py:64
 msgid "Binary file"
 msgstr "Двоичный файл"
 
-#: rhodecode/lib/diffs.py:82
+#: rhodecode/lib/diffs.py:80
 msgid ""
 "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr "Набор изменения оказался слишком большими и был урезан, используйте меню сравнения для показа результата сравнения"
 
-#: rhodecode/lib/diffs.py:92
+#: rhodecode/lib/diffs.py:90
 msgid "No changes detected"
 msgstr "Изменений не обнаружено"
 
-#: rhodecode/lib/helpers.py:539
-msgid "True"
-msgstr "Истина"
-
-#: rhodecode/lib/helpers.py:542
-msgid "False"
-msgstr "Ложь"
-
-#: rhodecode/lib/helpers.py:580
+#: rhodecode/lib/helpers.py:598
 #, python-format
 msgid "Deleted branch: %s"
 msgstr "Удалена ветка: %s"
 
-#: rhodecode/lib/helpers.py:583
+#: rhodecode/lib/helpers.py:601
 #, python-format
 msgid "Created tag: %s"
 msgstr "Создан тег: %s"
 
-#: rhodecode/lib/helpers.py:596
+#: rhodecode/lib/helpers.py:614
 msgid "Changeset not found"
 msgstr "Набор изменений не найден"
 
-#: rhodecode/lib/helpers.py:646
+#: rhodecode/lib/helpers.py:664
 #, python-format
 msgid "Show all combined changesets %s->%s"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:652
+msgstr "Показать отличия вместе %s->%s"
+
+#: rhodecode/lib/helpers.py:670
 msgid "compare view"
 msgstr "сравнение"
 
-#: rhodecode/lib/helpers.py:672
+#: rhodecode/lib/helpers.py:690
 msgid "and"
 msgstr "и"
 
-#: rhodecode/lib/helpers.py:673
+#: rhodecode/lib/helpers.py:691
 #, python-format
 msgid "%s more"
 msgstr "на %s больше"
 
-#: rhodecode/lib/helpers.py:674
-#: rhodecode/templates/changelog/changelog.html:53
+#: rhodecode/lib/helpers.py:692
+#: rhodecode/templates/changelog/changelog.html:58
 msgid "revisions"
 msgstr "версии"
 
-#: rhodecode/lib/helpers.py:698
+#: rhodecode/lib/helpers.py:716
 #, python-format
 msgid "fork name %s"
 msgstr "имя форка %s"
 
-#: rhodecode/lib/helpers.py:715
-#: rhodecode/templates/pullrequests/pullrequest_show.html:8
+#: rhodecode/lib/helpers.py:733
+#: rhodecode/templates/pullrequests/pullrequest_show.html:11
 #, python-format
 msgid "Pull request #%s"
 msgstr "Pull запрос #%s"
 
-#: rhodecode/lib/helpers.py:725
+#: rhodecode/lib/helpers.py:743
 msgid "[deleted] repository"
 msgstr "[удален] репозиторий"
 
-#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739
+#: rhodecode/lib/helpers.py:745 rhodecode/lib/helpers.py:757
 msgid "[created] repository"
 msgstr "[создан] репозиторий"
 
-#: rhodecode/lib/helpers.py:729
+#: rhodecode/lib/helpers.py:747
 msgid "[created] repository as fork"
 msgstr "[создан] репозиторий как форк"
 
-#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741
+#: rhodecode/lib/helpers.py:749 rhodecode/lib/helpers.py:759
 msgid "[forked] repository"
 msgstr "[форкнут] репозиторий"
 
-#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743
+#: rhodecode/lib/helpers.py:751 rhodecode/lib/helpers.py:761
 msgid "[updated] repository"
 msgstr "[обновлён] репозиторий"
 
-#: rhodecode/lib/helpers.py:735
+#: rhodecode/lib/helpers.py:753
 msgid "[downloaded] archive from repository"
 msgstr "[загружен] архив из репозитория"
 
-#: rhodecode/lib/helpers.py:737
+#: rhodecode/lib/helpers.py:755
 msgid "[delete] repository"
 msgstr "[удален] репозиторий"
 
-#: rhodecode/lib/helpers.py:745
+#: rhodecode/lib/helpers.py:763
 msgid "[created] user"
 msgstr "[создан] пользователь"
 
-#: rhodecode/lib/helpers.py:747
+#: rhodecode/lib/helpers.py:765
 msgid "[updated] user"
 msgstr "[обновлён] пользователь"
 
-#: rhodecode/lib/helpers.py:749
+#: rhodecode/lib/helpers.py:767
 msgid "[created] user group"
 msgstr "[создана] группа пользователей"
 
-#: rhodecode/lib/helpers.py:751
+#: rhodecode/lib/helpers.py:769
 msgid "[updated] user group"
 msgstr "[обновлена] группа пользователей"
 
-#: rhodecode/lib/helpers.py:753
+#: rhodecode/lib/helpers.py:771
 msgid "[commented] on revision in repository"
-msgstr "[комментировано] в версии в репозитории"
-
-#: rhodecode/lib/helpers.py:755
+msgstr "[комментарий] к ревизии в репозитории"
+
+#: rhodecode/lib/helpers.py:773
 msgid "[commented] on pull request for"
 msgstr "[прокомментировано] в запросе на внесение изменений для"
 
-#: rhodecode/lib/helpers.py:757
+#: rhodecode/lib/helpers.py:775
 msgid "[closed] pull request for"
-msgstr "[закрыт] Pull запрос"
-
-#: rhodecode/lib/helpers.py:759
+msgstr "[закрыт] Pull-request для"
+
+#: rhodecode/lib/helpers.py:777
 msgid "[pushed] into"
 msgstr "[отправлено] в"
 
-#: rhodecode/lib/helpers.py:761
+#: rhodecode/lib/helpers.py:779
 msgid "[committed via RhodeCode] into repository"
-msgstr "[commit с помощью RhodeCode] в репозитории"
-
-#: rhodecode/lib/helpers.py:763
+msgstr "[внесены изменения с помощью RhodeCode] в репозитории"
+
+#: rhodecode/lib/helpers.py:781
 msgid "[pulled from remote] into repository"
-msgstr "[получено из удаленного] в репозитории"
-
-#: rhodecode/lib/helpers.py:765
+msgstr "[внесены изменения из удалённого репозитория] в репозиторий"
+
+#: rhodecode/lib/helpers.py:783
 msgid "[pulled] from"
-msgstr "[получено] из"
-
-#: rhodecode/lib/helpers.py:767
+msgstr "[внесены изменения] из"
+
+#: rhodecode/lib/helpers.py:785
 msgid "[started following] repository"
 msgstr "[добавлен в наблюдения] репозиторий"
 
-#: rhodecode/lib/helpers.py:769
+#: rhodecode/lib/helpers.py:787
 msgid "[stopped following] repository"
 msgstr "[удалён из наблюдения] репозиторий"
 
-#: rhodecode/lib/helpers.py:1088
+#: rhodecode/lib/helpers.py:1102
 #, python-format
 msgid " and %s more"
 msgstr "и на %s больше"
 
-#: rhodecode/lib/helpers.py:1092
+#: rhodecode/lib/helpers.py:1106
 msgid "No Files"
 msgstr "Файлов нет"
 
-#: rhodecode/lib/helpers.py:1158
+#: rhodecode/lib/helpers.py:1172
 msgid "new file"
 msgstr "новый файл"
 
-#: rhodecode/lib/helpers.py:1161
+#: rhodecode/lib/helpers.py:1175
 msgid "mod"
 msgstr "mod"
 
-#: rhodecode/lib/helpers.py:1164
+#: rhodecode/lib/helpers.py:1178
 msgid "del"
 msgstr "удалить"
 
-#: rhodecode/lib/helpers.py:1167
+#: rhodecode/lib/helpers.py:1181
 msgid "rename"
 msgstr "переименовать"
 
-#: rhodecode/lib/helpers.py:1172
+#: rhodecode/lib/helpers.py:1186
 msgid "chmod"
 msgstr "chmod"
 
-#: rhodecode/lib/helpers.py:1404
+#: rhodecode/lib/helpers.py:1418
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from the"
 " filesystem please run the application again in order to rescan repositories"
-msgstr "Репозитарий %s не отображен в базе данных; возможно, он был создан или переименован из файловой системы. Пожалуйста, перезапустите приложение для сканирования репозитариев."
-
-#: rhodecode/lib/unionrepo.py:193
-msgid "cannot create new union repository"
-msgstr "не возможно создать объединённый репозитарий"
-
-#: rhodecode/lib/utils2.py:410
+msgstr "Репозиторий %s отсутствует в базе данных; возможно, он был создан или переименован из файловой системы. Пожалуйста, перезапустите приложение для сканирования репозиториев."
+
+#: rhodecode/lib/utils2.py:413
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
@@ -1044,7 +1182,7 @@
 msgstr[1] "%d лет"
 msgstr[2] "%d года"
 
-#: rhodecode/lib/utils2.py:411
+#: rhodecode/lib/utils2.py:414
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
@@ -1052,7 +1190,7 @@
 msgstr[1] "%d месяца"
 msgstr[2] "%d месяцев"
 
-#: rhodecode/lib/utils2.py:412
+#: rhodecode/lib/utils2.py:415
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -1060,7 +1198,7 @@
 msgstr[1] "%d дня"
 msgstr[2] "%d дней"
 
-#: rhodecode/lib/utils2.py:413
+#: rhodecode/lib/utils2.py:416
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1068,7 +1206,7 @@
 msgstr[1] "%d часов"
 msgstr[2] "%d часа"
 
-#: rhodecode/lib/utils2.py:414
+#: rhodecode/lib/utils2.py:417
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1076,7 +1214,7 @@
 msgstr[1] "%d минут"
 msgstr[2] "%d минуты"
 
-#: rhodecode/lib/utils2.py:415
+#: rhodecode/lib/utils2.py:418
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1084,248 +1222,463 @@
 msgstr[1] "%d секунды"
 msgstr[2] "%d секунды"
 
-#: rhodecode/lib/utils2.py:431
+#: rhodecode/lib/utils2.py:434
 #, python-format
 msgid "in %s"
 msgstr "в %s"
 
-#: rhodecode/lib/utils2.py:433
+#: rhodecode/lib/utils2.py:436
 #, python-format
 msgid "%s ago"
 msgstr "%s назад"
 
-#: rhodecode/lib/utils2.py:435
+#: rhodecode/lib/utils2.py:438
 #, python-format
 msgid "in %s and %s"
 msgstr "в %s и %s"
 
-#: rhodecode/lib/utils2.py:438
+#: rhodecode/lib/utils2.py:441
 #, python-format
 msgid "%s and %s ago"
 msgstr "%s и %s назад"
 
-#: rhodecode/lib/utils2.py:441
+#: rhodecode/lib/utils2.py:444
 msgid "just now"
 msgstr "прямо сейчас"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1454
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1511
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1572
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1622
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1649 rhodecode/model/db.py:1659
 msgid "Repository no access"
 msgstr "Репозитарий - нет доступа"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1455
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1573
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1623
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1650 rhodecode/model/db.py:1660
 msgid "Repository read access"
 msgstr "Репозитарий - доступ на чтение"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1456
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1574
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1651 rhodecode/model/db.py:1661
 msgid "Repository write access"
 msgstr "Репозитарий - доступ на запись"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1167
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1457
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1515
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1575
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1652 rhodecode/model/db.py:1662
 msgid "Repository admin access"
 msgstr "Репозитарий - администрирование"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308
 msgid "Repositories Group no access"
 msgstr "Группа Репозиториев - нет доступа"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309
 msgid "Repositories Group read access"
 msgstr "Группа Репозиториев - доступ на чтение"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310
 msgid "Repositories Group write access"
 msgstr "Группа Репозиториев - доступ на запись"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311
 msgid "Repositories Group admin access"
 msgstr "Группа Репозиториев - администрирование"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1452
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1509
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1510
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1570
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1620
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1647 rhodecode/model/db.py:1657
 msgid "RhodeCode Administrator"
 msgstr "Администратор RhodeCode "
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1475
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1532
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1554
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1593
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1670 rhodecode/model/db.py:1680
 msgid "Repository creation disabled"
 msgstr "Создание репозиториев отключено"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1476
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1555
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1594
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1671 rhodecode/model/db.py:1681
 msgid "Repository creation enabled"
 msgstr "Создание репозиториев включено"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1478
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1557
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1596
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1648
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1675 rhodecode/model/db.py:1685
 msgid "Repository forking disabled"
 msgstr "Возможность создавать форк репозитория отключена"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1479
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1537
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1558
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1597
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1649
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1676 rhodecode/model/db.py:1686
 msgid "Repository forking enabled"
 msgstr "Возможность создавать форк репозитория включена"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1403
 msgid "Register disabled"
 msgstr "Регистрация отключена"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1180
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1404
 msgid "Register new user with RhodeCode with manual activation"
 msgstr "Регистрация нового пользователя в RhodeCode с ручной активацией"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1183
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1407
 msgid "Register new user with RhodeCode with auto activation"
 msgstr "Регистрация нового пользователя в RhodeCode с автоматической активацией"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1651
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1980
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2040
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2062
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2101
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2154
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2200 rhodecode/model/db.py:2210
 msgid "Not Reviewed"
 msgstr "Не просмотрено"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1652
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1981
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2063
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2102
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2155
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2201 rhodecode/model/db.py:2211
 msgid "Approved"
 msgstr "Одобрено"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1653
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1982
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2064
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2103
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2156
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2202 rhodecode/model/db.py:2212
 msgid "Rejected"
 msgstr "Отклонено"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1654
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1983
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2044
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2065
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2104
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2157
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2203 rhodecode/model/db.py:2213
 msgid "Under Review"
 msgstr "На рассмотрении"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1300
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1357
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1358
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1379
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1471
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1498 rhodecode/model/db.py:1508
 msgid "top level"
 msgstr "верхний уровень"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1459
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1516
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1577
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1654 rhodecode/model/db.py:1664
 msgid "Repository group no access"
 msgstr "Группа Репозиториев - нет доступа"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1460
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1578
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1628
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1655 rhodecode/model/db.py:1665
 msgid "Repository group read access"
 msgstr "Группа репозиториев - доступ на чтение"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1461
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1579
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1629
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1656 rhodecode/model/db.py:1666
 msgid "Repository group write access"
 msgstr "Группа репозиториев - доступ на запись"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1462
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1520
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1580
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1630
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1657 rhodecode/model/db.py:1667
 msgid "Repository group admin access"
 msgstr "Группа репозиториев - администрирование"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1464
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1521
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1582
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1632
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1659 rhodecode/model/db.py:1669
 msgid "User group no access"
 msgstr "Группа пользователей - нет доступа"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1465
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1583
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1633
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1660 rhodecode/model/db.py:1670
 msgid "User group read access"
 msgstr "Группа пользователей - доступ на чтение"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1466
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1545
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1584
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1634
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1661 rhodecode/model/db.py:1671
 msgid "User group write access"
 msgstr "Группа пользователей - доступ на запись"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1467
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1525
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1546
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1585
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1635
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1662 rhodecode/model/db.py:1672
 msgid "User group admin access"
 msgstr "Группа пользователей - администрирование"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1469
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1526
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1548
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1587
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1637
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1664 rhodecode/model/db.py:1674
 msgid "Repository Group creation disabled"
 msgstr "Создание групп репозиториев отключено"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1470
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1528
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1549
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1588
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1638
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1665 rhodecode/model/db.py:1675
 msgid "Repository Group creation enabled"
 msgstr "Создание групп репозиториев включено"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1472
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1529
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1551
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1590
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1640
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1667 rhodecode/model/db.py:1677
 msgid "User Group creation disabled"
 msgstr "Создание групп пользователей отключено"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1473
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1552
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1591
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1641
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1668 rhodecode/model/db.py:1678
 msgid "User Group creation enabled"
 msgstr "Создание групп пользователей включено"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1481
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1560
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1599
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1651
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1678 rhodecode/model/db.py:1688
 msgid "Registration disabled"
 msgstr "Регистрация отключена"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1482
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1561
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1600
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1652
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1679 rhodecode/model/db.py:1689
 msgid "User Registration with manual account activation"
 msgstr "Регистрация пользователя с ручной активацией учётной записи"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1483
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1562
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1601
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1653
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1680 rhodecode/model/db.py:1690
 msgid "User Registration with automatic account activation"
 msgstr "Регистрация пользователя с автоматической активацией"
 
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1672 rhodecode/model/db.py:1682
+msgid ""
+"Repository creation enabled with write permission to a repository group"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1673 rhodecode/model/db.py:1683
+msgid ""
+"Repository creation disabled with write permission to a repository group"
+msgstr ""
+
 #: rhodecode/model/comment.py:75
 #, python-format
 msgid "on line %s"
@@ -1335,470 +1688,487 @@
 msgid "[Mention]"
 msgstr "[Упоминание]"
 
-#: rhodecode/model/forms.py:43
+#: rhodecode/model/forms.py:57
 msgid "Please enter a login"
 msgstr "Пожалуйста, введите логин"
 
-#: rhodecode/model/forms.py:44
+#: rhodecode/model/forms.py:58
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr "Введите значение длиной не менее %(min)i символов"
 
-#: rhodecode/model/forms.py:52
+#: rhodecode/model/forms.py:66
 msgid "Please enter a password"
 msgstr "Пожалуйста, введите пароль"
 
-#: rhodecode/model/forms.py:53
+#: rhodecode/model/forms.py:67
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr "Введите не менее %(min)i символов"
 
-#: rhodecode/model/notification.py:228
+#: rhodecode/model/forms.py:156
+msgid "Name must not contain only digits"
+msgstr ""
+
+#: rhodecode/model/notification.py:229
 #, python-format
 msgid "%(user)s commented on changeset at %(when)s"
 msgstr "%(user)s оставил комментарий к набору изменений %(when)s"
 
-#: rhodecode/model/notification.py:229
+#: rhodecode/model/notification.py:230
 #, python-format
 msgid "%(user)s sent message at %(when)s"
 msgstr "%(user)s отправил сообщение %(when)s"
 
-#: rhodecode/model/notification.py:230
+#: rhodecode/model/notification.py:231
 #, python-format
 msgid "%(user)s mentioned you at %(when)s"
 msgstr "%(user)s упомянул вас %(when)s"
 
-#: rhodecode/model/notification.py:231
+#: rhodecode/model/notification.py:232
 #, python-format
 msgid "%(user)s registered in RhodeCode at %(when)s"
 msgstr "%(user)s зарегистрировался в RhodeCode %(when)s"
 
-#: rhodecode/model/notification.py:232
+#: rhodecode/model/notification.py:233
 #, python-format
 msgid "%(user)s opened new pull request at %(when)s"
 msgstr "%(user)s открыл новый pull request %(when)s"
 
-#: rhodecode/model/notification.py:233
+#: rhodecode/model/notification.py:234
 #, python-format
 msgid "%(user)s commented on pull request at %(when)s"
 msgstr "%(user)s оставил комментарий к pull request %(when)s"
 
-#: rhodecode/model/pull_request.py:98
+#: rhodecode/model/pull_request.py:105
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr "%(user)s просит вас рассмотреть pull request #%(pr_id)s: %(pr_title)s"
 
-#: rhodecode/model/scm.py:674
+#: rhodecode/model/scm.py:808
 msgid "latest tip"
 msgstr "последняя версия"
 
-#: rhodecode/model/user.py:232
+#: rhodecode/model/user.py:196
 msgid "New user registration"
 msgstr "Регистрация нового пользователя"
 
-#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
+#: rhodecode/model/user.py:220 rhodecode/model/user.py:245
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr "Вы не можете редактировать пользователя, поскольку это критично для работы всего приложения"
 
-#: rhodecode/model/user.py:303
+#: rhodecode/model/user.py:268
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr "Вы не можете удалить пользователя, поскольку это критично для работы всего приложения"
 
-#: rhodecode/model/user.py:309
+#: rhodecode/model/user.py:274
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch owners "
 "or remove those repositories. %s"
 msgstr "пользователь \"%s\" является владельцем репозиториев %s и поэтому не может быть удалён. Смените владельца или удалите данные репозитории. %s"
 
-#: rhodecode/model/user.py:334
+#: rhodecode/model/user.py:302
 msgid "Password reset link"
 msgstr "Ссылка сброса пароля"
 
-#: rhodecode/model/user.py:366
+#: rhodecode/model/user.py:331
 msgid "Your new password"
 msgstr "Ваш новый пароль"
 
-#: rhodecode/model/user.py:367
+#: rhodecode/model/user.py:332
 #, python-format
 msgid "Your new RhodeCode password:%s"
 msgstr "Ваш новый пароль от RhodeCode: %s"
 
-#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39
+#: rhodecode/model/validators.py:82 rhodecode/model/validators.py:83
 msgid "Value cannot be an empty list"
 msgstr "Значение не может быть пустым списком"
 
-#: rhodecode/model/validators.py:85
+#: rhodecode/model/validators.py:120
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "Пользователь с именем \"%(username)s\" уже существует"
 
-#: rhodecode/model/validators.py:87
+#: rhodecode/model/validators.py:122
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr "Имя \"%(username)s\" отклонено"
 
-#: rhodecode/model/validators.py:89
+#: rhodecode/model/validators.py:124
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or "
 "dashes and must begin with alphanumeric character or underscore"
 msgstr "Имя пользователя может содержать только буквы, цифры, символы подчеркивания, точки и тире; а так же должно начинаться с буквы, цифры либо с символа подчеркивания"
 
-#: rhodecode/model/validators.py:117
+#: rhodecode/model/validators.py:151
+msgid "The input is not valid"
+msgstr ""
+
+#: rhodecode/model/validators.py:158
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr "Имя \"%(username)s\" недопустимо"
 
-#: rhodecode/model/validators.py:136
+#: rhodecode/model/validators.py:177
 msgid "Invalid user group name"
 msgstr "Неверное имя группы пользователей"
 
-#: rhodecode/model/validators.py:137
+#: rhodecode/model/validators.py:178
 #, python-format
 msgid "User group \"%(usergroup)s\" already exists"
 msgstr "Группа пользователей \"%(usergroup)s\" уже существует"
 
-#: rhodecode/model/validators.py:139
+#: rhodecode/model/validators.py:180
 msgid ""
 "user group name may only contain alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr "имя группы пользователей может содержать только буквы, цифры, символы подчеркивания, точки и тире; а так же должно начинаться с буквы или цифры"
 
-#: rhodecode/model/validators.py:177
+#: rhodecode/model/validators.py:218
 msgid "Cannot assign this group as parent"
 msgstr "Невозможно использовать эту группу как родителя"
 
-#: rhodecode/model/validators.py:178
+#: rhodecode/model/validators.py:219
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "Группа \"%(group_name)s\" уже существует"
 
-#: rhodecode/model/validators.py:180
+#: rhodecode/model/validators.py:221
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "Репозитарий с  именем \"%(group_name)s\" уже существует"
 
-#: rhodecode/model/validators.py:238
+#: rhodecode/model/validators.py:279
 msgid "Invalid characters (non-ascii) in password"
 msgstr "Недопустимые символы (не ascii) в пароле"
 
-#: rhodecode/model/validators.py:253
+#: rhodecode/model/validators.py:294
+msgid "Invalid old password"
+msgstr ""
+
+#: rhodecode/model/validators.py:310
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: rhodecode/model/validators.py:270
+#: rhodecode/model/validators.py:327
 msgid "invalid password"
 msgstr "неверный пароль"
 
-#: rhodecode/model/validators.py:271
+#: rhodecode/model/validators.py:328
 msgid "invalid user name"
 msgstr "неверное имя пользователя"
 
-#: rhodecode/model/validators.py:272
+#: rhodecode/model/validators.py:329
 msgid "Your account is disabled"
 msgstr "Ваш аккаунт выключен"
 
-#: rhodecode/model/validators.py:316
+#: rhodecode/model/validators.py:373
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr "Имя репозитория %(repo)s запрещено"
 
-#: rhodecode/model/validators.py:318
+#: rhodecode/model/validators.py:375
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "Репозитарий %(repo)s уже существует"
 
-#: rhodecode/model/validators.py:319
+#: rhodecode/model/validators.py:376
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "Репозитарий \"%(repo)s\" уже существует в группе \"%(group)s\""
 
-#: rhodecode/model/validators.py:321
+#: rhodecode/model/validators.py:378
 #, python-format
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr "Группа репозиториев \"%(repo)s\" уже существует"
 
-#: rhodecode/model/validators.py:438
+#: rhodecode/model/validators.py:493
 msgid "invalid clone url"
 msgstr "неверный URL"
 
-#: rhodecode/model/validators.py:439
+#: rhodecode/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr "Неверная ссылка клонирования, предоставьте действительную ссылку для клонирования - http(s)/svn+http(s)."
 
-#: rhodecode/model/validators.py:464
+#: rhodecode/model/validators.py:519
 msgid "Fork have to be the same type as parent"
 msgstr "Тип форка будет совпадать с родительским"
 
-#: rhodecode/model/validators.py:479
+#: rhodecode/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
-msgstr "У вас нет прав создания репозиториев в этой группе"
-
-#: rhodecode/model/validators.py:481
+msgstr "У вас недостаточно прав для создания репозиториев в этой группе"
+
+#: rhodecode/model/validators.py:536
 msgid "no permission to create repository in root location"
-msgstr "нет прав создания репозиториев в корне"
-
-#: rhodecode/model/validators.py:518
+msgstr "недостаточно прав для создания репозитория в корневом каталоге"
+
+#: rhodecode/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
-msgstr "У Вас нет прав создавать группу в этом месте"
-
-#: rhodecode/model/validators.py:559
+msgstr "У Вас недостаточно привилегий для создания группы в этом месте"
+
+#: rhodecode/model/validators.py:626
 msgid "This username or user group name is not valid"
 msgstr "Данное имя пользователя или группы пользователей недопустимо"
 
-#: rhodecode/model/validators.py:652
+#: rhodecode/model/validators.py:719
 msgid "This is not a valid path"
 msgstr "Этот путь ошибочен"
 
-#: rhodecode/model/validators.py:667
+#: rhodecode/model/validators.py:734
 msgid "This e-mail address is already taken"
 msgstr "Этот E-mail уже занят"
 
-#: rhodecode/model/validators.py:687
+#: rhodecode/model/validators.py:754
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "\"%(email)s\" не существует"
 
-#: rhodecode/model/validators.py:724
+#: rhodecode/model/validators.py:791
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name of "
 "the attribute that is equivalent to \"username\""
 msgstr "Для входа по LDAP должно быть указано значение аттрибута CN - это эквивалент имени пользователя"
 
-#: rhodecode/model/validators.py:737
+#: rhodecode/model/validators.py:804
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
-msgstr ""
-
-#: rhodecode/model/validators.py:769
+msgstr "Ревизии %(revs)s уже включены в pull-request или имеют установленный статус"
+
+#: rhodecode/model/validators.py:836
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr "Пожалуйста, введите существующий IPv4 или IpV6 адре"
 
-#: rhodecode/model/validators.py:770
+#: rhodecode/model/validators.py:837
 #, python-format
 msgid ""
 "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr "Значение маски подсети должно быть в пределах от 0 до 32 (%(bits)r - неверно)"
 
-#: rhodecode/model/validators.py:803
+#: rhodecode/model/validators.py:870
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr "Ключевое имя может только состоять из букв, символа подчеркивания, тире или чисел"
 
-#: rhodecode/model/validators.py:817
+#: rhodecode/model/validators.py:884
 msgid "Filename cannot be inside a directory"
 msgstr "Файла нет в каталоге"
 
+#: rhodecode/model/validators.py:900
+#, python-format
+msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
+msgstr ""
+
 #: rhodecode/templates/index.html:5
 msgid "Dashboard"
 msgstr "Панель управления"
 
 #: rhodecode/templates/index_base.html:6
-#: rhodecode/templates/repo_switcher_list.html:4
-#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/users/user_edit_my_account.html:31
-#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/bookmarks/bookmarks.html:9
-#: rhodecode/templates/branches/branches.html:9
-#: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:46
-#: rhodecode/templates/journal/journal.html:47
-#: rhodecode/templates/tags/tags.html:9
+#: rhodecode/templates/admin/my_account/my_account_repos.html:3
+#: rhodecode/templates/admin/my_account/my_account_watched.html:3
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:12
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:12
+#: rhodecode/templates/admin/users/users.html:12
+#: rhodecode/templates/bookmarks/bookmarks.html:12
+#: rhodecode/templates/branches/branches.html:12
+#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:50
+#: rhodecode/templates/tags/tags.html:12
 msgid "quick filter..."
-msgstr "быстрый фильтр..."
+msgstr "фильтр..."
 
 #: rhodecode/templates/index_base.html:6
-#: rhodecode/templates/admin/repos/repos.html:9
+#: rhodecode/templates/admin/repos/repos.html:12
 msgid "repositories"
 msgstr "репозитарии"
 
-#: rhodecode/templates/index_base.html:13
-#: rhodecode/templates/index_base.html:18
-#: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repos.html:22
-msgid "Add repository"
+#: rhodecode/templates/index_base.html:20
+#: rhodecode/templates/index_base.html:25
+#: rhodecode/templates/admin/repos/repo_add.html:22
+#: rhodecode/templates/admin/repos/repos.html:25
+msgid "Add Repository"
 msgstr "Добавить репозиторий"
 
-#: rhodecode/templates/index_base.html:15
-#: rhodecode/templates/index_base.html:20
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31
-msgid "Add group"
-msgstr "Добавить группу"
-
+#: rhodecode/templates/index_base.html:22
 #: rhodecode/templates/index_base.html:27
-msgid "Edit group"
-msgstr "Редактировать группу"
-
-#: rhodecode/templates/index_base.html:27
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:16
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:29
+msgid "Add Repository Group"
+msgstr "Добавить группу репозиториев"
+
+#: rhodecode/templates/index_base.html:32
 msgid "You have admin right to this group, and can edit it"
 msgstr "Вы имеете администраторские права на эту группу и можете редактировать её"
 
-#: rhodecode/templates/index_base.html:40
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43
-#: rhodecode/templates/admin/users_groups/users_group_add.html:32
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:33
-#: rhodecode/templates/admin/users_groups/users_groups.html:37
-msgid "Group name"
+#: rhodecode/templates/index_base.html:32
+msgid "Edit Repository Group"
+msgstr "Изменить группу репозиториев"
+
+#: rhodecode/templates/index_base.html:45
+msgid "Group Name"
 msgstr "Имя группы"
 
-#: rhodecode/templates/index_base.html:41
-#: rhodecode/templates/index_base.html:123
-#: rhodecode/templates/admin/repos/repo_add_base.html:56
-#: rhodecode/templates/admin/repos/repo_edit.html:68
-#: rhodecode/templates/admin/repos/repos.html:75
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44
-#: rhodecode/templates/email_templates/changeset_comment.html:9
+#: rhodecode/templates/index_base.html:46
+#: rhodecode/templates/index_base.html:128
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:64
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:45
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:17
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:32
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:72
+#: rhodecode/templates/admin/repos/repos.html:51
+#: rhodecode/templates/admin/user_groups/user_group_add.html:43
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:51
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:64
+#: rhodecode/templates/email_templates/changeset_comment.html:16
 #: rhodecode/templates/email_templates/pull_request.html:9
-#: rhodecode/templates/forks/fork.html:56
-#: rhodecode/templates/pullrequests/pullrequest.html:43
-#: rhodecode/templates/pullrequests/pullrequest_show.html:81
-#: rhodecode/templates/summary/summary.html:106
+#: rhodecode/templates/forks/fork.html:41
+#: rhodecode/templates/pullrequests/pullrequest.html:40
+#: rhodecode/templates/pullrequests/pullrequest_show.html:86
+#: rhodecode/templates/summary/summary.html:88
 msgid "Description"
 msgstr "Описание"
 
-#: rhodecode/templates/index_base.html:51
-#: rhodecode/templates/admin/permissions/permissions.html:55
-#: rhodecode/templates/admin/repos/repo_add_base.html:29
-#: rhodecode/templates/admin/repos/repo_edit.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57
-#: rhodecode/templates/forks/fork.html:47
-msgid "Repository group"
-msgstr "Группа репозиториев"
-
-#: rhodecode/templates/index_base.html:121
+#: rhodecode/templates/index_base.html:126
+#: rhodecode/templates/admin/my_account/my_account_repos.html:46
+#: rhodecode/templates/admin/my_account/my_account_watched.html:46
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:50
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
-#: rhodecode/templates/admin/repos/repo_edit.html:32
-#: rhodecode/templates/admin/repos/repos.html:73
-#: rhodecode/templates/admin/users/user_edit_my_account.html:172
-#: rhodecode/templates/base/perms_summary.html:37
-#: rhodecode/templates/bookmarks/bookmarks.html:48
-#: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:47
-#: rhodecode/templates/branches/branches_data.html:6
-#: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:193
-#: rhodecode/templates/journal/journal.html:283
-#: rhodecode/templates/summary/summary.html:55
-#: rhodecode/templates/summary/summary.html:124
-#: rhodecode/templates/tags/tags.html:48
-#: rhodecode/templates/tags/tags_data.html:6
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:7
+#: rhodecode/templates/admin/repos/repos.html:50
+#: rhodecode/templates/admin/user_groups/user_groups.html:50
+#: rhodecode/templates/base/perms_summary.html:53
+#: rhodecode/templates/bookmarks/bookmarks.html:51
+#: rhodecode/templates/bookmarks/bookmarks_data.html:7
+#: rhodecode/templates/branches/branches.html:50
+#: rhodecode/templates/branches/branches_data.html:7
+#: rhodecode/templates/files/files_browser.html:41
+#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/journal/journal.html:288
+#: rhodecode/templates/tags/tags.html:51
+#: rhodecode/templates/tags/tags_data.html:7
 msgid "Name"
 msgstr "Имя"
 
-#: rhodecode/templates/index_base.html:124
+#: rhodecode/templates/index_base.html:129
 msgid "Last Change"
 msgstr "Последнее изменение"
 
-#: rhodecode/templates/index_base.html:126
-#: rhodecode/templates/admin/repos/repos.html:76
-#: rhodecode/templates/admin/users/user_edit_my_account.html:174
-#: rhodecode/templates/journal/journal.html:195
-#: rhodecode/templates/journal/journal.html:285
+#: rhodecode/templates/index_base.html:131
+#: rhodecode/templates/admin/my_account/my_account_repos.html:48
+#: rhodecode/templates/admin/my_account/my_account_watched.html:48
+#: rhodecode/templates/admin/repos/repos.html:52
+#: rhodecode/templates/journal/journal.html:199
+#: rhodecode/templates/journal/journal.html:290
 msgid "Tip"
-msgstr "Подсказка"
-
-#: rhodecode/templates/index_base.html:128
-#: rhodecode/templates/admin/repos/repo_edit.html:114
-#: rhodecode/templates/admin/repos/repos.html:78
+msgstr "Состояние"
+
+#: rhodecode/templates/index_base.html:133
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:10
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:53
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:60
+#: rhodecode/templates/admin/repos/repos.html:53
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:8
+#: rhodecode/templates/admin/user_groups/user_groups.html:54
+#: rhodecode/templates/summary/summary.html:141
 msgid "Owner"
 msgstr "Владелец"
 
-#: rhodecode/templates/index_base.html:136
-#: rhodecode/templates/admin/repos/repos.html:86
-#: rhodecode/templates/admin/users/user_edit_my_account.html:183
-#: rhodecode/templates/admin/users/users.html:107
-#: rhodecode/templates/bookmarks/bookmarks.html:74
-#: rhodecode/templates/branches/branches.html:73
-#: rhodecode/templates/journal/journal.html:204
-#: rhodecode/templates/journal/journal.html:294
-#: rhodecode/templates/tags/tags.html:74
+#: rhodecode/templates/index_base.html:141
+#: rhodecode/templates/admin/my_account/my_account_repos.html:57
+#: rhodecode/templates/admin/my_account/my_account_watched.html:57
+#: rhodecode/templates/base/root.html:69
+#: rhodecode/templates/bookmarks/bookmarks.html:81
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:208
+#: rhodecode/templates/journal/journal.html:299
+#: rhodecode/templates/tags/tags.html:81
 msgid "Click to sort ascending"
 msgstr "По возрастанию"
 
-#: rhodecode/templates/index_base.html:137
-#: rhodecode/templates/admin/repos/repos.html:87
-#: rhodecode/templates/admin/users/user_edit_my_account.html:184
-#: rhodecode/templates/admin/users/users.html:108
-#: rhodecode/templates/bookmarks/bookmarks.html:75
-#: rhodecode/templates/branches/branches.html:74
-#: rhodecode/templates/journal/journal.html:205
-#: rhodecode/templates/journal/journal.html:295
-#: rhodecode/templates/tags/tags.html:75
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/admin/my_account/my_account_repos.html:58
+#: rhodecode/templates/admin/my_account/my_account_watched.html:58
+#: rhodecode/templates/base/root.html:70
+#: rhodecode/templates/bookmarks/bookmarks.html:82
+#: rhodecode/templates/branches/branches.html:81
+#: rhodecode/templates/journal/journal.html:209
+#: rhodecode/templates/journal/journal.html:300
+#: rhodecode/templates/tags/tags.html:82
 msgid "Click to sort descending"
 msgstr "По убыванию"
 
-#: rhodecode/templates/index_base.html:138
+#: rhodecode/templates/index_base.html:143
 msgid "No repositories found."
 msgstr "Репозитарии не найдены."
 
-#: rhodecode/templates/index_base.html:139
-#: rhodecode/templates/admin/repos/repos.html:89
-#: rhodecode/templates/admin/users/user_edit_my_account.html:186
-#: rhodecode/templates/admin/users/users.html:110
-#: rhodecode/templates/bookmarks/bookmarks.html:77
-#: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:207
-#: rhodecode/templates/journal/journal.html:297
-#: rhodecode/templates/tags/tags.html:77
+#: rhodecode/templates/index_base.html:144
+#: rhodecode/templates/admin/my_account/my_account_repos.html:60
+#: rhodecode/templates/admin/my_account/my_account_watched.html:60
+#: rhodecode/templates/base/root.html:72
+#: rhodecode/templates/bookmarks/bookmarks.html:84
+#: rhodecode/templates/branches/branches.html:83
+#: rhodecode/templates/journal/journal.html:211
+#: rhodecode/templates/journal/journal.html:302
+#: rhodecode/templates/tags/tags.html:84
 msgid "Data error."
 msgstr "Ошибка данных."
 
-#: rhodecode/templates/index_base.html:140
-#: rhodecode/templates/admin/repos/repos.html:90
-#: rhodecode/templates/admin/users/user_edit_my_account.html:58
-#: rhodecode/templates/admin/users/user_edit_my_account.html:187
-#: rhodecode/templates/admin/users/users.html:111
-#: rhodecode/templates/bookmarks/bookmarks.html:78
-#: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:208
-#: rhodecode/templates/journal/journal.html:298
-#: rhodecode/templates/tags/tags.html:78
+#: rhodecode/templates/index_base.html:145
+#: rhodecode/templates/admin/my_account/my_account_repos.html:61
+#: rhodecode/templates/admin/my_account/my_account_watched.html:61
+#: rhodecode/templates/base/base.html:148
+#: rhodecode/templates/base/root.html:73
+#: rhodecode/templates/bookmarks/bookmarks.html:85
+#: rhodecode/templates/branches/branches.html:84
+#: rhodecode/templates/journal/journal.html:212
+#: rhodecode/templates/journal/journal.html:303
+#: rhodecode/templates/tags/tags.html:85
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239
+#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:32
+#: rhodecode/templates/base/base.html:267
 msgid "Log In"
 msgstr "Войти"
 
-#: rhodecode/templates/login.html:21
+#: rhodecode/templates/login.html:30
 #, python-format
 msgid "Log In to %s"
 msgstr "Войти в %s"
 
-#: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
+#: rhodecode/templates/login.html:43 rhodecode/templates/register.html:40
 #: rhodecode/templates/admin/admin_log.html:5
-#: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:57
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31
-#: rhodecode/templates/admin/users/users.html:77
-#: rhodecode/templates/base/base.html:215
-#: rhodecode/templates/summary/summary.html:123
+#: rhodecode/templates/admin/my_account/my_account_profile.html:30
+#: rhodecode/templates/admin/users/user_add.html:35
+#: rhodecode/templates/admin/users/user_edit_profile.html:33
+#: rhodecode/templates/admin/users/users.html:53
+#: rhodecode/templates/base/base.html:243
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
-#: rhodecode/templates/admin/ldap/ldap.html:46
-#: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:224
+#: rhodecode/templates/login.html:52 rhodecode/templates/register.html:49
+#: rhodecode/templates/admin/my_account/my_account.html:39
+#: rhodecode/templates/admin/users/user_add.html:44
+#: rhodecode/templates/base/base.html:252
 msgid "Password"
 msgstr "Пароль"
 
-#: rhodecode/templates/login.html:50
+#: rhodecode/templates/login.html:62
 msgid "Remember me"
 msgstr "Запомнить"
 
-#: rhodecode/templates/login.html:54
+#: rhodecode/templates/login.html:66
 msgid "Sign In"
 msgstr "Войти"
 
-#: rhodecode/templates/login.html:60
+#: rhodecode/templates/login.html:72
 msgid "Forgot your password ?"
 msgstr "Забыли пароль?"
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235
+#: rhodecode/templates/login.html:75 rhodecode/templates/base/base.html:263
 msgid "Don't have an account ?"
 msgstr "Нет аккаунта?"
 
@@ -1806,111 +2176,112 @@
 msgid "Password Reset"
 msgstr "Сброс пароля"
 
-#: rhodecode/templates/password_reset.html:11
-msgid "Reset your password to"
-msgstr "Сбросить пароль на"
-
-#: rhodecode/templates/password_reset.html:21
-msgid "Email address"
-msgstr "Почтовый адрес"
-
-#: rhodecode/templates/password_reset.html:30
-msgid "Reset my password"
-msgstr "Сбросить пароль"
+#: rhodecode/templates/password_reset.html:29
+#, python-format
+msgid "Reset your Password to %s"
+msgstr ""
 
 #: rhodecode/templates/password_reset.html:31
+msgid "Reset your Password"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:42
+msgid "Email Address"
+msgstr "Почтовый адрес"
+
+#: rhodecode/templates/password_reset.html:52
+#: rhodecode/templates/register.html:95
+msgid "Captcha"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:63
+msgid "Send password reset email"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:64
 msgid "Password reset link will be send to matching email address"
 msgstr "Ссылка для сброса пароля была отправлена на соответствующий E-mail"
 
-#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74
+#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:30
+#: rhodecode/templates/register.html:106
 msgid "Sign Up"
 msgstr "Вступить"
 
-#: rhodecode/templates/register.html:11
-msgid "Sign Up to"
-msgstr "Вступить в"
-
-#: rhodecode/templates/register.html:38
+#: rhodecode/templates/register.html:28
+#, python-format
+msgid "Sign Up to %s"
+msgstr ""
+
+#: rhodecode/templates/register.html:58
 msgid "Re-enter password"
 msgstr "Повторите пароль"
 
-#: rhodecode/templates/register.html:47
-#: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
+#: rhodecode/templates/register.html:67
+#: rhodecode/templates/admin/my_account/my_account_profile.html:41
+#: rhodecode/templates/admin/users/user_add.html:62
+#: rhodecode/templates/admin/users/user_edit_profile.html:87
 msgid "First Name"
 msgstr "Имя"
 
-#: rhodecode/templates/register.html:56
-#: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:106
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
+#: rhodecode/templates/register.html:76
+#: rhodecode/templates/admin/my_account/my_account_profile.html:50
+#: rhodecode/templates/admin/users/user_add.html:71
+#: rhodecode/templates/admin/users/user_edit_profile.html:96
 msgid "Last Name"
 msgstr "Фамилия"
 
-#: rhodecode/templates/register.html:65
-#: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:115
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/summary/summary.html:125
+#: rhodecode/templates/register.html:85
+#: rhodecode/templates/admin/my_account/my_account_profile.html:59
+#: rhodecode/templates/admin/settings/settings.html:44
+#: rhodecode/templates/admin/users/user_add.html:80
+#: rhodecode/templates/admin/users/user_edit_profile.html:42
 msgid "Email"
 msgstr "E-mail"
 
-#: rhodecode/templates/register.html:76
+#: rhodecode/templates/register.html:108
 msgid "Your account will be activated right after registration"
 msgstr "Ваш аккаунт будет активирован сразу после регистрации"
 
-#: rhodecode/templates/register.html:78
+#: rhodecode/templates/register.html:110
 msgid "Your account must wait for activation by administrator"
 msgstr "Ваш аккаунт ожидает модерации"
 
-#: rhodecode/templates/repo_switcher_list.html:10
-#: rhodecode/templates/admin/defaults/defaults.html:44
-#: rhodecode/templates/admin/repos/repo_add_base.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:78
-#: rhodecode/templates/data_table/_dt_elements.html:61
-#: rhodecode/templates/summary/summary.html:77
-msgid "Private repository"
-msgstr "Частный репозиторий"
-
-#: rhodecode/templates/repo_switcher_list.html:12
-#: rhodecode/templates/data_table/_dt_elements.html:63
-#: rhodecode/templates/summary/summary.html:79
-msgid "Public repository"
-msgstr "Публичный репозиторий"
-
 #: rhodecode/templates/switch_to_list.html:10
-#: rhodecode/templates/branches/branches_data.html:57
+#: rhodecode/templates/branches/branches_data.html:67
 msgid "There are no branches yet"
 msgstr "Ветки ещё не созданы"
 
-#: rhodecode/templates/switch_to_list.html:22
-#: rhodecode/templates/tags/tags_data.html:38
+#: rhodecode/templates/switch_to_list.html:16
+msgid "Closed Branches"
+msgstr "Закрытые ветки"
+
+#: rhodecode/templates/switch_to_list.html:32
+#: rhodecode/templates/tags/tags_data.html:44
 msgid "There are no tags yet"
 msgstr "Метки отсутсвуют"
 
-#: rhodecode/templates/switch_to_list.html:35
-#: rhodecode/templates/bookmarks/bookmarks_data.html:37
+#: rhodecode/templates/switch_to_list.html:45
+#: rhodecode/templates/bookmarks/bookmarks_data.html:43
 msgid "There are no bookmarks yet"
 msgstr "Закладок ещё нет"
 
 #: rhodecode/templates/admin/admin.html:5
-#: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/base/base.html:73
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/base/base.html:69
 msgid "Admin journal"
 msgstr "Журнал администратора"
 
-#: rhodecode/templates/admin/admin.html:10
+#: rhodecode/templates/admin/admin.html:13
 msgid "journal filter..."
 msgstr "Фильтр журнала..."
 
-#: rhodecode/templates/admin/admin.html:12
-#: rhodecode/templates/journal/journal.html:11
+#: rhodecode/templates/admin/admin.html:15
+#: rhodecode/templates/journal/journal.html:14
 msgid "filter"
-msgstr "фильтр"
-
-#: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/journal/journal.html:12
+msgstr "Отфильтровать"
+
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/journal/journal.html:15
 #, python-format
 msgid "%s entry"
 msgid_plural "%s entries"
@@ -1919,28 +2290,30 @@
 msgstr[2] "%s записи"
 
 #: rhodecode/templates/admin/admin_log.html:6
-#: rhodecode/templates/admin/repos/repos.html:79
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
-#: rhodecode/templates/admin/users/user_edit_my_account.html:176
-#: rhodecode/templates/admin/users/users.html:87
-#: rhodecode/templates/admin/users_groups/users_groups.html:40
-#: rhodecode/templates/journal/journal.html:197
-#: rhodecode/templates/journal/journal.html:287
+#: rhodecode/templates/admin/my_account/my_account_repos.html:50
+#: rhodecode/templates/admin/my_account/my_account_watched.html:50
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:54
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:8
+#: rhodecode/templates/admin/repos/repos.html:55
+#: rhodecode/templates/admin/user_groups/user_groups.html:55
+#: rhodecode/templates/admin/users/users.html:60
+#: rhodecode/templates/journal/journal.html:201
+#: rhodecode/templates/journal/journal.html:292
 msgid "Action"
 msgstr "Действие"
 
 #: rhodecode/templates/admin/admin_log.html:7
-#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/permissions/permissions_globals.html:18
 msgid "Repository"
 msgstr "Репозитарий"
 
 #: rhodecode/templates/admin/admin_log.html:8
-#: rhodecode/templates/bookmarks/bookmarks.html:49
-#: rhodecode/templates/bookmarks/bookmarks_data.html:7
-#: rhodecode/templates/branches/branches.html:48
-#: rhodecode/templates/branches/branches_data.html:7
-#: rhodecode/templates/tags/tags.html:49
-#: rhodecode/templates/tags/tags_data.html:7
+#: rhodecode/templates/bookmarks/bookmarks.html:53
+#: rhodecode/templates/bookmarks/bookmarks_data.html:9
+#: rhodecode/templates/branches/branches.html:52
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/tags/tags.html:53
+#: rhodecode/templates/tags/tags_data.html:9
 msgid "Date"
 msgstr "Дата"
 
@@ -1952,309 +2325,598 @@
 msgid "No actions yet"
 msgstr "Действия ещё не производились"
 
+#: rhodecode/templates/admin/auth/auth_settings.html:5
+msgid "Authentication Settings"
+msgstr "Настройки аутентификации"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:14
+#: rhodecode/templates/base/base.html:75
+msgid "Authentication"
+msgstr "Аутентификация"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:31
+msgid "Authentication Plugins"
+msgstr "Плагины аутентификации"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:34
+msgid "Enabled Plugins"
+msgstr "Включенные плагины"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:36
+msgid ""
+"Comma separated list of plugins. Order of plugins is also order in which "
+"RhodeCode will try to authenticate user"
+msgstr "Список плагинов, разделенных запятой. RhodeCode будет пробовать аутентифицировать пользователя в порядке указания плагинов."
+
+#: rhodecode/templates/admin/auth/auth_settings.html:37
+msgid "Available built-in plugins"
+msgstr "Доступные встроенные плагины"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:65
+msgid "enabled"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:66
+msgid "disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:51
+#: rhodecode/templates/admin/defaults/defaults.html:87
+#: rhodecode/templates/admin/my_account/my_account_password.html:33
+#: rhodecode/templates/admin/my_account/my_account_profile.html:68
+#: rhodecode/templates/admin/permissions/permissions_globals.html:108
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:72
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:114
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:101
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:134
+#: rhodecode/templates/admin/settings/settings_hooks.html:53
+#: rhodecode/templates/admin/user_groups/user_group_add.html:60
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:104
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:67
+#: rhodecode/templates/admin/users/user_add.html:99
+#: rhodecode/templates/admin/users/user_edit_profile.html:122
+#: rhodecode/templates/base/default_perms_box.html:64
+msgid "Save"
+msgstr "Сохранить"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:57
+msgid "Plugin"
+msgstr "Плагин"
+
 #: rhodecode/templates/admin/defaults/defaults.html:5
-#: rhodecode/templates/admin/defaults/defaults.html:25
+#: rhodecode/templates/admin/defaults/defaults.html:28
 msgid "Repositories defaults"
 msgstr " Значения по умолчанию"
 
-#: rhodecode/templates/admin/defaults/defaults.html:11
-#: rhodecode/templates/base/base.html:80
+#: rhodecode/templates/admin/defaults/defaults.html:14
+#: rhodecode/templates/base/base.html:76
 msgid "Defaults"
 msgstr "Значения по умолчанию"
 
-#: rhodecode/templates/admin/defaults/defaults.html:35
-#: rhodecode/templates/admin/repos/repo_add_base.html:38
+#: rhodecode/templates/admin/defaults/defaults.html:38
+#: rhodecode/templates/admin/repos/repo_add_base.html:59
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:7
 msgid "Type"
 msgstr "Тип"
 
-#: rhodecode/templates/admin/defaults/defaults.html:48
-#: rhodecode/templates/admin/repos/repo_add_base.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:82
-#: rhodecode/templates/forks/fork.html:69
+#: rhodecode/templates/admin/defaults/defaults.html:47
+#: rhodecode/templates/admin/repos/repo_add_base.html:77
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:82
+#: rhodecode/templates/data_table/_dt_elements.html:70
+msgid "Private repository"
+msgstr "Приватный репозиторий"
+
+#: rhodecode/templates/admin/defaults/defaults.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:81
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:86
+#: rhodecode/templates/forks/fork.html:75
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
 msgstr "Приватные репозитории видны только их участникам"
 
-#: rhodecode/templates/admin/defaults/defaults.html:55
-#: rhodecode/templates/admin/repos/repo_edit.html:87
+#: rhodecode/templates/admin/defaults/defaults.html:58
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:91
 msgid "Enable statistics"
 msgstr "Включить статистику."
 
-#: rhodecode/templates/admin/defaults/defaults.html:59
-#: rhodecode/templates/admin/repos/repo_edit.html:91
+#: rhodecode/templates/admin/defaults/defaults.html:62
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:95
 msgid "Enable statistics window on summary page."
-msgstr "Включить окно статистики на странице summary."
-
-#: rhodecode/templates/admin/defaults/defaults.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:96
+msgstr "Включить окно статистики на странице 'Общие сведения'."
+
+#: rhodecode/templates/admin/defaults/defaults.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:100
 msgid "Enable downloads"
 msgstr "Включить скачивание"
 
-#: rhodecode/templates/admin/defaults/defaults.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:100
+#: rhodecode/templates/admin/defaults/defaults.html:72
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:104
 msgid "Enable download menu on summary page."
-msgstr "Включить меню скачивания на странице summary."
-
-#: rhodecode/templates/admin/defaults/defaults.html:75
-#: rhodecode/templates/admin/repos/repo_edit.html:105
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64
+msgstr "Включить меню скачивания на странице  'Общие сведения'."
+
+#: rhodecode/templates/admin/defaults/defaults.html:78
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:34
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:109
 msgid "Enable locking"
 msgstr "Включить блокирование"
 
-#: rhodecode/templates/admin/defaults/defaults.html:79
-#: rhodecode/templates/admin/repos/repo_edit.html:109
+#: rhodecode/templates/admin/defaults/defaults.html:82
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:113
 msgid "Enable lock-by-pulling on repository."
-msgstr ""
-
-#: rhodecode/templates/admin/defaults/defaults.html:84
-#: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/permissions/permissions.html:122
-#: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos/repo_edit.html:166
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96
-#: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_add.html:94
-#: rhodecode/templates/admin/users/user_edit.html:140
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88
-#: rhodecode/templates/admin/users_groups/users_group_add.html:49
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:143
-#: rhodecode/templates/base/default_perms_box.html:53
-msgid "Save"
-msgstr "Сохранить"
-
-#: rhodecode/templates/admin/gists/index.html:5
-#: rhodecode/templates/base/base.html:299
-msgid "Gists"
-msgstr "Gist"
-
-#: rhodecode/templates/admin/gists/index.html:10
+msgstr "Включить lock-by-pulling для репозитория"
+
+#: rhodecode/templates/admin/gists/edit.html:5
+#: rhodecode/templates/admin/gists/edit.html:22
+msgid "Edit Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:40
+#, python-format
+msgid ""
+"Gist was update since you started editing. Copy your changes and click "
+"%(here)s to reload new version."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:59
+#: rhodecode/templates/admin/gists/new.html:43
+msgid "Gist description ..."
+msgstr "Описание..."
+
+#: rhodecode/templates/admin/gists/edit.html:61
+#: rhodecode/templates/admin/gists/new.html:45
+msgid "Gist lifetime"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/edit.html:67
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/index.html:62
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/gists/show.html:52
+msgid "Expires"
+msgstr "Истекает"
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+msgid "never"
+msgstr "никогда"
+
+#: rhodecode/templates/admin/gists/edit.html:80
+#: rhodecode/templates/admin/gists/new.html:52
+#: rhodecode/templates/files/files_add.html:59
+#: rhodecode/templates/files/files_edit.html:64
+msgid "plain"
+msgstr "plain"
+
+#: rhodecode/templates/admin/gists/edit.html:147
+msgid "Update Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:148
+#: rhodecode/templates/changeset/changeset_file_comment.html:89
+msgid "Cancel"
+msgstr "Отмена"
+
+#: rhodecode/templates/admin/gists/index.html:6
+#: rhodecode/templates/admin/gists/index.html:19
 #, python-format
 msgid "Private Gists for user %s"
 msgstr "Приватная запись Gist для пользователя %s"
 
-#: rhodecode/templates/admin/gists/index.html:12
+#: rhodecode/templates/admin/gists/index.html:8
+#: rhodecode/templates/admin/gists/index.html:21
 #, python-format
 msgid "Public Gists for user %s"
 msgstr "Публичная запись Gist для пользователя %s"
 
-#: rhodecode/templates/admin/gists/index.html:14
+#: rhodecode/templates/admin/gists/index.html:10
+#: rhodecode/templates/admin/gists/index.html:23
 msgid "Public Gists"
 msgstr "Публичные записи Gist"
 
-#: rhodecode/templates/admin/gists/index.html:31
-#: rhodecode/templates/admin/gists/show.html:24
-#: rhodecode/templates/base/base.html:302
-msgid "Create new gist"
-msgstr "Создать новую запись"
-
-#: rhodecode/templates/admin/gists/index.html:48
+#: rhodecode/templates/admin/gists/index.html:40
+#: rhodecode/templates/admin/gists/show.html:28
+msgid "Create New Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:57
+#: rhodecode/templates/data_table/_dt_elements.html:143
 msgid "Created"
 msgstr "Создано"
 
-#: rhodecode/templates/admin/gists/index.html:51
-#: rhodecode/templates/admin/gists/index.html:53
-#: rhodecode/templates/admin/gists/show.html:43
-#: rhodecode/templates/admin/gists/show.html:45
-msgid "Expires"
-msgstr "Истекает"
-
-#: rhodecode/templates/admin/gists/index.html:51
-#: rhodecode/templates/admin/gists/show.html:43
-msgid "never"
-msgstr "никогда"
-
-#: rhodecode/templates/admin/gists/index.html:68
+#: rhodecode/templates/admin/gists/index.html:77
 msgid "There are no gists yet"
 msgstr "Записи Gist отсутствуют"
 
 #: rhodecode/templates/admin/gists/new.html:5
-#: rhodecode/templates/admin/gists/new.html:16
-msgid "New gist"
-msgstr "Новая запись"
-
-#: rhodecode/templates/admin/gists/new.html:37
-msgid "Gist description ..."
-msgstr "Описание..."
-
-#: rhodecode/templates/admin/gists/new.html:52
-msgid "Create private gist"
-msgstr "Создать приватную запись"
-
-#: rhodecode/templates/admin/gists/new.html:53
-msgid "Create public gist"
-msgstr "Создать публичную запись"
-
-#: rhodecode/templates/admin/gists/new.html:54
-#: rhodecode/templates/admin/permissions/permissions.html:123
-#: rhodecode/templates/admin/permissions/permissions.html:185
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos/repo_edit.html:167
-#: rhodecode/templates/admin/repos/repo_edit.html:381
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97
-#: rhodecode/templates/admin/settings/settings.html:115
-#: rhodecode/templates/admin/settings/settings.html:196
-#: rhodecode/templates/admin/settings/settings.html:288
-#: rhodecode/templates/admin/users/user_edit.html:141
-#: rhodecode/templates/admin/users/user_edit.html:198
-#: rhodecode/templates/admin/users/user_edit.html:246
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:144
-#: rhodecode/templates/base/default_perms_box.html:54
-#: rhodecode/templates/files/files_add.html:80
-#: rhodecode/templates/files/files_edit.html:66
-#: rhodecode/templates/pullrequests/pullrequest.html:86
+#: rhodecode/templates/admin/gists/new.html:22
+msgid "New Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:51
+msgid "name this file..."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:60
+msgid "Create Private Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:61
+msgid "Create Public Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:62
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:70
+#: rhodecode/templates/admin/my_account/my_account_emails.html:46
+#: rhodecode/templates/admin/my_account/my_account_password.html:34
+#: rhodecode/templates/admin/my_account/my_account_profile.html:69
+#: rhodecode/templates/admin/permissions/permissions_globals.html:109
+#: rhodecode/templates/admin/permissions/permissions_ips.html:41
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:115
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:43
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:59
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:102
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:135
+#: rhodecode/templates/admin/settings/settings_global.html:56
+#: rhodecode/templates/admin/settings/settings_license.html:43
+#: rhodecode/templates/admin/settings/settings_vcs.html:81
+#: rhodecode/templates/admin/settings/settings_visual.html:116
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:105
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:70
+#: rhodecode/templates/admin/users/user_edit_emails.html:46
+#: rhodecode/templates/admin/users/user_edit_ips.html:50
+#: rhodecode/templates/admin/users/user_edit_profile.html:123
+#: rhodecode/templates/base/default_perms_box.html:65
+#: rhodecode/templates/files/files_add.html:70
+#: rhodecode/templates/files/files_delete.html:58
+#: rhodecode/templates/files/files_edit.html:73
+#: rhodecode/templates/pullrequests/pullrequest.html:83
 msgid "Reset"
 msgstr "Сброс"
 
 #: rhodecode/templates/admin/gists/show.html:5
-msgid "gist"
-msgstr "gist"
-
-#: rhodecode/templates/admin/gists/show.html:9
+#: rhodecode/templates/admin/gists/show.html:12
 msgid "Gist"
 msgstr "Gist"
 
-#: rhodecode/templates/admin/gists/show.html:36
-msgid "Public gist"
-msgstr "Публичная запись gist"
-
-#: rhodecode/templates/admin/gists/show.html:38
-msgid "Private gist"
-msgstr "Приватная запись gist"
-
-#: rhodecode/templates/admin/gists/show.html:54
-#: rhodecode/templates/admin/repos/repo_edit.html:299
-#: rhodecode/templates/changeset/changeset_file_comment.html:40
+#: rhodecode/templates/admin/gists/show.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:4
+#: rhodecode/templates/email_templates/pull_request.html:4
+#: rhodecode/templates/email_templates/pull_request_comment.html:4
+msgid "URL"
+msgstr "URL"
+
+#: rhodecode/templates/admin/gists/show.html:40
+msgid "Public Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:42
+msgid "Private Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:59
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:80
+#: rhodecode/templates/changeset/changeset_file_comment.html:48
+#: rhodecode/templates/files/files_source.html:39
+#: rhodecode/templates/files/files_source.html:42
+#: rhodecode/templates/files/files_source.html:45
 msgid "Delete"
 msgstr "Удалить"
 
-#: rhodecode/templates/admin/gists/show.html:54
-msgid "Confirm to delete this gist"
-msgstr "Подтвердите удаление записи"
-
-#: rhodecode/templates/admin/gists/show.html:63
-#: rhodecode/templates/admin/gists/show.html:84
-#: rhodecode/templates/files/files_edit.html:48
-#: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:55
-msgid "Show as raw"
-msgstr "Показать без форматирования"
-
-#: rhodecode/templates/admin/gists/show.html:71
+#: rhodecode/templates/admin/gists/show.html:59
+msgid "Confirm to delete this Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:66
+#: rhodecode/templates/changeset/changeset_file_comment.html:81
+#: rhodecode/templates/changeset/changeset_file_comment.html:190
+#: rhodecode/templates/data_table/_dt_elements.html:167
+#: rhodecode/templates/data_table/_dt_elements.html:183
+#: rhodecode/templates/files/files_source.html:41
+#: rhodecode/templates/files/files_source.html:44
+msgid "Edit"
+msgstr "Редактировать"
+
+#: rhodecode/templates/admin/gists/show.html:68
+#: rhodecode/templates/files/files_edit.html:54
+#: rhodecode/templates/files/files_source.html:34
+msgid "Show as Raw"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:76
 msgid "created"
 msgstr "создал"
 
-#: rhodecode/templates/admin/ldap/ldap.html:5
-msgid "LDAP administration"
-msgstr "администрирование LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:11
-#: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:79
-msgid "LDAP"
-msgstr "LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:28
-msgid "Connection settings"
-msgstr "Настройки подключения"
-
-#: rhodecode/templates/admin/ldap/ldap.html:30
-msgid "Enable LDAP"
-msgstr "Включить LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:34
-msgid "Host"
-msgstr "Хост"
-
-#: rhodecode/templates/admin/ldap/ldap.html:38
-msgid "Port"
-msgstr "Порт"
-
-#: rhodecode/templates/admin/ldap/ldap.html:42
-msgid "Account"
-msgstr "Аккаунт"
-
-#: rhodecode/templates/admin/ldap/ldap.html:50
-msgid "Connection security"
-msgstr "Безопасность соединения"
-
-#: rhodecode/templates/admin/ldap/ldap.html:54
-msgid "Certificate Checks"
-msgstr "Проверки сертификатов"
-
-#: rhodecode/templates/admin/ldap/ldap.html:57
-msgid "Search settings"
-msgstr "Настройки поиска"
-
-#: rhodecode/templates/admin/ldap/ldap.html:59
-msgid "Base DN"
-msgstr "Base DN"
-
-#: rhodecode/templates/admin/ldap/ldap.html:63
-msgid "LDAP Filter"
-msgstr "Фильтр LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:67
-msgid "LDAP Search Scope"
-msgstr "Область поиска LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:70
-msgid "Attribute mappings"
-msgstr "Маппинги атрибутов"
-
-#: rhodecode/templates/admin/ldap/ldap.html:72
-msgid "Login Attribute"
-msgstr "Атрибут \"Логин\""
-
-#: rhodecode/templates/admin/ldap/ldap.html:76
-msgid "First Name Attribute"
-msgstr "Атрибут \"Имя\""
-
-#: rhodecode/templates/admin/ldap/ldap.html:80
-msgid "Last Name Attribute"
-msgstr "Атрибут \"Фамилия\""
-
-#: rhodecode/templates/admin/ldap/ldap.html:84
-msgid "E-mail Attribute"
-msgstr "Атрибут \"E-mail\""
+#: rhodecode/templates/admin/gists/show.html:89
+#: rhodecode/templates/files/files_source.html:71
+msgid "Show as raw"
+msgstr "Показать без форматирования"
+
+#: rhodecode/templates/admin/my_account/my_account.html:5
+#: rhodecode/templates/base/base.html:282
+msgid "My account"
+msgstr "Мой аккаунт"
+
+#: rhodecode/templates/admin/my_account/my_account.html:12
+msgid "My Account"
+msgstr "Мой Аккаунт"
+
+#: rhodecode/templates/admin/my_account/my_account.html:38
+#: rhodecode/templates/admin/users/user_edit.html:42
+msgid "Profile"
+msgstr "Профиль"
+
+#: rhodecode/templates/admin/my_account/my_account.html:40
+#: rhodecode/templates/admin/users/user_edit.html:43
+msgid "API keys"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:41
+msgid "My Emails"
+msgstr "Мои Email-ы"
+
+#: rhodecode/templates/admin/my_account/my_account.html:42
+msgid "My Repositories"
+msgstr "Мои репозитории"
+
+#: rhodecode/templates/admin/my_account/my_account.html:43
+#: rhodecode/templates/journal/journal.html:54
+msgid "Watched"
+msgstr "Просмотрено"
+
+#: rhodecode/templates/admin/my_account/my_account.html:44
+msgid "Pull requests"
+msgstr "Pull-request'ы"
+
+#: rhodecode/templates/admin/my_account/my_account.html:45
+msgid "My permissions"
+msgstr "Мои привилегии"
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:6
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:6
+msgid "Built-in"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:32
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:32
+msgid "expires"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:14
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:14
+#, python-format
+msgid "Confirm to reset this api key: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:15
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:15
+msgid "reset"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:30
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:30
+msgid "expired"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:40
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:40
+#, python-format
+msgid "Confirm to remove this api key: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:42
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:42
+msgid "remove"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:49
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:49
+msgid "No additional api keys specified"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:61
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:61
+msgid "New api key"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:69
+#: rhodecode/templates/admin/my_account/my_account_emails.html:45
+#: rhodecode/templates/admin/permissions/permissions_ips.html:40
+#: rhodecode/templates/admin/repos/repo_add_base.html:85
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:58
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:69
+#: rhodecode/templates/admin/users/user_edit_emails.html:45
+#: rhodecode/templates/admin/users/user_edit_ips.html:49
+msgid "Add"
+msgstr "Добавить"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:7
+#: rhodecode/templates/admin/users/user_edit_emails.html:7
+msgid "Primary"
+msgstr "Основной"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:19
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:24
+#: rhodecode/templates/admin/permissions/permissions_ips.html:14
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:18
+#: rhodecode/templates/admin/settings/settings_hooks.html:36
+#: rhodecode/templates/admin/users/user_edit_emails.html:19
+#: rhodecode/templates/admin/users/user_edit_ips.html:22
+#: rhodecode/templates/data_table/_dt_elements.html:131
+#: rhodecode/templates/data_table/_dt_elements.html:159
+#: rhodecode/templates/data_table/_dt_elements.html:175
+#: rhodecode/templates/data_table/_dt_elements.html:191
+msgid "delete"
+msgstr "удалить"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:20
+#: rhodecode/templates/admin/users/user_edit_emails.html:20
+#, python-format
+msgid "Confirm to delete this email: %s"
+msgstr "Подтвердите удаление E-mail: %s"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:26
+#: rhodecode/templates/admin/users/user_edit_emails.html:26
+msgid "No additional emails specified"
+msgstr "Дополнительных Email не указано"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:38
+#: rhodecode/templates/admin/users/user_edit_emails.html:38
+msgid "New email address"
+msgstr "Новый E-mail"
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:1
+msgid "Change your account password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:7
+msgid "Current password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:16
+#: rhodecode/templates/admin/users/user_edit_profile.html:69
+msgid "New password"
+msgstr "Новый пароль"
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:25
+msgid "Confirm new password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:9
+msgid "Change your avatar at"
+msgstr "Измените аватар через сайт"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:10
+#: rhodecode/templates/admin/users/user_edit_profile.html:9
+msgid "Using"
+msgstr "Используется"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:11
+msgid "Avatars are disabled"
+msgstr "Аватары отключены"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:13
+msgid "Missing email, please update your user email address."
+msgstr "Не указан email. Пожалуйста, обновите ваш email."
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:14
+#: rhodecode/templates/admin/users/user_edit_profile.html:15
+msgid "current IP"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:26
+msgid ""
+"Your user is in an external Source of Record; some details cannot be managed"
+" here"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:2
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:4
+msgid "Show closed pull requests"
+msgstr "Отображать закрытые pull-request'ы"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:6
+msgid "Opened by me"
+msgstr "Открыто мной"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:15
+#, python-format
+msgid "Pull request #%s opened on %s"
+msgstr "Pull-request #%s открыт %s"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:17
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:47
+#: rhodecode/templates/pullrequests/pullrequest_data.html:11
+#: rhodecode/templates/pullrequests/pullrequest_show.html:30
+#: rhodecode/templates/pullrequests/pullrequest_show.html:45
+msgid "Closed"
+msgstr "Закрыто"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:25
+msgid "Confirm to delete this pull request"
+msgstr "Подтвердите удаление этого pull-request'а"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:32
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:53
+msgid "Nothing here yet"
+msgstr "Здесь ничего нет"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:36
+msgid "I participate in"
+msgstr "Моё участие"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:44
+#: rhodecode/templates/pullrequests/pullrequest_data.html:8
+#, python-format
+msgid "Pull request #%s opened by %s on %s"
+msgstr "Pull-request #%s открыт пользователем %s %s"
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:1
+msgid "Repositories you are owner of"
+msgstr "Репозитории, где вы - владелец"
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:59
+#: rhodecode/templates/admin/my_account/my_account_watched.html:59
+#: rhodecode/templates/base/root.html:71
+#: rhodecode/templates/bookmarks/bookmarks.html:83
+#: rhodecode/templates/branches/branches.html:82
+#: rhodecode/templates/journal/journal.html:210
+#: rhodecode/templates/journal/journal.html:301
+#: rhodecode/templates/tags/tags.html:83
+msgid "No records found."
+msgstr "Записи не найдены."
+
+#: rhodecode/templates/admin/my_account/my_account_watched.html:1
+msgid "Repositories you are watching"
+msgstr "Репозитории, за которыми вы наблюдаете"
 
 #: rhodecode/templates/admin/notifications/notifications.html:5
-#: rhodecode/templates/admin/notifications/notifications.html:9
+#: rhodecode/templates/admin/notifications/notifications.html:12
 msgid "My Notifications"
 msgstr "Мои уведомления"
 
-#: rhodecode/templates/admin/notifications/notifications.html:29
+#: rhodecode/templates/admin/notifications/notifications.html:32
 msgid "All"
 msgstr "Всё"
 
-#: rhodecode/templates/admin/notifications/notifications.html:30
+#: rhodecode/templates/admin/notifications/notifications.html:33
 msgid "Comments"
 msgstr "Комментарии"
 
-#: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
-msgid "Pull requests"
-msgstr "Запросы pull"
-
-#: rhodecode/templates/admin/notifications/notifications.html:35
+#: rhodecode/templates/admin/notifications/notifications.html:34
+#: rhodecode/templates/base/base.html:193
+msgid "Pull Requests"
+msgstr "Pull-request'ы"
+
+#: rhodecode/templates/admin/notifications/notifications.html:38
 msgid "Mark all read"
 msgstr "Пометить прочтённым"
 
-#: rhodecode/templates/admin/notifications/notifications_data.html:39
+#: rhodecode/templates/admin/notifications/notifications_data.html:40
 msgid "No notifications here yet"
 msgstr "Уведомлений нет"
 
 #: rhodecode/templates/admin/notifications/show_notification.html:5
-#: rhodecode/templates/admin/notifications/show_notification.html:11
+#: rhodecode/templates/admin/notifications/show_notification.html:14
 msgid "Show notification"
 msgstr "Показать уведомление"
 
-#: rhodecode/templates/admin/notifications/show_notification.html:9
-#: rhodecode/templates/base/base.html:253
+#: rhodecode/templates/admin/notifications/show_notification.html:12
+#: rhodecode/templates/base/base.html:281
 msgid "Notifications"
 msgstr "Уведомления"
 
@@ -2262,565 +2924,222 @@
 msgid "Permissions administration"
 msgstr "Управление привилегиями"
 
-#: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:151
-#: rhodecode/templates/admin/repos/repo_edit.html:158
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88
-#: rhodecode/templates/admin/users/user_edit.html:150
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:129
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/base/base.html:78
+#: rhodecode/templates/admin/permissions/permissions.html:14
+#: rhodecode/templates/admin/permissions/permissions.html:37
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:55
+#: rhodecode/templates/admin/repos/repo_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:45
+#: rhodecode/templates/base/base.html:74
 msgid "Permissions"
 msgstr "Привилегии"
 
-#: rhodecode/templates/admin/permissions/permissions.html:24
-msgid "Default permissions"
-msgstr "Стандартные привилегии"
-
-#: rhodecode/templates/admin/permissions/permissions.html:31
+#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/settings/settings.html:42
+msgid "Global"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:42
+msgid "IP whitelist"
+msgstr "Белый список IP"
+
+#: rhodecode/templates/admin/permissions/permissions.html:43
+msgid "Overview"
+msgstr "Обзор"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:7
 msgid "Anonymous access"
 msgstr "Анонимный доступ"
 
-#: rhodecode/templates/admin/permissions/permissions.html:49
+#: rhodecode/templates/admin/permissions/permissions_globals.html:13
+#, python-format
+msgid ""
+"Allow access to RhodeCode without need to log in. Anonymous users use %s "
+"user permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:26
 msgid ""
 "All default permissions on each repository will be reset to chosen "
 "permission, note that all custom default permission on repositories will be "
 "lost"
-msgstr "Выбранные значения прав будут установлены как значения по умолчанию для каждого репозитория. Учтите, что ранее установленные значения прав по умолчанию для репозиториев будут сброшены."
-
-#: rhodecode/templates/admin/permissions/permissions.html:50
-#: rhodecode/templates/admin/permissions/permissions.html:63
-#: rhodecode/templates/admin/permissions/permissions.html:77
+msgstr "Выбранные привилегии будут установлены по умолчанию для каждого репозитория. Учтите, что ранее установленные привилегии по умолчанию будут сброшены."
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:27
+#: rhodecode/templates/admin/permissions/permissions_globals.html:40
+#: rhodecode/templates/admin/permissions/permissions_globals.html:54
 msgid "Overwrite existing settings"
 msgstr "Перезаписать существующие настройки"
 
-#: rhodecode/templates/admin/permissions/permissions.html:62
+#: rhodecode/templates/admin/permissions/permissions_globals.html:32
+#: rhodecode/templates/admin/repos/repo_add_base.html:41
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:42
+#: rhodecode/templates/data_table/_dt_elements.html:204
+#: rhodecode/templates/forks/fork.html:51
+msgid "Repository group"
+msgstr "Группа репозиториев"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:39
 msgid ""
 "All default permissions on each repository group will be reset to chosen "
 "permission, note that all custom default permission on repository groups "
 "will be lost"
-msgstr "Выбранные значения прав будут установлены как значения по умолчанию для каждой группы репозиториев. Учтите, что ранее установленные значения прав по умолчанию для групп репозиториев будут сброшены."
-
-#: rhodecode/templates/admin/permissions/permissions.html:69
+msgstr "Выбранные привилегии будут установлены по умолчанию для каждой группы репозиториев. Учтите, что ранее установленные привилегии по умолчанию для групп репозиториев будут сброшены."
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:46
+#: rhodecode/templates/data_table/_dt_elements.html:211
 msgid "User group"
 msgstr "Группа пользователей"
 
-#: rhodecode/templates/admin/permissions/permissions.html:76
+#: rhodecode/templates/admin/permissions/permissions_globals.html:53
 msgid ""
 "All default permissions on each user group will be reset to chosen "
 "permission, note that all custom default permission on repository groups "
 "will be lost"
-msgstr "Выбранные значения прав будут установлены как значения по умолчанию для каждой группы пользователей. Учтите, что ранее установленные значения прав по умолчанию для групп пользователей будут сброшены."
-
-#: rhodecode/templates/admin/permissions/permissions.html:83
+msgstr "Выбранные привилегии будут установлены по умолчанию для каждой группы пользователей. Учтите, что ранее установленные привилегии по умолчанию для групп пользователей будут сброшены."
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:60
 msgid "Repository creation"
 msgstr "Создание репозитория"
 
-#: rhodecode/templates/admin/permissions/permissions.html:91
+#: rhodecode/templates/admin/permissions/permissions_globals.html:68
+msgid "Repository creation with group write access"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:72
+msgid ""
+"Write permission to repository groups allows creating repositories inside "
+"that group"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:77
 msgid "User group creation"
 msgstr "Создание групп пользователей"
 
-#: rhodecode/templates/admin/permissions/permissions.html:99
+#: rhodecode/templates/admin/permissions/permissions_globals.html:85
 msgid "Repository forking"
 msgstr "Создание форка репозитория"
 
-#: rhodecode/templates/admin/permissions/permissions.html:107
+#: rhodecode/templates/admin/permissions/permissions_globals.html:93
 msgid "Registration"
 msgstr "Регистрация"
 
-#: rhodecode/templates/admin/permissions/permissions.html:115
+#: rhodecode/templates/admin/permissions/permissions_globals.html:101
 msgid "External auth account activation"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:133
-msgid "Default User Permissions"
-msgstr "Права по умолчанию"
-
-#: rhodecode/templates/admin/permissions/permissions.html:144
-#: rhodecode/templates/admin/users/user_edit.html:207
-msgid "Allowed IP addresses"
-msgstr "Разрешенные IP-адреса"
-
-#: rhodecode/templates/admin/permissions/permissions.html:158
-#: rhodecode/templates/admin/repos/repo_edit.html:340
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
-#: rhodecode/templates/admin/users/user_edit.html:175
-#: rhodecode/templates/admin/users/user_edit.html:220
-#: rhodecode/templates/admin/users_groups/users_groups.html:54
-#: rhodecode/templates/data_table/_dt_elements.html:122
-#: rhodecode/templates/data_table/_dt_elements.html:136
-msgid "delete"
-msgstr "удалить"
-
-#: rhodecode/templates/admin/permissions/permissions.html:159
-#: rhodecode/templates/admin/users/user_edit.html:221
+msgstr "Активация сторонней учетной записи"
+
+#: rhodecode/templates/admin/permissions/permissions_ips.html:1
+msgid "Default ip whitelist for all users"
+msgstr "Белый список IP для всех пользователей"
+
+#: rhodecode/templates/admin/permissions/permissions_ips.html:15
+#: rhodecode/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr "Подтвердите удаление ip %s"
 
-#: rhodecode/templates/admin/permissions/permissions.html:165
-#: rhodecode/templates/admin/users/user_edit.html:227
+#: rhodecode/templates/admin/permissions/permissions_ips.html:21
+#: rhodecode/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed"
 msgstr "Разрешены любые IP-адреса"
 
-#: rhodecode/templates/admin/permissions/permissions.html:176
-#: rhodecode/templates/admin/users/user_edit.html:238
+#: rhodecode/templates/admin/permissions/permissions_ips.html:32
+#: rhodecode/templates/admin/users/user_edit_ips.html:42
 msgid "New ip address"
 msgstr "Новый ip-адрес"
 
-#: rhodecode/templates/admin/permissions/permissions.html:184
-#: rhodecode/templates/admin/repos/repo_add_base.html:73
-#: rhodecode/templates/admin/repos/repo_edit.html:380
-#: rhodecode/templates/admin/users/user_edit.html:197
-#: rhodecode/templates/admin/users/user_edit.html:245
-msgid "Add"
-msgstr "Добавить"
-
-#: rhodecode/templates/admin/repos/repo_add.html:12
-#: rhodecode/templates/admin/repos/repo_add.html:16
-#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88
-#: rhodecode/templates/base/base.html:116
-#: rhodecode/templates/base/base.html:275
-msgid "Repositories"
-msgstr "Репозитории"
-
-#: rhodecode/templates/admin/repos/repo_add.html:19
-msgid "Add new"
-msgstr "Добавить новый"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:96
-#: rhodecode/templates/summary/summary.html:97
-msgid "Clone from"
-msgstr "Клонировать из"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:24
-#: rhodecode/templates/admin/repos/repo_edit.html:45
-msgid "Optional http[s] url from which repository should be cloned."
-msgstr "Опциональный url http[s], с которого требуется склонировать репозиторий."
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:33
-#: rhodecode/templates/forks/fork.html:51
-msgid "Optionaly select a group to put this repository into."
-msgstr "Опционально выбрать группу, в которую поместить данный репозиторий."
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:42
-msgid "Type of repository to create."
-msgstr "Тип создаваемого репозитория."
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:47
-#: rhodecode/templates/admin/repos/repo_edit.html:59
-#: rhodecode/templates/forks/fork.html:38
-msgid "Landing revision"
-msgstr "Ревизия для выгрузки"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:51
-#: rhodecode/templates/admin/repos/repo_edit.html:63
-#: rhodecode/templates/forks/fork.html:42
-msgid "Default revision for files page, downloads, whoosh and readme"
-msgstr "Ревизия по умолчанию, из которой будет производиться выгрузка файлов при скачивании"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:60
-#: rhodecode/templates/admin/repos/repo_edit.html:72
-#: rhodecode/templates/forks/fork.html:60
-msgid ""
-"Keep it short and to the point. Use a README file for longer descriptions."
-msgstr "Короткое и осмысленное. Для развернутого описания используйте файл README."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:8
-msgid "Edit repository"
-msgstr "Редактировать репозиторий"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:12
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:11
-#: rhodecode/templates/base/base.html:81
-#: rhodecode/templates/base/base.html:134
-#: rhodecode/templates/summary/summary.html:212
+#: rhodecode/templates/admin/permissions/permissions_perms.html:1
+msgid "Default user permissions overview"
+msgstr "Обзор прав пользователей по-умолчанию"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:5
+msgid "Add repository group"
+msgstr "Добавить группу репозиториев"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:14
+#: rhodecode/templates/base/base.html:71 rhodecode/templates/base/base.html:90
+msgid "Repository groups"
+msgstr "Группы репозиториев"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:36
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:8
+#: rhodecode/templates/admin/user_groups/user_group_add.html:35
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:7
+msgid "Group name"
+msgstr "Имя группы"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:54
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:26
+msgid "Group parent"
+msgstr "Родительская группа"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:63
+#: rhodecode/templates/admin/repos/repo_add_base.html:50
+msgid "Copy parent group permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:67
+#: rhodecode/templates/admin/repos/repo_add_base.html:54
+msgid "Copy permission set from parent repository group."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:5
+#, python-format
+msgid "%s Repository group settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:105
+msgid "Repository Groups"
+msgstr "Группы репозиториев"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:24
+msgid "Add Child Group"
+msgstr "Добавить подгруппу"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:53
+#: rhodecode/templates/admin/repos/repo_edit.html:15
+#: rhodecode/templates/admin/repos/repo_edit.html:43
+#: rhodecode/templates/admin/settings/settings.html:14
+#: rhodecode/templates/admin/settings/settings.html:36
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:42
+#: rhodecode/templates/base/base.html:77
+#: rhodecode/templates/base/base.html:159
 msgid "Settings"
 msgstr "Настройки"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:36
-msgid "Non-changeable id"
-msgstr "Неизменяемый id"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:41
-msgid "Clone uri"
-msgstr "URI для клонирования"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:54
-msgid "Optional select a group to put this repository into."
-msgstr "Опционально выбрать группу, в которую поместить данный репозиторий."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:119
-msgid "Change owner of this repository."
-msgstr "Изменить владельца репозитория"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:177
-msgid "Advanced settings"
-msgstr "Дополнительные настройки"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:180
-msgid "Statistics"
-msgstr "Статистика"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Reset current statistics"
-msgstr "Сбросить статистику"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Confirm to remove current statistics"
-msgstr "Подтвердите сброс статистики"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:187
-msgid "Fetched to rev"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:188
-msgid "Stats gathered"
-msgstr "Полученная статистика"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:196
-msgid "Remote"
-msgstr "Удалённый"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:200
-msgid "Pull changes from remote location"
-msgstr "Получить изменения с удалённой стороны"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:200
-msgid "Confirm to pull changes from remote side"
-msgstr "Подтвердите скачивание изменений"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:211
-msgid "Cache"
-msgstr "Кэш"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:215
-msgid "Invalidate repository cache"
-msgstr "Сбросить кэш репозитория"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:215
-msgid "Confirm to invalidate repository cache"
-msgstr "Подтвердите сброс кэша"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:218
-msgid ""
-"Manually invalidate cache for this repository. On first access repository "
-"will be cached again"
-msgstr "Ручной сброс кэша репозитория. При первом доступе кэш восстановится."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:223
-msgid "List of cached values"
-msgstr "Список кешированных значений"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:226
-msgid "Prefix"
-msgstr "Префикс"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:227
-msgid "Key"
-msgstr "Ключ"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:228
-#: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:124
-#: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/admin/users_groups/users_group_add.html:41
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-#: rhodecode/templates/admin/users_groups/users_groups.html:39
-msgid "Active"
-msgstr "Активный"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:243
-#: rhodecode/templates/base/base.html:292
-#: rhodecode/templates/base/base.html:293
-msgid "Public journal"
-msgstr "Общедоступный журнал"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:249
-msgid "Remove from public journal"
-msgstr "Удалить из общедоступного журнала"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:251
-msgid "Add to public journal"
-msgstr "Добавить в общедоступный журнал"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:256
-msgid ""
-"All actions made on this repository will be accessible to everyone in public"
-" journal"
-msgstr "Все производимые с этим репозиторием действия будут доступны для всех из общедоступного журнала"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:263
-msgid "Locking"
-msgstr "Блокировка"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
-msgid "Unlock locked repo"
-msgstr "Разблокировать репозиторий"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
-msgid "Confirm to unlock repository"
-msgstr "Подтвердите снятие блокировки с репозитория"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:271
-msgid "Lock repo"
-msgstr "Заблокировать репозиторий"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:271
-msgid "Confirm to lock repository"
-msgstr "Подтвердите блокировку репозитория"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:272
-msgid "Repository is not locked"
-msgstr "Репозиторий не заблокирован"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:277
-msgid ""
-"Force locking on repository. Works only when anonymous access is disabled"
-msgstr "Принудительная блокировка репозитория. Работает только при отключенном доступе для неавторизованных."
-
-#: rhodecode/templates/admin/repos/repo_edit.html:284
-msgid "Set as fork of"
-msgstr "Сделать форком от"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:289
-msgid "Set"
-msgstr "Набор"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:293
-msgid "Manually set this repository as a fork of another from the list"
-msgstr "Вручную сделать этот репозиторий форком выбранного из списка"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:308
-msgid "Remove this repository"
-msgstr "Удалить репозиторий"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:308
-msgid "Confirm to delete this repository"
-msgstr "Подтвердите удаление репозитория"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:310
-#, python-format
-msgid "this repository has %s fork"
-msgid_plural "this repository has %s forks"
-msgstr[0] "данный репозиторий имеет %s копию"
-msgstr[1] "данный репозиторий имеет %s копии"
-msgstr[2] "данный репозиторий имеет %s копий"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:311
-msgid "Detach forks"
-msgstr "Отсоединить fork'и"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:312
-msgid "Delete forks"
-msgstr "Удалить fork'и"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:315
-msgid ""
-"This repository will be renamed in a special way in order to be unaccesible "
-"for RhodeCode and VCS systems. If you need to fully delete it from file "
-"system please do it manually"
-msgstr "Этот репозитарий будет переименован таким образом, чтобы сделать его недоступным для RhodeCode и систем управления версиями. Если вам необходимо полностью удалить его из файловой системы, пожалуйста, сделайте это вручную"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:329
-msgid "Extra fields"
-msgstr "Дополнительные поля"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:341
-#, python-format
-msgid "Confirm to delete this field: %s"
-msgstr "Подтвердите удаление этого поля: %s"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:355
-msgid "New field key"
-msgstr "Ключ"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:363
-msgid "New field label"
-msgstr "Имя поля"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:366
-msgid "Enter short label"
-msgstr "Введите краткое имя поля"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:372
-msgid "New field description"
-msgstr "Описание поля"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:375
-msgid "Enter description of a field"
-msgstr "Введите описание поля"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:3
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3
-msgid "none"
-msgstr "ничего"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:4
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4
-msgid "read"
-msgstr "читать"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:5
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5
-msgid "write"
-msgstr "записывать"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:6
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6
-msgid "admin"
-msgstr "администратор"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:7
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7
-msgid "member"
-msgstr "участник"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-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:20
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35
-msgid "default"
-msgstr "по-умолчанию"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:33
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:58
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:55
-msgid "revoke"
-msgstr "отозвать"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:83
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81
-msgid "Add another member"
-msgstr "Добавить другого участника"
-
-#: rhodecode/templates/admin/repos/repos.html:5
-msgid "Repositories administration"
-msgstr "Администрирование репозиториев"
-
-#: rhodecode/templates/admin/repos/repos.html:88
-#: rhodecode/templates/admin/users/user_edit_my_account.html:185
-#: rhodecode/templates/admin/users/users.html:109
-#: rhodecode/templates/bookmarks/bookmarks.html:76
-#: rhodecode/templates/branches/branches.html:75
-#: rhodecode/templates/journal/journal.html:206
-#: rhodecode/templates/journal/journal.html:296
-#: rhodecode/templates/tags/tags.html:76
-msgid "No records found."
-msgstr "Записи не найдены."
-
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
-msgid "apply to children"
-msgstr "применить к дочерним"
-
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88
-msgid ""
-"Set or revoke permission to all children of that group, including non-"
-"private repositories and other groups"
-msgstr "Назначить или отозвать привилегии всем в группе, включая общедоступные репозитории и другие группы."
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
-#, python-format
-msgid "%s Group Dashboard"
-msgstr "Панель группы %s"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:9
-msgid "Home"
-msgstr "Домой"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:13
-msgid "with"
-msgstr "с"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
-msgid "Add repository group"
-msgstr "Добавить группу репозиториев"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16
-#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91
-msgid "Repository groups"
-msgstr "Группы репозиториев"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13
-msgid "Add new repository group"
-msgstr "Добавить новую группу репозиториев"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56
-msgid "Group parent"
-msgstr "Родительская группа"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59
-msgid "save"
-msgstr "сохранить"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
-msgid "Edit repository group"
-msgstr "Редактировать группу репозиториев"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13
-#, python-format
-msgid "Edit repository group %s"
-msgstr "Редактировать группу репозиториев %s"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27
-msgid "Add child group"
-msgstr "Добавить дочернюю группу"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68
-msgid ""
-"Enable lock-by-pulling on group. This option will be applied to all other "
-"groups and repositories inside"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
-msgid "Repository groups administration"
-msgstr "Администрирование групп репозиториев"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45
-msgid "Number of toplevel repositories"
-msgstr "Число репозиториев верхнего уровня"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64
-#: rhodecode/templates/admin/users_groups/users_groups.html:48
-#: rhodecode/templates/changeset/changeset_file_comment.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:171
-msgid "Edit"
-msgstr "Редактировать"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65
-#: rhodecode/templates/admin/users_groups/users_groups.html:49
-#: rhodecode/templates/base/perms_summary.html:29
-#: rhodecode/templates/base/perms_summary.html:60
-#: rhodecode/templates/base/perms_summary.html:62
-#: rhodecode/templates/data_table/_dt_elements.html:116
-#: rhodecode/templates/data_table/_dt_elements.html:117
-#: rhodecode/templates/data_table/_dt_elements.html:130
-#: rhodecode/templates/data_table/_dt_elements.html:131
-msgid "edit"
-msgstr "редактировать"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:54
+#: rhodecode/templates/admin/repos/repo_edit.html:49
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:43
+#: rhodecode/templates/admin/users/user_edit.html:44
+msgid "Advanced"
+msgstr "Дополнительно"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:1
+#, python-format
+msgid "Repository Group: %s"
+msgstr "Группа репозиториев: %s"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:6
+msgid "Top level repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:7
+msgid "Total repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:8
+msgid "Children groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_advanced.html:8
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+msgid "Created on"
+msgstr "Создано"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:192
 #, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
@@ -2828,880 +3147,1572 @@
 msgstr[1] "Подтвердите удаление группы %s содержащей %s репозиториев."
 msgstr[2] "Подтвердите удаление группы %s содержащей %s репозиториев."
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78
-msgid "There are no repository groups yet"
-msgstr "Группы репозиториев еще не созданы"
-
-#: rhodecode/templates/admin/settings/hooks.html:5
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:25
+msgid "Delete this repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:7
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:8
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:7
+#: rhodecode/templates/base/perms_summary.html:14
+msgid "none"
+msgstr "ничего"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:8
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:8
+#: rhodecode/templates/base/perms_summary.html:15
+msgid "read"
+msgstr "читать"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:9
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:10
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:9
+#: rhodecode/templates/base/perms_summary.html:16
+msgid "write"
+msgstr "записывать"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:10
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:10
+#: rhodecode/templates/base/perms_summary.html:17
+msgid "admin"
+msgstr "администратор"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:11
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:12
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:11
+msgid "user/user group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:28
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:45
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:24
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:37
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:28
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:45
+msgid "default"
+msgstr "по-умолчанию"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:34
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:71
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:43
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:68
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:34
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:71
+msgid "revoke"
+msgstr "отозвать"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:47
+msgid "delegated admin"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:97
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:94
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:97
+msgid "Add new"
+msgstr "Добавить новый"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:103
+msgid "apply to children"
+msgstr "применить к дочерним"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:107
+msgid "Both"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:108
+msgid ""
+"Set or revoke permission to all children of that group, including non-"
+"private repositories and other groups if selected."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:38
+msgid ""
+"Enable lock-by-pulling on group. This option will be applied to all other "
+"groups and repositories inside"
+msgstr "Включить lock-by-pulling для группы. Эта опция будет применена ко всем дочерним группам и репозиториям"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:4
+#, python-format
+msgid "%s Repository group dashboard"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:12
+msgid "Home"
+msgstr "Домой"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:16
+msgid "with"
+msgstr "с"
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:5
+msgid "Repository groups administration"
+msgstr "Администрирование групп репозиториев"
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+msgid "repository groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:52
+msgid "Number of toplevel repositories"
+msgstr "Число репозиториев верхнего уровня"
+
+#: rhodecode/templates/admin/repos/repo_add.html:5
+msgid "Add repository"
+msgstr "Добавить репозиторий"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:14
+msgid "Import existing repository ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:23
+#: rhodecode/templates/summary/summary.html:32
+msgid "Clone from"
+msgstr "Клонировать из"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:27
+msgid "Optional http[s] url from which repository should be cloned."
+msgstr "Опциональный url http[s], с которого требуется склонировать репозиторий."
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:36
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:76
+#: rhodecode/templates/forks/fork.html:45
+msgid ""
+"Keep it short and to the point. Use a README file for longer descriptions."
+msgstr "Короткое и осмысленное. Для развернутого описания используйте файл README."
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:45
+#: rhodecode/templates/forks/fork.html:55
+msgid "Optionaly select a group to put this repository into."
+msgstr "Опционально выбрать группу, в которую поместить данный репозиторий."
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:63
+msgid "Type of repository to create."
+msgstr "Тип создаваемого репозитория."
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:51
+#: rhodecode/templates/forks/fork.html:61
+msgid "Landing revision"
+msgstr "Ревизия для выгрузки"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:72
+msgid ""
+"Default revision for files page, downloads, full text search index and "
+"readme generation"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:9
+#, python-format
+msgid "%s Creating repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:16
+msgid "Creating repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:30
+#, python-format
+msgid ""
+"Repository \"%(repo_name)s\" is beeing created, you will be redirected when "
+"this process is finished.repo_name"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:42
+msgid ""
+"We're sorry but error occured during this operation. Please check your "
+"RhodeCode server logs, or contact administrator."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:8
+#, python-format
+msgid "%s repository settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:52
+msgid "Extra fields"
+msgstr "Дополнительные поля"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:55
+msgid "Caches"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:58
+msgid "Remote"
+msgstr "Удалённый"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:61
+#: rhodecode/templates/summary/statistics.html:11
+#: rhodecode/templates/summary/summary.html:178
+#: rhodecode/templates/summary/summary.html:179
+msgid "Statistics"
+msgstr "Статистика"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:1
+#: rhodecode/templates/summary/summary.html:25
+msgid "Fork of"
+msgstr "Форк от"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:6
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:5
+msgid "Set"
+msgstr "Набор"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:10
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:9
+msgid "Manually set this repository as a fork of another from the list"
+msgstr "Вручную сделать этот репозиторий форком выбранного из списка"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:24
+msgid "Public journal visibility"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:32
+msgid "Remove from public journal"
+msgstr "Удалить из общедоступного журнала"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:37
+msgid "Add to public journal"
+msgstr "Добавить в общедоступный журнал"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:43
+msgid ""
+"All actions made on this repository will be accessible to everyone in public"
+" journal"
+msgstr "Все производимые с этим репозиторием действия будут отображаться в общедостпном журнале "
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:49
+msgid "Change locking"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:56
+msgid "Confirm to unlock repository"
+msgstr "Подтвердите снятие блокировки с репозитория"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:58
+msgid "Unlock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:64
+msgid "Confirm to lock repository"
+msgstr "Подтвердите блокировку репозитория"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:66
+msgid "Lock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:68
+msgid "Repository is not locked"
+msgstr "Репозиторий не заблокирован"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:73
+msgid ""
+"Force locking on repository. Works only when anonymous access is disabled. "
+"Trigering a pull locks repository by user who pulled, only the same user can"
+" unlock by doing a push"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:83
+#: rhodecode/templates/data_table/_dt_elements.html:132
+#, python-format
+msgid "Confirm to delete this repository: %s"
+msgstr "Подтвердите удаление этого репозитория: %s"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:85
+msgid "Delete this repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:88
+#, python-format
+msgid "this repository has %s fork"
+msgid_plural "this repository has %s forks"
+msgstr[0] "данный репозиторий имеет %s копию"
+msgstr[1] "данный репозиторий имеет %s копии"
+msgstr[2] "данный репозиторий имеет %s копий"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:89
+msgid "Detach forks"
+msgstr "Отсоединить fork'и"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:90
+msgid "Delete forks"
+msgstr "Удалить fork'и"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:94
+msgid ""
+"This repository will be renamed in a special way in order to be unaccesible "
+"for RhodeCode and VCS systems. If you need to fully delete it from file "
+"system please do it manually"
+msgstr "Этот репозитарий будет переименован таким образом, чтобы сделать его недоступным для RhodeCode и систем управления версиями. Если вам необходимо полностью удалить его из файловой системы, пожалуйста, сделайте это вручную"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Invalidate repository cache"
+msgstr "Сбросить кэш репозитория"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Confirm to invalidate repository cache"
+msgstr "Подтвердите сброс кэша"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:7
+msgid ""
+"Manually invalidate cache for this repository. On first access repository "
+"will be cached again"
+msgstr "Ручной сброс кэша репозитория. При первом доступе кэш восстановится."
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:12
+msgid "List of cached values"
+msgstr "Список кешированных значений"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:15
+msgid "Prefix"
+msgstr "Префикс"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:16
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:6
+msgid "Key"
+msgstr "Ключ"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:17
+#: rhodecode/templates/admin/user_groups/user_group_add.html:52
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:24
+#: rhodecode/templates/admin/user_groups/user_groups.html:53
+#: rhodecode/templates/admin/users/user_add.html:91
+#: rhodecode/templates/admin/users/user_edit_profile.html:105
+#: rhodecode/templates/admin/users/users.html:57
+msgid "Active"
+msgstr "Активный"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:5
+msgid "Label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:19
+#, python-format
+msgid "Confirm to delete this field: %s"
+msgstr "Подтвердите удаление этого поля: %s"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:33
+msgid "New field key"
+msgstr "Ключ"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:41
+msgid "New field label"
+msgstr "Имя поля"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:44
+msgid "Enter short label"
+msgstr "Введите краткое имя поля"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:50
+msgid "New field description"
+msgstr "Описание поля"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:53
+msgid "Enter description of a field"
+msgstr "Введите описание поля"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:66
+msgid "Extra fields are disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:21
+msgid "private repository"
+msgstr "приватный репозиторий"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:3
+msgid "Remote url"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+msgid "Pull changes from remote location"
+msgstr "Получить изменения с удалённой стороны"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+msgid "Confirm to pull changes from remote side"
+msgstr "Подтвердите скачивание изменений"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:14
+msgid "This repository does not have any remote url set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "Non-changeable id"
+msgstr "Неизменяемый id"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "what is that ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:13
+msgid "URL by id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:14
+msgid ""
+"In case this repository is renamed or moved into another group the repository url changes.\n"
+"                               Using above url guarantees that this repository will allways be accessible under such url.\n"
+"                               Usefull for CI systems, or any other cases that you need to hardcode the url into 3rd party service."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:21
+msgid "Clone uri"
+msgstr "URI для клонирования"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:27
+#: rhodecode/templates/base/perms_summary.html:43
+#: rhodecode/templates/base/perms_summary.html:79
+#: rhodecode/templates/base/perms_summary.html:81
+#: rhodecode/templates/data_table/_dt_elements.html:124
+#: rhodecode/templates/data_table/_dt_elements.html:125
+#: rhodecode/templates/data_table/_dt_elements.html:152
+#: rhodecode/templates/data_table/_dt_elements.html:153
+#: rhodecode/templates/data_table/_dt_elements.html:169
+#: rhodecode/templates/data_table/_dt_elements.html:185
+msgid "edit"
+msgstr "редактировать"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:30
+msgid "new value"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:37
+msgid "http[s] url used for doing remote pulls."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:46
+msgid "Optional select a group to put this repository into."
+msgstr "Опционально выбрать группу, в которую поместить данный репозиторий."
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:55
+#: rhodecode/templates/forks/fork.html:65
+msgid "Default revision for files page, downloads, whoosh and readme"
+msgstr "Ревизия по умолчанию, из которой будет производиться выгрузка файлов при скачивании"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:65
+msgid "Change owner of this repository."
+msgstr "Изменить владельца репозитория"
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:6
+msgid "Processed commits"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:7
+msgid "Processed progress"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Reset statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Confirm to remove current statistics"
+msgstr "Подтвердите сброс статистики"
+
+#: rhodecode/templates/admin/repos/repos.html:5
+msgid "Repositories administration"
+msgstr "Администрирование репозиториев"
+
+#: rhodecode/templates/admin/repos/repos.html:54
+msgid "State"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings.html:5
 msgid "Settings administration"
 msgstr "Администрирование настроек"
 
-#: rhodecode/templates/admin/settings/hooks.html:24
-msgid "Built in hooks - read only"
-msgstr "Встроенные хуки - только для чтения"
-
-#: rhodecode/templates/admin/settings/hooks.html:40
-msgid "Custom hooks"
-msgstr "Пользовательские хуки"
-
-#: rhodecode/templates/admin/settings/hooks.html:56
-msgid "remove"
-msgstr "удалить"
-
-#: rhodecode/templates/admin/settings/hooks.html:88
-msgid "Failed to remove hook"
-msgstr "Не удалось удалить хук"
-
-#: rhodecode/templates/admin/settings/settings.html:26
-msgid "Remap and rescan repositories"
-msgstr "Переназначение и повторное сканирование"
-
-#: rhodecode/templates/admin/settings/settings.html:34
-msgid "Rescan option"
-msgstr "Опции пересканирования"
-
 #: rhodecode/templates/admin/settings/settings.html:40
-msgid ""
-"In case a repository was deleted from filesystem and there are leftovers in "
-"the database check this option to scan obsolete data in database and remove "
-"it."
-msgstr "В случае, если репозитарий был удален из файловой системы, и в базе данных осталась информация относящаяся к нему,  эта опция найдёт устаревшие данные в базе и удалит их."
+msgid "VCS"
+msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:41
-msgid "Destroy old data"
-msgstr "Уничтожить все данные"
+msgid "Remap and rescan"
+msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:43
-msgid ""
-"Rescan repositories location for new repositories. Also deletes obsolete if "
-"`destroy` flag is checked "
-msgstr "Обновить месторасположение хранилищ. Также удалить устаревшие хранилища если флаг \"уничтожить все данные\" установлен."
+msgid "Visual"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:45
+#: rhodecode/templates/admin/settings/settings_vcs.html:19
+msgid "Hooks"
+msgstr "Хуки"
+
+#: rhodecode/templates/admin/settings/settings.html:46
+msgid "Full text search"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:47
+msgid "System Info"
+msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:48
-msgid "Rescan repositories"
-msgstr "Пересканировать репозитории"
-
-#: rhodecode/templates/admin/settings/settings.html:54
-msgid "Whoosh indexing"
-msgstr "Индексация Whoosh"
-
-#: rhodecode/templates/admin/settings/settings.html:62
-msgid "Index build option"
-msgstr "Опции создания индекса"
-
-#: rhodecode/templates/admin/settings/settings.html:67
-msgid "Build from scratch"
-msgstr "Сборка с нуля"
-
-#: rhodecode/templates/admin/settings/settings.html:73
-msgid "Reindex"
-msgstr "Перестроить индекс"
-
-#: rhodecode/templates/admin/settings/settings.html:79
-msgid "Global application settings"
-msgstr "Глобальные настройки"
-
-#: rhodecode/templates/admin/settings/settings.html:88
+msgid "License"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:4
+msgid "Email prefix"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:5
+msgid "RhodeCode email from"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:6
+msgid "Error email from"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:7
+msgid "Error email recipients"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:9
+msgid "SMTP server"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:10
+msgid "SMTP username"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:11
+msgid "SMTP password"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:12
+msgid "SMTP port"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:14
+msgid "SMTP use TLS"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:15
+msgid "SMTP use SSL"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:16
+msgid "SMTP auth"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:31
+msgid "Send test email to"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:39
+msgid "Send"
+msgstr "Отправить"
+
+#: rhodecode/templates/admin/settings/settings_global.html:8
 msgid "Site branding"
 msgstr "Брендинг сайта"
 
-#: rhodecode/templates/admin/settings/settings.html:97
+#: rhodecode/templates/admin/settings/settings_global.html:12
+msgid "Set a custom title for your RhodeCode Service."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:18
 msgid "HTTP authentication realm"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:106
+msgstr "Приветствие для HTTP-аутентификации"
+
+#: rhodecode/templates/admin/settings/settings_global.html:27
 msgid "Google Analytics code"
 msgstr "Код Google Analytics"
 
-#: rhodecode/templates/admin/settings/settings.html:114
-#: rhodecode/templates/admin/settings/settings.html:195
-#: rhodecode/templates/admin/settings/settings.html:287
+#: rhodecode/templates/admin/settings/settings_global.html:36
+msgid "ReCaptcha public key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:40
+msgid "Public key for reCaptcha system."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:46
+msgid "ReCaptcha private key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:50
+msgid ""
+"Private key for reCaptcha system. Setting this value will enable captcha on "
+"registration"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:55
+#: rhodecode/templates/admin/settings/settings_license.html:42
+#: rhodecode/templates/admin/settings/settings_vcs.html:80
+#: rhodecode/templates/admin/settings/settings_visual.html:115
 msgid "Save settings"
 msgstr "Сохранить настройки"
 
-#: rhodecode/templates/admin/settings/settings.html:121
-msgid "Visualisation settings"
-msgstr "Настройки визуализации"
-
-#: rhodecode/templates/admin/settings/settings.html:129
-msgid "General"
-msgstr "Главное"
-
-#: rhodecode/templates/admin/settings/settings.html:134
-msgid "Use repository extra fields"
-msgstr "Использовать дополнительные поля в репозиториях"
-
-#: rhodecode/templates/admin/settings/settings.html:136
-msgid "Allows storing additional customized fields per repository."
-msgstr "Позволяет хранить дополнительные поля в репозиториях"
-
-#: rhodecode/templates/admin/settings/settings.html:139
-msgid "Show RhodeCode version"
-msgstr "Отображать версию RhodeCode"
-
-#: rhodecode/templates/admin/settings/settings.html:141
-msgid "Shows or hides displayed version of RhodeCode in the footer"
-msgstr "Показать или скрыть версию RhodeCode в нижней части страницы"
-
-#: rhodecode/templates/admin/settings/settings.html:146
-msgid "Dashboard items"
-msgstr "Элементы панели"
-
-#: rhodecode/templates/admin/settings/settings.html:150
+#: rhodecode/templates/admin/settings/settings_hooks.html:1
+msgid "Built in Mercurial hooks - read only"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:15
+msgid ""
+"Hooks can be used to trigger actions on certain events such as push / pull. "
+"They can trigger Python functions or external applications."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:19
+msgid "Custom hooks"
+msgstr "Пользовательские хуки"
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:69
+msgid "Failed to remove hook"
+msgstr "Не удалось удалить хук"
+
+#: rhodecode/templates/admin/settings/settings_license.html:2
+msgid "Currently you're using a free license, which is limited to 20 users."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:9
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "RhodeCode version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "License token"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "No license token"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:13
+msgid "License issued to"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:14
+msgid "License issued on"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "License users limit"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "unlimited"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:16
+msgid "License expires on"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:33
+msgid "License key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:37
+msgid "Paste your RhodeCode license key into that textarea."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:52
+msgid ""
+"Please enter following lines (if yet not present) into [app:main] section of"
+" your .ini file. The token below is autogenerated."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:6
+msgid "Rescan option"
+msgstr "Опции пересканирования"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:11
+msgid "Destroy old data"
+msgstr "Уничтожить все данные"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:13
 msgid ""
-"Number of items displayed in lightweight dashboard before pagination is "
-"shown."
-msgstr "Число показываемых пунктов, показанных в облегчённой приборной панели перед нумерацией страниц."
-
-#: rhodecode/templates/admin/settings/settings.html:155
-msgid "Icons"
-msgstr "Иконки"
-
-#: rhodecode/templates/admin/settings/settings.html:160
-msgid "Show public repo icon on repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:164
-msgid "Show private repo icon on repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:166
-msgid "Show public/private icons next to repositories names"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:172
-msgid "Meta-Tagging"
-msgstr "Метатегирование"
-
-#: rhodecode/templates/admin/settings/settings.html:177
-msgid "Stylify recognised metatags:"
-msgstr "Stylify распознал метатеги:"
-
-#: rhodecode/templates/admin/settings/settings.html:204
-msgid "VCS settings"
-msgstr "Настройки VCS"
-
-#: rhodecode/templates/admin/settings/settings.html:213
+"In case a repository was deleted from filesystem and it still exists in the "
+"database check this option to scan obsolete data in database and remove it."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:17
+msgid "Invalidate cache for all repositories"
+msgstr "Сбросить кэш для всех репозиториев"
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:19
+msgid ""
+"Each cache data for repositories will be cleaned with this option selected. "
+"Use this to reload data and clear cache keys."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:23
+msgid "Install GIT hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:25
+msgid ""
+"Verify if RhodeCodes GIT hooks are installed for each repository. Current "
+"hooks will be updated to latest version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:32
+msgid "Rescan Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:7
+msgid "Index build option"
+msgstr "Опции создания индекса"
+
+#: rhodecode/templates/admin/settings/settings_search.html:12
+msgid "Build from scratch"
+msgstr "Сборка с нуля"
+
+#: rhodecode/templates/admin/settings/settings_search.html:15
+msgid ""
+"This option completely reindex all the files within RhodeCode for proper "
+"fulltext search capabilities."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:21
+msgid "Reindex"
+msgstr "Перестроить индекс"
+
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "check for updates"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:5
+msgid "Python version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:6
+msgid "Platform"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:7
+msgid "GIT version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:8
+msgid "GIT path"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Upgrade info endpoint"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Note: please make sure this server can access this url"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:14
+msgid "Checking for updates..."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:22
+msgid "Python packages"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr "Веб"
 
-#: rhodecode/templates/admin/settings/settings.html:218
+#: rhodecode/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr "Запрашивать SSL для операций с VCS"
 
-#: rhodecode/templates/admin/settings/settings.html:220
+#: rhodecode/templates/admin/settings/settings_vcs.html:13
 msgid ""
-"RhodeCode will require SSL for pushing or pulling. If SSL is missing it will"
-" return HTTP Error 406: Not Acceptable"
-msgstr "RhodeCode будет запрашивать SSL для таких действий как push или pull. Если SSL не будет получен, то будет возвращена ошибка HTTP Error 406: Not Acceptable"
-
-#: rhodecode/templates/admin/settings/settings.html:226
-msgid "Hooks"
-msgstr "Хуки"
-
-#: rhodecode/templates/admin/settings/settings.html:231
-msgid "Update repository after push (hg update)"
-msgstr "Обновлять репозиторий после отправки (hg update)"
-
-#: rhodecode/templates/admin/settings/settings.html:235
+"Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
+"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr "Показывать размер репозитория после отправки"
 
-#: rhodecode/templates/admin/settings/settings.html:239
+#: rhodecode/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr "Логировать пользовательские команды отправки"
 
-#: rhodecode/templates/admin/settings/settings.html:243
+#: rhodecode/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
 msgstr "Логировать пользовательские команды получения"
 
-#: rhodecode/templates/admin/settings/settings.html:247
-msgid "Advanced setup"
-msgstr "Расширенные настройки"
-
-#: rhodecode/templates/admin/settings/settings.html:252
+#: rhodecode/templates/admin/settings/settings_vcs.html:36
+msgid "Update repository after push (hg update)"
+msgstr "Обновлять репозиторий после отправки (hg update)"
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:42
 msgid "Mercurial Extensions"
 msgstr "Расширения Mercurial"
 
-#: rhodecode/templates/admin/settings/settings.html:257
+#: rhodecode/templates/admin/settings/settings_vcs.html:47
 msgid "Enable largefiles extension"
 msgstr "Включить поддержку больших файлов"
 
-#: rhodecode/templates/admin/settings/settings.html:261
+#: rhodecode/templates/admin/settings/settings_vcs.html:51
 msgid "Enable hgsubversion extension"
 msgstr "Включить поддержку hgsubversion"
 
-#: rhodecode/templates/admin/settings/settings.html:263
+#: rhodecode/templates/admin/settings/settings_vcs.html:53
 msgid ""
-"Requires hgsubversion library installed. Allows cloning from svn remote "
-"locations"
-msgstr "Необходимые библиотеки hgsubversion установлены. Разрешено клонировать из svn репозиториев."
-
-#: rhodecode/templates/admin/settings/settings.html:274
+"Requires hgsubversion library to be installed. Allows cloning remote SVN "
+"repositories and migrates them to Mercurial type."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:64
 msgid "Repositories location"
 msgstr "Расположение репозитариев"
 
-#: rhodecode/templates/admin/settings/settings.html:279
+#: rhodecode/templates/admin/settings/settings_vcs.html:69
 msgid ""
 "Click to unlock. You must restart RhodeCode in order to make this setting "
 "take effect."
 msgstr "Нажмите для разблокирования. Изменения вступят в силу после перезагрузки RhodeCode."
 
-#: rhodecode/templates/admin/settings/settings.html:280
-#: rhodecode/templates/base/base.html:143
-msgid "Unlock"
-msgstr "Разблокировать"
-
-#: rhodecode/templates/admin/settings/settings.html:282
+#: rhodecode/templates/admin/settings/settings_vcs.html:72
+msgid ""
+"Filesystem location where repositories should be stored. After changing this"
+" value a restart and rescan of the repository folder are required."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:8
+msgid "General"
+msgstr "Главное"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:13
+msgid "Use repository extra fields"
+msgstr "Использовать дополнительные поля в репозиториях"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:15
+msgid "Allows storing additional customized fields per repository."
+msgstr "Позволяет хранить дополнительные поля в репозиториях"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:18
+msgid "Show RhodeCode version"
+msgstr "Отображать версию RhodeCode"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:20
+msgid "Shows or hides a version number of RhodeCode displayed in the footer."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:24
+msgid "Use Gravatars in RhodeCode"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:30
+msgid ""
+"Gravatar url allows you to use other avatar server application.\n"
+"                                                        Following variables of the URL will be replaced accordingly.\n"
+"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {email}     user email,\n"
+"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
+"                                                        {size}      size of the image that is expected from the server application,\n"
+"                                                        {netloc}    network location/server host of running RhodeCode server"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:42
+msgid ""
+"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
+"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {user}   current user username,\n"
+"                                                        {netloc} network location/server host of running RhodeCode server,\n"
+"                                                        {repo}   full repository name,\n"
+"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:54
+msgid "Dashboard items"
+msgstr "Элементы панели"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:58
+msgid ""
+"Number of items displayed in the main page dashboard before pagination is "
+"shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:64
+msgid "Admin pages items"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:68
 msgid ""
-"Location where repositories are stored. After changing this value a restart,"
-" and rescan is required"
-msgstr "Расположение репозитариев сохранено. После изменения расположения необходимо перезагрузить и пересканировать"
-
-#: rhodecode/templates/admin/settings/settings.html:303
-msgid "Test Email"
-msgstr "Тестовый E-mail"
-
-#: rhodecode/templates/admin/settings/settings.html:311
-msgid "Email to"
-msgstr "Написать E-mail"
-
-#: rhodecode/templates/admin/settings/settings.html:319
-msgid "Send"
-msgstr "Отправить"
-
-#: rhodecode/templates/admin/settings/settings.html:325
-msgid "System Info and Packages"
-msgstr "Информация о системе и пакеты"
-
-#: rhodecode/templates/admin/settings/settings.html:328
-#: rhodecode/templates/changelog/changelog.html:51
-msgid "Show"
-msgstr "Показать"
+"Number of items displayed in the admin pages grids before pagination is "
+"shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:74
+msgid "Icons"
+msgstr "Иконки"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:79
+msgid "Show public repo icon on repositories"
+msgstr "Показывать иконки публичных репозиториев"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:83
+msgid "Show private repo icon on repositories"
+msgstr "Показывать иконки приватных репозиториев"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:85
+msgid "Show public/private icons next to repositories names."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:91
+msgid "Meta-Tagging"
+msgstr "Метатегирование"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:96
+msgid "Stylify recognised meta tags:"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:110
+msgid ""
+"Parses meta tags from repository description field and turns them into "
+"colored tags."
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:5
+msgid "Add user group"
+msgstr "Добавить группу пользователей"
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:13
+#: rhodecode/templates/base/base.html:73 rhodecode/templates/base/base.html:93
+msgid "User groups"
+msgstr "Группы пользователей"
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:28
+msgid "Add User Group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:19
+msgid "Short, optional description for this user group."
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:5
+#, python-format
+msgid "%s user group settings"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:14
+msgid "User Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:44
+#: rhodecode/templates/admin/users/user_edit.html:45
+msgid "Default permissions"
+msgstr "Стандартные привилегии"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:6
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:32
+#: rhodecode/templates/admin/user_groups/user_groups.html:52
+msgid "Members"
+msgstr "Участники"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:1
+#, python-format
+msgid "User Group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:19
+#: rhodecode/templates/data_table/_dt_elements.html:176
+#, python-format
+msgid "Confirm to delete this user group: %s"
+msgstr "Подтвердите удаление следующей группы пользователей: %s"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:21
+msgid "Delete this user group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_members.html:15
+msgid "No members yet"
+msgstr "Нет участников"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:40
+msgid "Chosen group members"
+msgstr "Выбранные участники группы"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:43
+msgid "Remove all elements"
+msgstr "Удалить всё"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:53
+msgid "Available members"
+msgstr "Доступные участники"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:56
+msgid "Add all elements"
+msgstr "Добавить всё"
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:5
+msgid "User groups administration"
+msgstr "Администрирование групп пользователей"
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+msgid "user groups"
+msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr "Добавить пользователя"
 
-#: rhodecode/templates/admin/users/user_add.html:10
-#: rhodecode/templates/admin/users/user_edit.html:11
-#: rhodecode/templates/base/base.html:76
+#: rhodecode/templates/admin/users/user_add.html:13
+#: rhodecode/templates/admin/users/user_edit.html:14
+#: rhodecode/templates/base/base.html:72
 msgid "Users"
 msgstr "Пользователи"
 
-#: rhodecode/templates/admin/users/user_add.html:12
-#: rhodecode/templates/admin/users/users.html:23
-msgid "Add new user"
-msgstr "Добавить нового пользователя"
-
-#: rhodecode/templates/admin/users/user_add.html:50
+#: rhodecode/templates/admin/users/user_add.html:15
+#: rhodecode/templates/admin/users/users.html:27
+msgid "Add User"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_add.html:53
 msgid "Password confirmation"
 msgstr "Подтверждение пароля"
 
 #: rhodecode/templates/admin/users/user_edit.html:5
-msgid "Edit user"
-msgstr "Редактировать пользователя"
-
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#, python-format
-msgid "Edit %s"
-msgstr "Редактировать %s"
-
-#: rhodecode/templates/admin/users/user_edit.html:34
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:10
-msgid "Change your avatar at"
-msgstr "Измените аватарку через сайт"
-
-#: rhodecode/templates/admin/users/user_edit.html:35
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:11
-msgid "Using"
-msgstr "Используется"
-
-#: rhodecode/templates/admin/users/user_edit.html:43
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:20
-msgid "API key"
-msgstr "API ключ"
-
-#: rhodecode/templates/admin/users/user_edit.html:50
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25
-msgid "Current IP"
-msgstr "Текущий IP"
-
-#: rhodecode/templates/admin/users/user_edit.html:70
-msgid "LDAP DN"
-msgstr "LDAP DN"
-
-#: rhodecode/templates/admin/users/user_edit.html:79
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
-msgid "New password"
-msgstr "Новый пароль"
-
-#: rhodecode/templates/admin/users/user_edit.html:88
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
+#, python-format
+msgid "%s user settings"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:46
+msgid "Emails"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:47
+msgid "Ip whitelist"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:1
+#, python-format
+msgid "User: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_profile.html:51
+msgid "Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:9
+msgid "Last Login"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:10
+msgid "Member of User groups"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:160
+#, python-format
+msgid "Confirm to delete this user: %s"
+msgstr "Подтвердите удаление пользователя %s"
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:23
+msgid "Delete this user"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_ips.html:8
+#, python-format
+msgid "Inherited from %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:8
+msgid "Change avatar at"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:12
+msgid "Missing email, please update this user email address."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:27
+#, python-format
+msgid ""
+"This user is in an external Source of Record (%s); some details cannot be "
+"managed here."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:60
+msgid "Name in Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr "Подтвердите новый пароль"
 
-#: rhodecode/templates/admin/users/user_edit.html:163
-msgid "Email addresses"
-msgstr "Адрес E-mail"
-
-#: rhodecode/templates/admin/users/user_edit.html:176
-#, python-format
-msgid "Confirm to delete this email: %s"
-msgstr "Подтвердите удаление E-mail: %s"
-
-#: rhodecode/templates/admin/users/user_edit.html:190
-msgid "New email address"
-msgstr "Новый E-mail"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:254
-msgid "My account"
-msgstr "Мой аккаунт"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:9
-msgid "My Account"
-msgstr "Мой Аккаунт"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:35
-msgid "My permissions"
-msgstr "Мои привилегии"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:54
-msgid "My repos"
-msgstr "Мои репозитории"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:41
-msgid "My pull requests"
-msgstr "Мои pull-request'ы"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4
-msgid "Show closed pull requests"
-msgstr "Отображать закрытые pull-request'ы"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6
-msgid "Opened by me"
-msgstr "Открыто мной"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
-#, python-format
-msgid "Pull request #%s opened on %s"
-msgstr "Pull-request #%s открыт %s"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45
-#: rhodecode/templates/pullrequests/pullrequest_data.html:11
-#: rhodecode/templates/pullrequests/pullrequest_show.html:27
-#: rhodecode/templates/pullrequests/pullrequest_show.html:42
-msgid "Closed"
-msgstr "Закрыто"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23
-msgid "Confirm to delete this pull request"
-msgstr "Подтвердите удаление этого pull-request'а"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51
-msgid "Nothing here yet"
-msgstr "Здесь ничего нет"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34
-msgid "I participate in"
-msgstr "Я участвую в"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42
-#: rhodecode/templates/pullrequests/pullrequest_data.html:8
-#, python-format
-msgid "Pull request #%s opened by %s on %s"
-msgstr "Pull-request #%s открыт пользователем %s %s"
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "Администрирование пользователей"
 
-#: rhodecode/templates/admin/users/users.html:9
+#: rhodecode/templates/admin/users/users.html:13
 msgid "users"
 msgstr "пользователи"
 
-#: rhodecode/templates/admin/users/users.html:80
+#: rhodecode/templates/admin/users/users.html:54
 msgid "Firstname"
 msgstr "Имя"
 
-#: rhodecode/templates/admin/users/users.html:81
+#: rhodecode/templates/admin/users/users.html:55
 msgid "Lastname"
 msgstr "Фамилия"
 
-#: rhodecode/templates/admin/users/users.html:82
+#: rhodecode/templates/admin/users/users.html:56
 msgid "Last login"
 msgstr "Последний вход"
 
-#: rhodecode/templates/admin/users_groups/users_group_add.html:5
-msgid "Add user group"
-msgstr "Добавить группу пользователей"
-
-#: rhodecode/templates/admin/users_groups/users_group_add.html:10
-#: rhodecode/templates/admin/users_groups/users_groups.html:11
-#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94
-msgid "User groups"
-msgstr "Группы пользователей"
-
-#: rhodecode/templates/admin/users_groups/users_group_add.html:12
-#: rhodecode/templates/admin/users_groups/users_groups.html:26
-msgid "Add new user group"
-msgstr "Добавить новую группу пользователей"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:5
-msgid "Edit user group"
-msgstr "Редактировать группу пользователей"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:11
-msgid "UserGroups"
-msgstr "Группы пользователей"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:50
-#: rhodecode/templates/admin/users_groups/users_groups.html:38
-msgid "Members"
-msgstr "Участники"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:58
-msgid "Chosen group members"
-msgstr "Выбранные участники группы"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:61
-msgid "Remove all elements"
-msgstr "Удалить всё"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:75
-msgid "Available members"
-msgstr "Доступные участники"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:79
-msgid "Add all elements"
-msgstr "Добавить всё"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:109
-msgid "No members yet"
-msgstr "Нет участников"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:117
-msgid "Global Permissions"
-msgstr "Глобальные права доступа"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:5
-msgid "User groups administration"
-msgstr "Администрирование групп пользователей"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:55
-#, python-format
-msgid "Confirm to delete this user group: %s"
-msgstr "Подтвердите удаление следующей группы пользователей: %s"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:62
-msgid "There are no user groups yet"
-msgstr "Группы пользователей еще не созданы"
-
-#: rhodecode/templates/base/base.html:42
+#: rhodecode/templates/admin/users/users.html:59
+msgid "Auth type"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:37
 #, python-format
 msgid "Server instance: %s"
 msgstr "Экземпляр сервера: %s"
 
-#: rhodecode/templates/base/base.html:52
-msgid "Report a bug"
-msgstr "Сообщить об ошибке"
-
-#: rhodecode/templates/base/base.html:121
-#: rhodecode/templates/data_table/_dt_elements.html:9
+#: rhodecode/templates/base/base.html:46
+msgid "Support"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:131
+msgid "Create fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:142
 #: rhodecode/templates/data_table/_dt_elements.html:11
-#: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/summary/summary.html:8
+#: rhodecode/templates/data_table/_dt_elements.html:15
+#: rhodecode/templates/summary/summary.html:11
 msgid "Summary"
 msgstr "Общие сведения"
 
-#: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/changelog/changelog.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:17
+#: rhodecode/templates/base/base.html:143
+#: rhodecode/templates/changelog/changelog.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
-#: rhodecode/templates/data_table/_dt_elements.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:23
 msgid "Changelog"
 msgstr "История изменений"
 
-#: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/data_table/_dt_elements.html:25
+#: rhodecode/templates/base/base.html:144
 #: rhodecode/templates/data_table/_dt_elements.html:27
-#: rhodecode/templates/data_table/_dt_elements.html:29
-#: rhodecode/templates/files/files.html:12
+#: rhodecode/templates/data_table/_dt_elements.html:31
+#: rhodecode/templates/files/files.html:15
 msgid "Files"
 msgstr "Файлы"
 
-#: rhodecode/templates/base/base.html:125
+#: rhodecode/templates/base/base.html:146
 msgid "Switch To"
 msgstr "Переключиться на"
 
-#: rhodecode/templates/base/base.html:127
-#: rhodecode/templates/base/base.html:279
-msgid "loading..."
-msgstr "Загрузка..."
-
-#: rhodecode/templates/base/base.html:131
+#: rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:155
 msgid "Options"
 msgstr "Опции"
 
-#: rhodecode/templates/base/base.html:137
+#: rhodecode/templates/base/base.html:163
 #: rhodecode/templates/forks/forks_data.html:21
 msgid "Compare fork"
 msgstr "Сравнить форк"
 
-#: rhodecode/templates/base/base.html:139
-#: rhodecode/templates/base/base.html:312
-#: rhodecode/templates/search/search.html:14
-#: rhodecode/templates/search/search.html:54
+#: rhodecode/templates/base/base.html:165
+#: rhodecode/templates/bookmarks/bookmarks.html:58
+#: rhodecode/templates/bookmarks/bookmarks_data.html:13
+#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/branches/branches_data.html:13
+#: rhodecode/templates/tags/tags.html:58
+#: rhodecode/templates/tags/tags_data.html:13
+msgid "Compare"
+msgstr "Сравнить"
+
+#: rhodecode/templates/base/base.html:167
+#: rhodecode/templates/base/base.html:334
+#: rhodecode/templates/search/search.html:17
+#: rhodecode/templates/search/search.html:57
 msgid "Search"
 msgstr "Поиск"
 
-#: rhodecode/templates/base/base.html:145
+#: rhodecode/templates/base/base.html:171
+msgid "Unlock"
+msgstr "Разблокировать"
+
+#: rhodecode/templates/base/base.html:173
 msgid "Lock"
 msgstr "Заблокировать"
 
-#: rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:181
 msgid "Follow"
 msgstr "Наблюдать"
 
-#: rhodecode/templates/base/base.html:154
+#: rhodecode/templates/base/base.html:182
 msgid "Unfollow"
 msgstr "Не наблюдать"
 
-#: rhodecode/templates/base/base.html:157
-#: rhodecode/templates/data_table/_dt_elements.html:33
+#: rhodecode/templates/base/base.html:185
 #: rhodecode/templates/data_table/_dt_elements.html:35
-#: rhodecode/templates/data_table/_dt_elements.html:37
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/forks/fork.html:9
+#: rhodecode/templates/data_table/_dt_elements.html:39
+#: rhodecode/templates/forks/fork.html:12
 msgid "Fork"
 msgstr "Форк"
 
-#: rhodecode/templates/base/base.html:159
+#: rhodecode/templates/base/base.html:187
 msgid "Create Pull Request"
 msgstr "Создать Pull запрос"
 
-#: rhodecode/templates/base/base.html:165
-msgid "Show Pull Requests"
-msgstr "Показать Pull запросы"
-
-#: rhodecode/templates/base/base.html:165
-msgid "Pull Requests"
-msgstr "Pull-request'ы"
-
-#: rhodecode/templates/base/base.html:202
+#: rhodecode/templates/base/base.html:193
+#, python-format
+msgid "Show Pull Requests for %s"
+msgstr "Показать pull-request'ы для %s"
+
+#: rhodecode/templates/base/base.html:230
 msgid "Not logged in"
 msgstr "Не авторизован"
 
-#: rhodecode/templates/base/base.html:209
+#: rhodecode/templates/base/base.html:237
 msgid "Login to your account"
 msgstr "Авторизоваться"
 
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/templates/base/base.html:260
 msgid "Forgot password ?"
 msgstr "Забыли пароль?"
 
-#: rhodecode/templates/base/base.html:255
+#: rhodecode/templates/base/base.html:283
 msgid "Log Out"
 msgstr "Выход"
 
-#: rhodecode/templates/base/base.html:274
-msgid "Switch repository"
-msgstr "Переключить репозиторий"
-
-#: rhodecode/templates/base/base.html:286
+#: rhodecode/templates/base/base.html:308
 msgid "Show recent activity"
 msgstr "Показать последнюю активность"
 
-#: rhodecode/templates/base/base.html:287
+#: rhodecode/templates/base/base.html:309
 #: rhodecode/templates/journal/journal.html:4
 msgid "Journal"
 msgstr "Журнал"
 
-#: rhodecode/templates/base/base.html:298
+#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:315
+msgid "Public journal"
+msgstr "Общедоступный журнал"
+
+#: rhodecode/templates/base/base.html:320
 msgid "Show public gists"
 msgstr "Показать публичные записи"
 
-#: rhodecode/templates/base/base.html:303
+#: rhodecode/templates/base/base.html:321
+msgid "Gists"
+msgstr "Gist"
+
+#: rhodecode/templates/base/base.html:324
+msgid "Create new gist"
+msgstr "Создать новую запись"
+
+#: rhodecode/templates/base/base.html:325
 msgid "All public gists"
 msgstr "Все публичные записи"
 
-#: rhodecode/templates/base/base.html:305
+#: rhodecode/templates/base/base.html:327
 msgid "My public gists"
 msgstr "Мои публичные записи"
 
-#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/base/base.html:328
 msgid "My private gists"
 msgstr "Мои приватные записи"
 
-#: rhodecode/templates/base/base.html:311
+#: rhodecode/templates/base/base.html:333
 msgid "Search in repositories"
-msgstr "Искать в репозитариях"
+msgstr "Поиск по репозиториям"
+
+#: rhodecode/templates/base/base.html:394
+msgid "No matches found"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:522
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:531
+msgid "Site-wide shortcuts"
+msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:14
-msgid "Inherit default permissions"
-msgstr "Наследовать полномочия по умолчаинию"
-
-#: rhodecode/templates/base/default_perms_box.html:18
+msgid "Inherit from defaults"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:19
 #, python-format
 msgid ""
-"Select to inherit permissions from %s settings. With this selected below "
-"options does not apply."
-msgstr "Выберите, чтобы унаследовать права из настроек %s. В этом случае опции ниже не будут применены."
-
-#: rhodecode/templates/base/default_perms_box.html:26
+"Select to inherit permissions from %s permissions settings, and default IP "
+"address whitelist."
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:28
 msgid "Create repositories"
 msgstr "Создать репозитории"
 
-#: rhodecode/templates/base/default_perms_box.html:30
+#: rhodecode/templates/base/default_perms_box.html:33
 msgid "Select this option to allow repository creation for this user"
 msgstr "Опция разрешает пользователю создавать репозитарии"
 
-#: rhodecode/templates/base/default_perms_box.html:35
+#: rhodecode/templates/base/default_perms_box.html:40
 msgid "Create user groups"
 msgstr "Создавать группы пользователей"
 
-#: rhodecode/templates/base/default_perms_box.html:39
+#: rhodecode/templates/base/default_perms_box.html:45
 msgid "Select this option to allow user group creation for this user"
 msgstr "Опция разрешает пользователю создавать группы пользователей"
 
-#: rhodecode/templates/base/default_perms_box.html:44
+#: rhodecode/templates/base/default_perms_box.html:52
 msgid "Fork repositories"
 msgstr "Создавать fork от репозиториев"
 
-#: rhodecode/templates/base/default_perms_box.html:48
+#: rhodecode/templates/base/default_perms_box.html:57
 msgid "Select this option to allow repository forking for this user"
 msgstr "Выберите эту опцию чтобы разрешить данному пользователю создавать fork'и репозиториев"
 
-#: rhodecode/templates/base/perms_summary.html:11
+#: rhodecode/templates/base/perms_summary.html:13
+msgid "show"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:22
 msgid "No permissions defined yet"
-msgstr "Права доступа еще не назначены"
-
-#: rhodecode/templates/base/perms_summary.html:19
-#: rhodecode/templates/base/perms_summary.html:38
+msgstr "Привилегии еще не назначены"
+
+#: rhodecode/templates/base/perms_summary.html:30
+#: rhodecode/templates/base/perms_summary.html:54
 msgid "Permission"
 msgstr "Привилегия"
 
-#: rhodecode/templates/base/perms_summary.html:20
-#: rhodecode/templates/base/perms_summary.html:39
+#: rhodecode/templates/base/perms_summary.html:32
+#: rhodecode/templates/base/perms_summary.html:56
 msgid "Edit Permission"
-msgstr "Изменить права доступа"
-
-#: rhodecode/templates/base/root.html:44
+msgstr "Изменить привилегии"
+
+#: rhodecode/templates/base/perms_summary.html:90
+msgid "No permission defined"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:47
 msgid "Add another comment"
 msgstr "Добавить другой комментарий"
 
-#: rhodecode/templates/base/root.html:45
-#: rhodecode/templates/data_table/_dt_elements.html:147
+#: rhodecode/templates/base/root.html:48
+#: rhodecode/templates/data_table/_dt_elements.html:216
 msgid "Stop following this repository"
 msgstr "Отменить наблюдение за репозиторием"
 
-#: rhodecode/templates/base/root.html:46
+#: rhodecode/templates/base/root.html:49
 msgid "Start following this repository"
 msgstr "Наблюдать за репозиторием"
 
-#: rhodecode/templates/base/root.html:47
+#: rhodecode/templates/base/root.html:50
 msgid "Group"
 msgstr "Группа"
 
-#: rhodecode/templates/base/root.html:48
+#: rhodecode/templates/base/root.html:51
 msgid "members"
 msgstr "участники"
 
-#: rhodecode/templates/base/root.html:49
-#: rhodecode/templates/pullrequests/pullrequest.html:203
+#: rhodecode/templates/base/root.html:52
+#: rhodecode/templates/pullrequests/pullrequest.html:202
 msgid "Loading ..."
 msgstr "Загрузка..."
 
-#: rhodecode/templates/base/root.html:50
+#: rhodecode/templates/base/root.html:53
+msgid "loading ..."
+msgstr "загрузка..."
+
+#: rhodecode/templates/base/root.html:54
 msgid "Search truncated"
 msgstr "Поиск усечен"
 
-#: rhodecode/templates/base/root.html:51
+#: rhodecode/templates/base/root.html:55
 msgid "No matching files"
 msgstr "Нет совпадений"
 
-#: rhodecode/templates/base/root.html:52
-#: rhodecode/templates/changelog/changelog.html:45
+#: rhodecode/templates/base/root.html:56
+#: rhodecode/templates/changelog/changelog.html:51
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
 msgid "Open new pull request"
 msgstr "Создать новый pull запрос"
 
-#: rhodecode/templates/base/root.html:53
+#: rhodecode/templates/base/root.html:57
 msgid "Open new pull request for selected changesets"
 msgstr "Открыть новый pull-request для выделенных наборов изменений"
 
-#: rhodecode/templates/base/root.html:54
+#: rhodecode/templates/base/root.html:58
 msgid "Show selected changesets __S -> __E"
 msgstr "Показать выбранные наборы изменений: __S -> __E"
 
-#: rhodecode/templates/base/root.html:55
+#: rhodecode/templates/base/root.html:59
 msgid "Show selected changeset __S"
 msgstr "Показать выбранный набор изменений: __S"
 
-#: rhodecode/templates/base/root.html:56
+#: rhodecode/templates/base/root.html:60
 msgid "Selection link"
 msgstr "Ссылка выбора"
 
-#: rhodecode/templates/base/root.html:57
+#: rhodecode/templates/base/root.html:61
 #: rhodecode/templates/changeset/diff_block.html:8
 msgid "Collapse diff"
 msgstr "Свернуть сравнение"
 
-#: rhodecode/templates/base/root.html:58
+#: rhodecode/templates/base/root.html:62
 msgid "Expand diff"
 msgstr "Раскрыть сравнение"
 
-#: rhodecode/templates/base/root.html:59
+#: rhodecode/templates/base/root.html:63
 msgid "Failed to revoke permission"
 msgstr "Не удалось отозвать привилегии"
 
+#: rhodecode/templates/base/root.html:64
+msgid "confirm to revoke permission for {0}: {1} ?"
+msgstr "подтвердите удаление привилегии для {0}: {1}"
+
+#: rhodecode/templates/base/root.html:68
+msgid "specify changeset"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr "Закладки %s"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:26
-msgid "Compare bookmarks"
-msgstr "Сравнить закладки"
-
-#: rhodecode/templates/bookmarks/bookmarks.html:51
-#: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:50
-#: rhodecode/templates/branches/branches_data.html:8
+#: rhodecode/templates/bookmarks/bookmarks.html:29
+msgid "Compare Bookmarks"
+msgstr ""
+
+#: rhodecode/templates/bookmarks/bookmarks.html:55
+#: rhodecode/templates/bookmarks/bookmarks_data.html:10
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:10
 #: rhodecode/templates/changelog/changelog_summary_data.html:8
-#: rhodecode/templates/tags/tags.html:51
-#: rhodecode/templates/tags/tags_data.html:8
+#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/tags/tags_data.html:10
 msgid "Author"
 msgstr "Автор"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:52
-#: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:51
-#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/bookmarks/bookmarks.html:56
+#: rhodecode/templates/bookmarks/bookmarks_data.html:12
+#: rhodecode/templates/branches/branches.html:55
+#: rhodecode/templates/branches/branches_data.html:12
 #: rhodecode/templates/changelog/changelog_summary_data.html:5
-#: rhodecode/templates/tags/tags.html:52
-#: rhodecode/templates/tags/tags_data.html:9
+#: rhodecode/templates/tags/tags.html:56
+#: rhodecode/templates/tags/tags_data.html:12
 msgid "Revision"
 msgstr "Ревизия"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:54
-#: rhodecode/templates/bookmarks/bookmarks_data.html:10
-#: rhodecode/templates/branches/branches.html:53
-#: rhodecode/templates/branches/branches_data.html:10
-#: rhodecode/templates/tags/tags.html:54
-#: rhodecode/templates/tags/tags_data.html:10
-msgid "Compare"
-msgstr "Сравнить"
-
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
 msgstr "Ветки %s"
 
-#: rhodecode/templates/branches/branches.html:26
-msgid "Compare branches"
-msgstr "Сравнить ветки"
+#: rhodecode/templates/branches/branches.html:29
+msgid "Compare Branches"
+msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr "Логи изменений %s"
 
-#: rhodecode/templates/changelog/changelog.html:19
+#: rhodecode/templates/changelog/changelog.html:21
 #, python-format
 msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
-msgstr[0] "Показано %d из %d ревизий"
-msgstr[1] "Показано %d из %d ревизий"
+msgstr[0] "Показана %d из %d ревизий"
+msgstr[1] "Показаны %d из %d ревизий"
 msgstr[2] "Показаны %d из %d ревизий "
 
-#: rhodecode/templates/changelog/changelog.html:39
+#: rhodecode/templates/changelog/changelog.html:43
 msgid "Clear selection"
 msgstr "Очистить выбор"
 
-#: rhodecode/templates/changelog/changelog.html:42
+#: rhodecode/templates/changelog/changelog.html:47
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 msgstr "Сравнить fork с %s"
 
-#: rhodecode/templates/changelog/changelog.html:42
-msgid "Compare fork with parent"
-msgstr "Сравнить fork с родительским репозиторием"
-
-#: rhodecode/templates/changelog/changelog.html:78
-#: rhodecode/templates/changelog/changelog_summary_data.html:28
-#, python-format
-msgid "Click to open associated pull request #%s"
-msgstr "Нажмите для открытия ассоциированного запроса на внесение изменений #%s"
-
-#: rhodecode/templates/changelog/changelog.html:102
-#: rhodecode/templates/summary/summary.html:403
-msgid "Show more"
-msgstr "Показать еще"
-
-#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changelog/changelog.html:49
+#, python-format
+msgid "Compare fork with Parent(%s)"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:56
+msgid "Show"
+msgstr "Показать"
+
+#: rhodecode/templates/changelog/changelog.html:82
+#: rhodecode/templates/changelog/changelog_summary_data.html:19
+#, python-format
+msgid ""
+"Changeset status: %s\n"
+"Click to open associated pull request #%s"
+msgstr "Статус набора изенений: %s⏎\nКликрните, чтобы перейти к соответствующему pull-request'у #%s"
+
+#: rhodecode/templates/changelog/changelog.html:86
+#: rhodecode/templates/compare/compare_cs.html:18
+#, python-format
+msgid "Changeset status: %s"
+msgstr "Статус набора изменений: %s"
+
+#: rhodecode/templates/changelog/changelog.html:105
+#: rhodecode/templates/compare/compare_cs.html:36
+msgid "Expand commit message"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:114
+msgid "Changeset has comments"
+msgstr "Комментарии отсутствуют"
+
+#: rhodecode/templates/changelog/changelog.html:124
 #: rhodecode/templates/changelog/changelog_summary_data.html:50
-#: rhodecode/templates/changeset/changeset.html:107
-#: rhodecode/templates/changeset/changeset_range.html:86
+#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset_range.html:93
 #, python-format
 msgid "Bookmark %s"
 msgstr "Закладка %s"
 
-#: rhodecode/templates/changelog/changelog.html:121
+#: rhodecode/templates/changelog/changelog.html:130
 #: rhodecode/templates/changelog/changelog_summary_data.html:56
-#: rhodecode/templates/changeset/changeset.html:113
-#: rhodecode/templates/changeset/changeset_range.html:92
+#: rhodecode/templates/changeset/changeset.html:100
+#: rhodecode/templates/changeset/changeset_range.html:99
 #, python-format
 msgid "Tag %s"
 msgstr "Метка %s"
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:135
 #: rhodecode/templates/changelog/changelog_summary_data.html:61
-#: rhodecode/templates/changeset/changeset.html:117
-#: rhodecode/templates/changeset/changeset_range.html:96
+#: rhodecode/templates/changeset/changeset.html:105
+#: rhodecode/templates/changeset/changeset_range.html:103
 #, python-format
 msgid "Branch %s"
 msgstr "Ветка %s"
 
-#: rhodecode/templates/changelog/changelog.html:286
+#: rhodecode/templates/changelog/changelog.html:299
 msgid "There are no changes yet"
 msgstr "Изменений ещё нет"
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:91
+#: rhodecode/templates/changeset/changeset.html:76
 msgid "Removed"
 msgstr "Удалено"
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:92
+#: rhodecode/templates/changeset/changeset.html:77
 msgid "Changed"
 msgstr "Изменено"
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset.html:78
 msgid "Added"
 msgstr "Добавлено"
 
 #: rhodecode/templates/changelog/changelog_details.html:8
 #: rhodecode/templates/changelog/changelog_details.html:9
 #: rhodecode/templates/changelog/changelog_details.html:10
-#: rhodecode/templates/changeset/changeset.html:95
-#: rhodecode/templates/changeset/changeset.html:96
-#: rhodecode/templates/changeset/changeset.html:97
+#: rhodecode/templates/changeset/changeset.html:80
+#: rhodecode/templates/changeset/changeset.html:81
+#: rhodecode/templates/changeset/changeset.html:82
 #, python-format
 msgid "Affected %s files"
 msgstr "Затрагивает %s файлов"
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:6
-#: rhodecode/templates/files/files_add.html:75
-#: rhodecode/templates/files/files_edit.html:61
+#: rhodecode/templates/files/files_add.html:65
+#: rhodecode/templates/files/files_delete.html:53
 msgid "Commit message"
 msgstr "Сообщение commit'а"
 
@@ -3718,10 +4729,9 @@
 msgstr "Добавить или загрузить файлы через RhodeCode"
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:89
-#: rhodecode/templates/files/files_add.html:38
-#: rhodecode/templates/files/files_browser.html:31
-msgid "Add new file"
-msgstr "Добавить файл"
+#: rhodecode/templates/files/files_ypjax.html:9
+msgid "Add New File"
+msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:95
 msgid "Push new repo"
@@ -3736,60 +4746,62 @@
 msgid "%s Changeset"
 msgstr "%s Изменения"
 
-#: rhodecode/templates/changeset/changeset.html:39
-msgid "No parents"
-msgstr "Родители отсутвуют"
-
-#: rhodecode/templates/changeset/changeset.html:49
-msgid "No children"
-msgstr "Нет дочерних репозиториев"
-
-#: rhodecode/templates/changeset/changeset.html:62
-#: rhodecode/templates/changeset/changeset_file_comment.html:20
-#: rhodecode/templates/changeset/changeset_range.html:44
+#: rhodecode/templates/changeset/changeset.html:37
+msgid "parent rev."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:43
+msgid "child rev."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:51
+#: rhodecode/templates/changeset/changeset_file_comment.html:41
+#: rhodecode/templates/changeset/changeset_range.html:51
 msgid "Changeset status"
 msgstr "Статут изменений"
 
+#: rhodecode/templates/changeset/changeset.html:55
+#: rhodecode/templates/changeset/diff_block.html:27
+#: rhodecode/templates/files/diff_2way.html:52
+msgid "Raw diff"
+msgstr "Отобразить в формате diff"
+
+#: rhodecode/templates/changeset/changeset.html:58
+msgid "Patch diff"
+msgstr "Применить разностное исправление (Patch diff)"
+
+#: rhodecode/templates/changeset/changeset.html:61
+#: rhodecode/templates/changeset/diff_block.html:30
+#: rhodecode/templates/files/diff_2way.html:55
+msgid "Download diff"
+msgstr "Скачать diff"
+
 #: rhodecode/templates/changeset/changeset.html:67
-#: rhodecode/templates/changeset/diff_block.html:22
-msgid "Raw diff"
-msgstr "Сравнение без форматирования"
-
-#: rhodecode/templates/changeset/changeset.html:68
-msgid "Patch diff"
-msgstr "Применить разностное исправление (Patch diff)"
-
-#: rhodecode/templates/changeset/changeset.html:69
-#: rhodecode/templates/changeset/diff_block.html:23
-msgid "Download diff"
-msgstr "Скачать diff"
-
-#: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:103
+#: rhodecode/templates/changeset/changeset_file_comment.html:111
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d комментарий"
-msgstr[1] "%d комментариев"
-msgstr[2] "%d комментария"
-
-#: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:103
+msgstr[1] "%d комментария"
+msgstr[2] "%d комментариев"
+
+#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:111
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
-msgstr[0] "(%d в строке)"
-msgstr[1] "(%d в строках)"
-msgstr[2] "(%d в строках)"
-
-#: rhodecode/templates/changeset/changeset.html:103
-#: rhodecode/templates/changeset/changeset_range.html:82
+msgstr[0] "(%d к строке)"
+msgstr[1] "(%d к строкам)"
+msgstr[2] "(%d к строкам)"
+
+#: rhodecode/templates/changeset/changeset.html:88
+#: rhodecode/templates/changeset/changeset_range.html:89
 msgid "merge"
 msgstr "свести"
 
-#: rhodecode/templates/changeset/changeset.html:126
-#: rhodecode/templates/compare/compare_diff.html:40
-#: rhodecode/templates/pullrequests/pullrequest_show.html:113
+#: rhodecode/templates/changeset/changeset.html:124
+#: rhodecode/templates/compare/compare_diff.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:160
 #, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
@@ -3797,9 +4809,9 @@
 msgstr[1] "%s файлов изменено"
 msgstr[2] "%s файла изменено"
 
-#: rhodecode/templates/changeset/changeset.html:128
-#: rhodecode/templates/compare/compare_diff.html:42
-#: rhodecode/templates/pullrequests/pullrequest_show.html:115
+#: rhodecode/templates/changeset/changeset.html:126
+#: rhodecode/templates/compare/compare_diff.html:59
+#: rhodecode/templates/pullrequests/pullrequest_show.html:162
 #, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
@@ -3807,115 +4819,135 @@
 msgstr[1] "%s файла изменёно: %s добавления, %s удаления"
 msgstr[2] "%s файлов изменёно: %s добавлений, %s удалений"
 
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Showing a huge diff might take some time and resources"
 msgstr "Отображение слишком большого diff'а может занять длительное время"
 
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Show full diff"
 msgstr "Показать полный diff"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:30
-#, python-format
-msgid "Status change on pull request #%s"
-msgstr "Изменение статуса Pull запрос #%s"
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:32
+#: rhodecode/templates/changeset/changeset.html:214
+#: rhodecode/templates/changeset/changeset.html:251
+msgid "no revisions"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:23
+#, python-format
+msgid "Vote on pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:25
 #, python-format
 msgid "Comment on pull request #%s"
 msgstr "Комментарий в Pull запросе #%s"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:55
+#: rhodecode/templates/changeset/changeset_file_comment.html:30
+msgid "Status change on changeset"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:32
+msgid "Comment on changeset"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:63
 msgid "Submitting..."
 msgstr "Применение..."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:58
+#: rhodecode/templates/changeset/changeset_file_comment.html:66
 msgid "Commenting on line {1}."
-msgstr "Комментирование строки {1}."
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:59
-#: rhodecode/templates/changeset/changeset_file_comment.html:145
+msgstr "Комментарий к строке {1}."
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:153
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
 msgstr "Парсинг комментариев выполнен с использованием синтаксиса %s с поддержкой %s."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:61
-#: rhodecode/templates/changeset/changeset_file_comment.html:147
+#: rhodecode/templates/changeset/changeset_file_comment.html:69
+#: rhodecode/templates/changeset/changeset_file_comment.html:155
 msgid ""
 "Use @username inside this text to send notification to this RhodeCode user"
 msgstr "Используйте @имя_пользователя в тексте, чтобы отправить оповещение указанному пользователю RhodeCode"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:65
-#: rhodecode/templates/changeset/changeset_file_comment.html:152
+#: rhodecode/templates/changeset/changeset_file_comment.html:73
+#: rhodecode/templates/changeset/changeset_file_comment.html:166
 msgid "Preview"
-msgstr "Превью"
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:72
-#: rhodecode/templates/changeset/changeset_file_comment.html:170
-msgid "Comment preview"
-msgstr "Превью комментариев"
+msgstr "Предпросмотр"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:80
-#: rhodecode/templates/changeset/changeset_file_comment.html:177
-#: rhodecode/templates/email_templates/changeset_comment.html:16
+#: rhodecode/templates/changeset/changeset_file_comment.html:189
+msgid "Comment preview"
+msgstr "Предварительный просмотр комментария"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:196
+#: rhodecode/templates/email_templates/changeset_comment.html:11
 #: rhodecode/templates/email_templates/pull_request_comment.html:16
 msgid "Comment"
 msgstr "Комментировать"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:81
-msgid "Cancel"
-msgstr "Отмена"
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:96
 msgid "You need to be logged in to comment."
 msgstr "Вам необходимо авторизоваться, чтобы оставлять комментарии"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:96
 msgid "Login now"
 msgstr "Авторизоваться сейчас"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:92
+#: rhodecode/templates/changeset/changeset_file_comment.html:100
 msgid "Hide"
 msgstr "Скрыть"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:149
-msgid "Change status"
-msgstr "Изменить статус"
+#: rhodecode/templates/changeset/changeset_file_comment.html:159
+msgid "Vote for pull request status"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:161
+msgid "Change changeset status"
+msgstr "Изменить статус ревизии"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:179
-msgid "Comment and close"
-msgstr "Комментировать и закрыть"
+msgid "Close (when approved or rejected)"
+msgstr "Закрыть (когда одобрен или отклонен)"
 
 #: rhodecode/templates/changeset/changeset_range.html:5
 #, python-format
 msgid "%s Changesets"
 msgstr "%s Изменения"
 
-#: rhodecode/templates/changeset/changeset_range.html:52
+#: rhodecode/templates/changeset/changeset_range.html:59
 msgid "Files affected"
 msgstr "Затронутые файлы"
 
 #: rhodecode/templates/changeset/diff_block.html:21
+#: rhodecode/templates/files/diff_2way.html:46
 msgid "Show full diff for this file"
 msgstr "Показать полный diff для этого файла"
 
-#: rhodecode/templates/changeset/diff_block.html:29
+#: rhodecode/templates/changeset/diff_block.html:24
+#: rhodecode/templates/changeset/diff_block.html:68
+#: rhodecode/templates/files/diff_2way.html:49
+msgid "Show full side-by-side diff for this file"
+msgstr "Показать полный diff для этого файла"
+
+#: rhodecode/templates/changeset/diff_block.html:38
 msgid "Show inline comments"
 msgstr "Показать комментарии в строках"
 
-#: rhodecode/templates/changeset/diff_block.html:53
+#: rhodecode/templates/changeset/diff_block.html:62
 msgid "Show file at latest version in this repo"
 msgstr "Показать последнюю версию файла в данном репозитории"
 
-#: rhodecode/templates/changeset/diff_block.html:54
+#: rhodecode/templates/changeset/diff_block.html:64
 msgid "Show file at initial version in this repo"
 msgstr "Показать исходную версию файла в данном репозитории"
 
@@ -3923,91 +4955,88 @@
 msgid "No changesets"
 msgstr "Нет изменений"
 
-#: rhodecode/templates/compare/compare_cs.html:32
+#: rhodecode/templates/compare/compare_cs.html:8
 msgid "Ancestor"
 msgstr "Предок"
 
-#: rhodecode/templates/compare/compare_diff.html:5
+#: rhodecode/templates/compare/compare_diff.html:6
+#: rhodecode/templates/compare/compare_diff.html:8
 #, python-format
 msgid "%s Compare"
 msgstr "%s Сравнить"
 
-#: rhodecode/templates/compare/compare_diff.html:9
+#: rhodecode/templates/compare/compare_diff.html:16
 msgid "Compare revisions"
 msgstr "Сравнить ревизии"
 
-#: rhodecode/templates/compare/compare_diff.html:33
-#: rhodecode/templates/pullrequests/pullrequest_show.html:106
+#: rhodecode/templates/compare/compare_diff.html:36
+msgid "Swap"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:38
+msgid "Compare Revisions"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:45
+msgid "Compare revisions, branches, bookmarks or tags."
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:50
+#: rhodecode/templates/pullrequests/pullrequest_show.html:153
 #, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
-msgstr[0] "Показать %s коммит"
-msgstr[1] "Показать %s коммита"
-msgstr[2] "Показать %s коммитов"
-
-#: rhodecode/templates/compare/compare_diff.html:48
-#: rhodecode/templates/pullrequests/pullrequest_show.html:121
+msgstr[0] "Показать %s commit"
+msgstr[1] "Показать %s commit'а"
+msgstr[2] "Показать %s commit'ов"
+
+#: rhodecode/templates/compare/compare_diff.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:168
 msgid "No files"
 msgstr "Нет файлов"
 
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-msgid "confirm to show potentially huge diff"
-msgstr "Подтвердите необходимость показа огромного списка сравнения"
-
-#: rhodecode/templates/data_table/_dt_elements.html:54
-#: rhodecode/templates/summary/summary.html:69
+#: rhodecode/templates/data_table/_dt_elements.html:63
 msgid "Mercurial repository"
 msgstr "Репозиторий Mercurial"
 
-#: rhodecode/templates/data_table/_dt_elements.html:56
-#: rhodecode/templates/summary/summary.html:72
+#: rhodecode/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr "Git репозиторий"
 
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#, python-format
-msgid "Fork of %s"
-msgstr "Fork от %s"
-
-#: rhodecode/templates/data_table/_dt_elements.html:88
+#: rhodecode/templates/data_table/_dt_elements.html:72
+msgid "Public repository"
+msgstr "Публичный репозиторий"
+
+#: rhodecode/templates/data_table/_dt_elements.html:82
+msgid "Repository creating in progress..."
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr "Изменений ещё не было"
 
-#: rhodecode/templates/data_table/_dt_elements.html:95
-#: rhodecode/templates/data_table/_dt_elements.html:97
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "Подписаться на ленту RSS %s"
 
-#: rhodecode/templates/data_table/_dt_elements.html:103
-#: rhodecode/templates/data_table/_dt_elements.html:105
+#: rhodecode/templates/data_table/_dt_elements.html:111
+#: rhodecode/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "Подписаться на ленту Atom %s"
 
-#: rhodecode/templates/data_table/_dt_elements.html:122
-#, python-format
-msgid "Confirm to delete this repository: %s"
-msgstr "Подтвердите удаление этого репозитория: %s"
-
-#: rhodecode/templates/data_table/_dt_elements.html:137
-#, python-format
-msgid "Confirm to delete this user: %s"
-msgstr "Подтвердите удаление пользователя %s"
-
-#: rhodecode/templates/email_templates/changeset_comment.html:4
-#: rhodecode/templates/email_templates/pull_request.html:4
-#: rhodecode/templates/email_templates/pull_request_comment.html:4
-msgid "URL"
-msgstr "URL"
+#: rhodecode/templates/data_table/_dt_elements.html:141
+msgid "Creating"
+msgstr ""
 
 #: rhodecode/templates/email_templates/changeset_comment.html:6
 #, python-format
 msgid "%s commented on a %s changeset."
 msgstr "прокомментирован %s в наборе изменений %s."
 
-#: rhodecode/templates/email_templates/changeset_comment.html:14
+#: rhodecode/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
 msgstr "Состояние набора изменений изменено на"
 
@@ -4039,9 +5068,9 @@
 msgstr "%s открыл pull-request для репозитория %s и просит вас просмотреть изменения"
 
 #: rhodecode/templates/email_templates/pull_request.html:8
-#: rhodecode/templates/pullrequests/pullrequest.html:34
+#: rhodecode/templates/pullrequests/pullrequest.html:31
 #: rhodecode/templates/pullrequests/pullrequest_data.html:14
-#: rhodecode/templates/pullrequests/pullrequest_show.html:25
+#: rhodecode/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr "Заголовок"
 
@@ -4062,77 +5091,85 @@
 msgid "View this user here"
 msgstr "Подробнее о пользователе"
 
-#: rhodecode/templates/errors/error_document.html:55
+#: rhodecode/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr "Вы будете посланы на %s через %s секунд"
 
+#: rhodecode/templates/files/diff_2way.html:15
+#, python-format
+msgid "%s File side-by-side diff"
+msgstr ""
+
+#: rhodecode/templates/files/diff_2way.html:22
+#: rhodecode/templates/files/file_diff.html:11
+msgid "File diff"
+msgstr "Сравнение файлов "
+
+#: rhodecode/templates/files/diff_2way.html:58
+msgid "ignore white space"
+msgstr "игнорировать пробелы"
+
+#: rhodecode/templates/files/diff_2way.html:59
+msgid "turn on edit mode"
+msgstr "включить режим редактирования"
+
 #: rhodecode/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr "Сравнение файла %s"
 
-#: rhodecode/templates/files/file_diff.html:8
-msgid "File diff"
-msgstr "Сравнение файлов "
-
 #: rhodecode/templates/files/files.html:4
-#: rhodecode/templates/files/files.html:76
+#: rhodecode/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr "%s Файлы"
 
-#: rhodecode/templates/files/files.html:30
-#: rhodecode/templates/files/files_add.html:31
-#: rhodecode/templates/files/files_edit.html:31
-msgid "Branch"
-msgstr "Ветка"
-
 #: rhodecode/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr "%s Файлов добавлено"
 
-#: rhodecode/templates/files/files_add.html:19
-msgid "Add file"
+#: rhodecode/templates/files/files_add.html:25
+msgid "Add new file"
 msgstr "Добавить файл"
 
-#: rhodecode/templates/files/files_add.html:43
-msgid "File Name"
-msgstr "Имя файла"
-
-#: rhodecode/templates/files/files_add.html:47
-#: rhodecode/templates/files/files_add.html:56
-msgid "or"
-msgstr "или"
-
-#: rhodecode/templates/files/files_add.html:47
-#: rhodecode/templates/files/files_add.html:52
-msgid "Upload file"
-msgstr "Загрузить файл"
-
-#: rhodecode/templates/files/files_add.html:56
-msgid "Create new file"
-msgstr "Создать файл"
-
-#: rhodecode/templates/files/files_add.html:61
-#: rhodecode/templates/files/files_edit.html:37
+#: rhodecode/templates/files/files_add.html:45
+#: rhodecode/templates/files/files_edit.html:43
 #: rhodecode/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "Расположение"
 
-#: rhodecode/templates/files/files_add.html:65
-msgid "use / to separate directories"
-msgstr "используйте / для разделения директорий"
-
-#: rhodecode/templates/files/files_add.html:79
-#: rhodecode/templates/files/files_edit.html:65
+#: rhodecode/templates/files/files_add.html:47
+msgid "Enter filename..."
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:49
+#: rhodecode/templates/files/files_add.html:53
+msgid "or"
+msgstr "или"
+
+#: rhodecode/templates/files/files_add.html:49
+msgid "Upload File"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:53
+msgid "Create New File"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:58
+msgid "New file mode"
+msgstr "Режим нового файла"
+
+#: rhodecode/templates/files/files_add.html:69
+#: rhodecode/templates/files/files_delete.html:57
+#: rhodecode/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr "Применить изменения"
 
 #: rhodecode/templates/files/files_browser.html:13
-msgid "View"
-msgstr "Просмотр"
+msgid "revision"
+msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:14
 msgid "Previous revision"
@@ -4142,82 +5179,80 @@
 msgid "Next revision"
 msgstr "Следующая ревизия"
 
-#: rhodecode/templates/files/files_browser.html:23
+#: rhodecode/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr "Отслеживать данную ветку"
 
-#: rhodecode/templates/files/files_browser.html:27
-msgid "Search file list"
-msgstr "Искать файлы"
-
-#: rhodecode/templates/files/files_browser.html:35
+#: rhodecode/templates/files/files_browser.html:25
+msgid "Search File List"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr "Загружается список файлов..."
 
-#: rhodecode/templates/files/files_browser.html:48
+#: rhodecode/templates/files/files_browser.html:42
 msgid "Size"
 msgstr "Размер"
 
-#: rhodecode/templates/files/files_browser.html:49
+#: rhodecode/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr "Тип файла"
 
-#: rhodecode/templates/files/files_browser.html:50
+#: rhodecode/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr "Последняя версия"
 
-#: rhodecode/templates/files/files_browser.html:51
+#: rhodecode/templates/files/files_browser.html:45
 msgid "Last modified"
 msgstr "Последнее изменение"
 
-#: rhodecode/templates/files/files_browser.html:52
+#: rhodecode/templates/files/files_browser.html:46
 msgid "Last committer"
 msgstr "Автор последнего commit'а"
 
+#: rhodecode/templates/files/files_delete.html:4
+#, python-format
+msgid "%s Files Delete"
+msgstr ""
+
+#: rhodecode/templates/files/files_delete.html:25
+#: rhodecode/templates/files/files_delete.html:45
+msgid "Delete file"
+msgstr ""
+
 #: rhodecode/templates/files/files_edit.html:4
 #, python-format
-msgid "%s Files Edit"
-msgstr "%s Файлов отредактировано"
-
-#: rhodecode/templates/files/files_edit.html:19
+msgid "%s File Edit"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:25
 msgid "Edit file"
 msgstr "Редактировать файл"
 
-#: rhodecode/templates/files/files_edit.html:47
-#: rhodecode/templates/files/files_source.html:23
-msgid "Show annotation"
-msgstr "Показать примечание"
-
-#: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:26
-msgid "Download as raw"
-msgstr "Скачать в .raw формате"
-
-#: rhodecode/templates/files/files_edit.html:52
+#: rhodecode/templates/files/files_edit.html:53
+#: rhodecode/templates/files/files_source.html:32
+msgid "Show Annotation"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:55
+#: rhodecode/templates/files/files_source.html:35
+msgid "Download as Raw"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:58
 msgid "Source"
 msgstr "Исходный код"
 
-#: rhodecode/templates/files/files_edit.html:57
+#: rhodecode/templates/files/files_edit.html:63
 msgid "Editing file"
 msgstr "Редактирование файла"
 
+#: rhodecode/templates/files/files_edit.html:68
+msgid "Commit Message"
+msgstr ""
+
 #: rhodecode/templates/files/files_history_box.html:2
-msgid "History"
-msgstr "История"
-
-#: rhodecode/templates/files/files_history_box.html:9
-msgid "Diff to revision"
-msgstr "разница с ревизией"
-
-#: rhodecode/templates/files/files_history_box.html:10
-msgid "Show at revision"
-msgstr "показать в ревизии"
-
-#: rhodecode/templates/files/files_history_box.html:11
-msgid "Show full history"
-msgstr "Показать полную историю"
-
-#: rhodecode/templates/files/files_history_box.html:16
 #, python-format
 msgid "%s author"
 msgid_plural "%s authors"
@@ -4225,33 +5260,49 @@
 msgstr[1] "%s авторов"
 msgstr[2] "%s автора"
 
-#: rhodecode/templates/files/files_source.html:6
-msgid "Load file history"
-msgstr "Загрузить историю фалов"
-
-#: rhodecode/templates/files/files_source.html:21
-msgid "Show source"
-msgstr "Показать исходный код"
-
-#: rhodecode/templates/files/files_source.html:29
-#, python-format
-msgid "Edit on branch:%s"
-msgstr "Редактировать в ветке: %s"
-
-#: rhodecode/templates/files/files_source.html:31
-msgid "Edit on branch:?"
-msgstr "Редактировать в ветке:?"
-
-#: rhodecode/templates/files/files_source.html:31
+#: rhodecode/templates/files/files_source.html:7
+msgid "Diff to Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:8
+msgid "Show at Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:10
+msgid "Show Full History"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:11
+msgid "Show Authors"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:30
+msgid "Show Source"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:38
+#, python-format
+msgid "Edit on Branch:%s"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:41
+msgid "Editing binary files not allowed"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:44
 msgid "Editing files allowed only when on branch head revision"
-msgstr "Редактирование файлов разрешено только в последней версии ветки"
-
-#: rhodecode/templates/files/files_source.html:46
+msgstr "Редактирование файлов разрешено только в HEAD-ревизии данной ветки"
+
+#: rhodecode/templates/files/files_source.html:45
+msgid "Deleting files allowed only when on branch head revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:61
 #, python-format
 msgid "Binary file (%s)"
 msgstr "Бинарный файл (%s)"
 
-#: rhodecode/templates/files/files_source.html:55
+#: rhodecode/templates/files/files_source.html:71
 msgid "File is too big to display"
 msgstr "Файл слишком большой для отображения"
 
@@ -4259,11 +5310,11 @@
 msgid "annotation"
 msgstr "аннотация"
 
-#: rhodecode/templates/files/files_ypjax.html:15
-msgid "Go back"
-msgstr "Назад"
-
-#: rhodecode/templates/files/files_ypjax.html:16
+#: rhodecode/templates/files/files_ypjax.html:23
+msgid "Go Back"
+msgstr ""
+
+#: rhodecode/templates/files/files_ypjax.html:24
 msgid "No files at given path"
 msgstr "По заданному пути файлы отсутствуют"
 
@@ -4272,9 +5323,9 @@
 msgid "%s Followers"
 msgstr "%s Наблюдатели"
 
-#: rhodecode/templates/followers/followers.html:9
-#: rhodecode/templates/summary/summary.html:183
-#: rhodecode/templates/summary/summary.html:184
+#: rhodecode/templates/followers/followers.html:12
+#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/templates/summary/summary.html:150
 msgid "Followers"
 msgstr "Наблюдатели"
 
@@ -4284,45 +5335,45 @@
 
 #: rhodecode/templates/forks/fork.html:5
 #, python-format
-msgid "%s Fork"
-msgstr "Форк %s"
-
-#: rhodecode/templates/forks/fork.html:28
+msgid "Fork repository %s"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:30
 msgid "Fork name"
 msgstr "Имя форка"
 
-#: rhodecode/templates/forks/fork.html:65
+#: rhodecode/templates/forks/fork.html:71
 msgid "Private"
-msgstr "Частный"
-
-#: rhodecode/templates/forks/fork.html:74
+msgstr "Приватный"
+
+#: rhodecode/templates/forks/fork.html:80
 msgid "Copy permissions"
-msgstr "Права копирования"
-
-#: rhodecode/templates/forks/fork.html:78
+msgstr "Скопировать привилегии"
+
+#: rhodecode/templates/forks/fork.html:84
 msgid "Copy permissions from forked repository"
 msgstr "Скопировать привилегии с форкнутого репозитория"
 
-#: rhodecode/templates/forks/fork.html:84
+#: rhodecode/templates/forks/fork.html:90
 msgid "Update after clone"
 msgstr "Обновлять после клонирования"
 
-#: rhodecode/templates/forks/fork.html:88
+#: rhodecode/templates/forks/fork.html:94
 msgid "Checkout source after making a clone"
 msgstr "Скачивать исходники после создания клона"
 
-#: rhodecode/templates/forks/fork.html:93
-msgid "Fork this repository"
-msgstr "Форкнуть репозиторий"
+#: rhodecode/templates/forks/fork.html:99
+msgid "Fork this Repository"
+msgstr ""
 
 #: rhodecode/templates/forks/forks.html:5
 #, python-format
 msgid "%s Forks"
 msgstr "Форки %s"
 
-#: rhodecode/templates/forks/forks.html:9
-#: rhodecode/templates/summary/summary.html:189
-#: rhodecode/templates/summary/summary.html:190
+#: rhodecode/templates/forks/forks.html:12
+#: rhodecode/templates/summary/summary.html:155
+#: rhodecode/templates/summary/summary.html:156
 msgid "Forks"
 msgstr "Ответвления"
 
@@ -4334,41 +5385,32 @@
 msgid "There are no forks yet"
 msgstr "Форки ещё не созданы"
 
-#: rhodecode/templates/journal/journal.html:21
+#: rhodecode/templates/journal/journal.html:24
 msgid "ATOM journal feed"
 msgstr "Лента журнала ATOM"
 
-#: rhodecode/templates/journal/journal.html:22
+#: rhodecode/templates/journal/journal.html:25
 msgid "RSS journal feed"
 msgstr "Лента журнала RSS"
 
-#: rhodecode/templates/journal/journal.html:32
-msgid "Refresh"
-msgstr "Обновить"
-
-#: rhodecode/templates/journal/journal.html:35
-#: rhodecode/templates/journal/public_journal.html:24
-msgid "ATOM feed"
-msgstr "ATOM лента"
-
-#: rhodecode/templates/journal/journal.html:51
-msgid "Watched"
-msgstr "Просмотрено"
+#: rhodecode/templates/journal/journal.html:57
+msgid "My repos"
+msgstr "Мои репозитории"
 
 #: rhodecode/templates/journal/journal_data.html:55
 msgid "No entries yet"
 msgstr "Записи отсуствуют"
 
 #: rhodecode/templates/journal/public_journal.html:4
-#: rhodecode/templates/journal/public_journal.html:21
+#: rhodecode/templates/journal/public_journal.html:24
 msgid "Public Journal"
 msgstr "Публичный журнал"
 
-#: rhodecode/templates/journal/public_journal.html:13
+#: rhodecode/templates/journal/public_journal.html:16
 msgid "ATOM public journal feed"
 msgstr "Общая лента журнала ATOM"
 
-#: rhodecode/templates/journal/public_journal.html:14
+#: rhodecode/templates/journal/public_journal.html:17
 msgid "RSS public journal feed"
 msgstr "Общая лента журнала RSS"
 
@@ -4377,46 +5419,42 @@
 msgid "New pull request"
 msgstr "Новый pull запрос"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:25
-msgid "Create new pull request"
-msgstr "Создать новый Pull запрос"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:47
+#: rhodecode/templates/pullrequests/pullrequest.html:44
 msgid "Write a short description on this pull request"
 msgstr "Написать короткое писание по этому запросу"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:53
+#: rhodecode/templates/pullrequests/pullrequest.html:50
 msgid "Changeset flow"
 msgstr "Поток изменений"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:60
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+#: rhodecode/templates/pullrequests/pullrequest.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:68
 msgid "Origin repository"
 msgstr "Первоначальный репозиторий"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:85
-msgid "Send pull request"
-msgstr "Отправить pull запрос"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:94
-#: rhodecode/templates/pullrequests/pullrequest_show.html:137
+#: rhodecode/templates/pullrequests/pullrequest.html:82
+msgid "Send Pull Request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:91
+#: rhodecode/templates/pullrequests/pullrequest_show.html:104
 msgid "Pull request reviewers"
 msgstr "Рецензенты запросов на внесение изменений Pull request"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:103
-#: rhodecode/templates/pullrequests/pullrequest_show.html:149
+#: rhodecode/templates/pullrequests/pullrequest.html:100
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
 msgid "owner"
 msgstr "владелец"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:115
+#: rhodecode/templates/pullrequests/pullrequest.html:114
 msgid "Add reviewer to this pull request."
 msgstr "Добавить рецензента в данный запрос на внесение изменений"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:129
+#: rhodecode/templates/pullrequests/pullrequest.html:128
 msgid "Detailed compare view"
 msgstr "Детальное сравнение"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:150
+#: rhodecode/templates/pullrequests/pullrequest.html:149
 msgid "Destination repository"
 msgstr "Репозиторий назначения"
 
@@ -4425,19 +5463,20 @@
 msgid "%s Pull Request #%s"
 msgstr "%s Запрос на внесение изменений #%s"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:35
+#: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Review status"
 msgstr "Состояние рассмотрения"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:40
-msgid "Pull request status"
-msgstr "Статус pull-запроса"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:53
+#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:43
+msgid "Pull request status calculated from votes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:56
 msgid "Still not reviewed by"
 msgstr "Еще не рассмотренный"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:60
 #, python-format
 msgid "%d reviewer"
 msgid_plural "%d reviewers"
@@ -4445,61 +5484,91 @@
 msgstr[1] "%d рецензента"
 msgstr[2] "%d рецензентов"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:59
+#: rhodecode/templates/pullrequests/pullrequest_show.html:62
 msgid "Pull request was reviewed by all reviewers"
 msgstr "Запрос на внесение изменений был рассмотрен всеми рецензентами."
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:89
-msgid "Created on"
-msgstr "Создано"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:102
+#: rhodecode/templates/pullrequests/pullrequest_show.html:77
+#: rhodecode/templates/pullrequests/pullrequest_show.html:79
+msgid "Pull changes"
+msgstr "Pull изменения"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
+msgid "reviewer"
+msgstr "рецензент"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:133
+msgid "Add or remove reviewer to this pull request."
+msgstr "Добавить или удалить рецензента данного запроса на внесение изменений"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:137
+msgid "Save Changes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "Compare view"
 msgstr "Сравнение"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:149
-msgid "reviewer"
-msgstr "рецензент"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:164
-msgid "Add or remove reviewer to this pull request."
-msgstr "Добавить или удалить рецензента данного запроса на внесение изменений"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:168
-msgid "Save changes"
-msgstr "Сохранить изменения"
-
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
 #, python-format
 msgid "%s Pull Requests"
 msgstr "%s Запросы на внесение изменений"
 
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
+#, python-format
+msgid "Pull requests from %s"
+msgstr "Pull запросы от %s"
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:14
+#, python-format
+msgid "Pull requests to %s"
+msgstr "Pull запросы для %s"
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:38
+#, python-format
+msgid "Show pull requests to %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:40
+#, python-format
+msgid "Show pull requests from %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:50
+msgid "Hide closed pull requests"
+msgstr "Скрыть закрытые pull запросы"
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:52
+msgid "Show closed pull requests too"
+msgstr "Показать закрытые pull запросы"
+
 #: rhodecode/templates/search/search.html:6
-msgid "Search repository"
-msgstr "Искать в репозитории: %s"
+#, python-format
+msgid "%s Search"
+msgstr ""
 
 #: rhodecode/templates/search/search.html:8
-#: rhodecode/templates/search/search.html:16
+#: rhodecode/templates/search/search.html:19
 msgid "Search in all repositories"
-msgstr "Искать по всем репозиториям"
-
-#: rhodecode/templates/search/search.html:50
+msgstr "Поиск по всем репозиториям"
+
+#: rhodecode/templates/search/search.html:53
 msgid "Search term"
-msgstr "Искать термин"
-
-#: rhodecode/templates/search/search.html:62
-msgid "Search in"
-msgstr "Искать в"
+msgstr "Фраза для поиска"
 
 #: rhodecode/templates/search/search.html:65
+msgid "Search in"
+msgstr "Критерий поиска:"
+
+#: rhodecode/templates/search/search.html:68
 msgid "File contents"
-msgstr "Содержимое файла"
-
-#: rhodecode/templates/search/search.html:66
+msgstr "Содержимое файлов"
+
+#: rhodecode/templates/search/search.html:69
 msgid "Commit messages"
-msgstr "Сообщения коммита"
-
-#: rhodecode/templates/search/search.html:67
+msgstr "Сообщения commit'а"
+
+#: rhodecode/templates/search/search.html:70
 msgid "File names"
 msgstr "Имя файла"
 
@@ -4507,7 +5576,76 @@
 #: rhodecode/templates/search/search_content.html:21
 #: rhodecode/templates/search/search_path.html:15
 msgid "Permission denied"
-msgstr "Нет прав"
+msgstr "Недостаточно прав"
+
+#: rhodecode/templates/summary/statistics.html:4
+#, python-format
+msgid "%s Statistics"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:19
+#: rhodecode/templates/summary/summary.html:42
+#, python-format
+msgid "%s ATOM feed"
+msgstr "ATOM лента репозитория %s"
+
+#: rhodecode/templates/summary/statistics.html:20
+#: rhodecode/templates/summary/summary.html:43
+#, python-format
+msgid "%s RSS feed"
+msgstr "RSS лента репозитория %s"
+
+#: rhodecode/templates/summary/statistics.html:39
+#: rhodecode/templates/summary/summary.html:107
+#: rhodecode/templates/summary/summary.html:123
+msgid "Enable"
+msgstr "Включено"
+
+#: rhodecode/templates/summary/statistics.html:42
+msgid "Stats gathered: "
+msgstr "Полученная статистика:"
+
+#: rhodecode/templates/summary/statistics.html:91
+#: rhodecode/templates/summary/summary.html:354
+msgid "files"
+msgstr "файлы"
+
+#: rhodecode/templates/summary/statistics.html:115
+#: rhodecode/templates/summary/summary.html:378
+msgid "Show more"
+msgstr "Показать еще"
+
+#: rhodecode/templates/summary/statistics.html:392
+msgid "commits"
+msgstr "commit'ы"
+
+#: rhodecode/templates/summary/statistics.html:393
+msgid "files added"
+msgstr "файлы добавлены"
+
+#: rhodecode/templates/summary/statistics.html:394
+msgid "files changed"
+msgstr "файлы изменены"
+
+#: rhodecode/templates/summary/statistics.html:395
+msgid "files removed"
+msgstr "файлы удалены"
+
+#: rhodecode/templates/summary/statistics.html:397
+msgid "commit"
+msgstr "commit"
+
+#: rhodecode/templates/summary/statistics.html:398
+msgid "file added"
+msgstr "файл удалён"
+
+#: rhodecode/templates/summary/statistics.html:399
+msgid "file changed"
+msgstr "файл изменён"
+
+#: rhodecode/templates/summary/statistics.html:400
+msgid "file removed"
+msgstr "файл удалён"
 
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
@@ -4516,170 +5654,85 @@
 
 #: rhodecode/templates/summary/summary.html:16
 #, python-format
-msgid "%s ATOM feed"
-msgstr "ATOM лента репозитория %s"
-
-#: rhodecode/templates/summary/summary.html:17
-#, python-format
-msgid "%s RSS feed"
-msgstr "RSS лента репозитория %s"
-
-#: rhodecode/templates/summary/summary.html:62
-#, python-format
 msgid "Repository locked by %s"
 msgstr "Репозитарий заблокирован %s"
 
-#: rhodecode/templates/summary/summary.html:64
+#: rhodecode/templates/summary/summary.html:18
 msgid "Repository unlocked"
 msgstr "Репозиторий разблокирован"
 
-#: rhodecode/templates/summary/summary.html:83
-#, python-format
-msgid "Non changable ID %s"
-msgstr "Неизменяемый ID %s"
-
-#: rhodecode/templates/summary/summary.html:88
-msgid "Public"
-msgstr "Общедоступный"
-
-#: rhodecode/templates/summary/summary.html:88
-#: rhodecode/templates/summary/summary.html:89
-msgid "Fork of"
-msgstr "Форк от"
-
-#: rhodecode/templates/summary/summary.html:97
-msgid "Remote clone"
-msgstr "Удаленный клон"
-
-#: rhodecode/templates/summary/summary.html:117
-msgid "Contact"
-msgstr "Контакты"
-
-#: rhodecode/templates/summary/summary.html:131
+#: rhodecode/templates/summary/summary.html:76
 msgid "Clone url"
 msgstr "Ссылка для клонирования"
 
-#: rhodecode/templates/summary/summary.html:136
+#: rhodecode/templates/summary/summary.html:81
 msgid "Show by Name"
 msgstr "Показать по имени"
 
-#: rhodecode/templates/summary/summary.html:137
+#: rhodecode/templates/summary/summary.html:82
 msgid "Show by ID"
 msgstr "Показать по ID"
 
-#: rhodecode/templates/summary/summary.html:143
+#: rhodecode/templates/summary/summary.html:99
 msgid "Trending files"
 msgstr "Популярные файлы"
 
-#: rhodecode/templates/summary/summary.html:151
-#: rhodecode/templates/summary/summary.html:167
-msgid "Enable"
-msgstr "Включено"
-
-#: rhodecode/templates/summary/summary.html:159
+#: rhodecode/templates/summary/summary.html:115
 msgid "Download"
 msgstr "Скачать"
 
-#: rhodecode/templates/summary/summary.html:163
+#: rhodecode/templates/summary/summary.html:119
 msgid "There are no downloads yet"
 msgstr "Скачиваний ещё нет"
 
-#: rhodecode/templates/summary/summary.html:165
+#: rhodecode/templates/summary/summary.html:121
 msgid "Downloads are disabled for this repository"
 msgstr "Скачивание отключено в этом репозитории"
 
-#: rhodecode/templates/summary/summary.html:170
+#: rhodecode/templates/summary/summary.html:127
 msgid "Download as zip"
 msgstr "Скачать в zip"
 
-#: rhodecode/templates/summary/summary.html:174
+#: rhodecode/templates/summary/summary.html:132
 msgid "Check this to download archive with subrepos"
 msgstr "Отметьте для скачивания архива с дочерними репозиториями"
 
-#: rhodecode/templates/summary/summary.html:174
+#: rhodecode/templates/summary/summary.html:132
 msgid "with subrepos"
 msgstr "с дочерними репозиториями"
 
-#: rhodecode/templates/summary/summary.html:197
+#: rhodecode/templates/summary/summary.html:163
 msgid "Repository Size"
 msgstr "Размер репозитория"
 
-#: rhodecode/templates/summary/summary.html:204
-#: rhodecode/templates/summary/summary.html:206
+#: rhodecode/templates/summary/summary.html:170
+#: rhodecode/templates/summary/summary.html:172
 msgid "Feed"
 msgstr "Лента новостей"
 
-#: rhodecode/templates/summary/summary.html:224
-msgid "Commit activity by day / author"
-msgstr "Активность изменений по дням/авторам"
-
-#: rhodecode/templates/summary/summary.html:232
-msgid "enable"
-msgstr "включить"
-
-#: rhodecode/templates/summary/summary.html:235
-msgid "Stats gathered: "
-msgstr "Полученная статистика:"
-
-#: rhodecode/templates/summary/summary.html:256
+#: rhodecode/templates/summary/summary.html:193
 msgid "Latest changes"
 msgstr "Последние изменения"
 
-#: rhodecode/templates/summary/summary.html:258
+#: rhodecode/templates/summary/summary.html:195
 msgid "Quick start"
 msgstr "Быстрый старт"
 
-#: rhodecode/templates/summary/summary.html:272
-#, python-format
-msgid "Readme file from revision %s"
-msgstr "Readme файл из ревизии %s"
-
-#: rhodecode/templates/summary/summary.html:332
+#: rhodecode/templates/summary/summary.html:209
+#, python-format
+msgid "Readme file from revision %s:%s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:299
 #, python-format
 msgid "Download %s as %s"
 msgstr "Скачать %s как %s"
 
-#: rhodecode/templates/summary/summary.html:379
-msgid "files"
-msgstr "файлы"
-
-#: rhodecode/templates/summary/summary.html:689
-msgid "commits"
-msgstr "правки"
-
-#: rhodecode/templates/summary/summary.html:690
-msgid "files added"
-msgstr "файлы добавлены"
-
-#: rhodecode/templates/summary/summary.html:691
-msgid "files changed"
-msgstr "файлы изменены"
-
-#: rhodecode/templates/summary/summary.html:692
-msgid "files removed"
-msgstr "файлы удалены"
-
-#: rhodecode/templates/summary/summary.html:694
-msgid "commit"
-msgstr "правка"
-
-#: rhodecode/templates/summary/summary.html:695
-msgid "file added"
-msgstr "файл удалён"
-
-#: rhodecode/templates/summary/summary.html:696
-msgid "file changed"
-msgstr "файл изменён"
-
-#: rhodecode/templates/summary/summary.html:697
-msgid "file removed"
-msgstr "файл удалён"
-
 #: rhodecode/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr "%s Меток"
 
-#: rhodecode/templates/tags/tags.html:26
+#: rhodecode/templates/tags/tags.html:29
 msgid "Compare tags"
 msgstr "Сравнить метки"
--- a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po	Wed Jul 02 19:03:19 2014 -0400
+++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po	Wed Jul 02 19:03:20 2014 -0400
@@ -1,5 +1,5 @@
 # Translations template for RhodeCode.
-# Copyright (C) 2013 Marcin Kuzminski RhodeCode
+# Copyright (C) 2014 RhodeCode GmbH
 # This file is distributed under the same license as the RhodeCode project.
 # Translators:
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: RhodeCode\n"
-"Report-Msgid-Bugs-To: marcin@maq.io\n"
-"POT-Creation-Date: 2013-06-05 19:55+0200\n"
-"PO-Revision-Date: 2013-06-02 13:22+0000\n"
+"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
+"POT-Creation-Date: 2014-02-13 15:30+0100\n"
+"PO-Revision-Date: 2014-02-13 14:34+0000\n"
 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/RhodeCode/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -20,1291 +20,1638 @@
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: rhodecode/controllers/changelog.py:149
+#: rhodecode/controllers/changelog.py:88 rhodecode/controllers/compare.py:88
+#: rhodecode/controllers/pullrequests.py:263
+msgid "There are no changesets yet"
+msgstr "还没有修订集"
+
+#: rhodecode/controllers/changelog.py:184
 msgid "All Branches"
 msgstr "所有分支"
 
-#: rhodecode/controllers/changeset.py:84
+#: rhodecode/controllers/changelog.py:187
+msgid "(closed)"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:85
 msgid "Show white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
+#: rhodecode/controllers/changeset.py:92 rhodecode/controllers/changeset.py:99
 msgid "Ignore white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:164
-#, python-format
-msgid "%s line context"
-msgstr "%s行上下文"
-
-#: rhodecode/controllers/changeset.py:345
-#: rhodecode/controllers/pullrequests.py:478
+#: rhodecode/controllers/changeset.py:165
+#, python-format
+msgid "increase diff context to %(num)s lines"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:207 rhodecode/controllers/files.py:96
+#: rhodecode/controllers/files.py:119
+msgid "Such revision does not exist for this repository"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:353
+#: rhodecode/controllers/pullrequests.py:480
 #, python-format
 msgid "Status change -> %s"
 msgstr "状态修改为%s"
 
-#: rhodecode/controllers/changeset.py:376
+#: rhodecode/controllers/changeset.py:384
 msgid ""
 "Changing status on a changeset associated with a closed pull request is not "
 "allowed"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:74
-#: rhodecode/controllers/pullrequests.py:256
-msgid "There are no changesets yet"
-msgstr "还没有修订集"
-
-#: rhodecode/controllers/error.py:69
+#: rhodecode/controllers/compare.py:192 rhodecode/templates/base/root.html:67
+msgid "Select changeset"
+msgstr ""
+
+#: rhodecode/controllers/error.py:70
 msgid "Home page"
 msgstr "主页"
 
-#: rhodecode/controllers/error.py:98
+#: rhodecode/controllers/error.py:99
 msgid ""
 "The request could not be understood by the server due to malformed syntax."
 msgstr "由于错误的语法，服务器无法对请求进行响应。"
 
-#: rhodecode/controllers/error.py:101
+#: rhodecode/controllers/error.py:102
 msgid "Unauthorized access to resource"
 msgstr "未授权的资源访问"
 
-#: rhodecode/controllers/error.py:103
+#: rhodecode/controllers/error.py:104
 msgid "You don't have permission to view this page"
 msgstr "无权访问该页面"
 
-#: rhodecode/controllers/error.py:105
+#: rhodecode/controllers/error.py:106
 msgid "The resource could not be found"
 msgstr "资源未找到"
 
-#: rhodecode/controllers/error.py:107
+#: rhodecode/controllers/error.py:108
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr "服务进入非预期的混乱状态，这会阻止它对请求进行响应。"
 
-#: rhodecode/controllers/feed.py:52
+#: rhodecode/controllers/feed.py:53
 #, python-format
 msgid "Changes on %s repository"
 msgstr "%s库的修改"
 
-#: rhodecode/controllers/feed.py:53
+#: rhodecode/controllers/feed.py:54
 #, python-format
 msgid "%s %s feed"
 msgstr "%s %s订阅"
 
-#: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/controllers/feed.py:87
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr "修订集太大已被截断......"
 
-#: rhodecode/controllers/feed.py:90
+#: rhodecode/controllers/feed.py:91
 #, python-format
 msgid "%s committed on %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:89
-msgid "Click here to add new file"
-msgstr ""
-
 #: rhodecode/controllers/files.py:90
-#, python-format
-msgid "There are no files yet %s"
-msgstr "还没有文件%s"
-
-#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339
+msgid "Click here to add new file"
+msgstr ""
+
+#: rhodecode/controllers/files.py:91
+#, python-format
+msgid "There are no files yet. %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:299 rhodecode/controllers/files.py:359
+#: rhodecode/controllers/files.py:426
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr "版本库由%s于%s锁定"
 
-#: rhodecode/controllers/files.py:283
+#: rhodecode/controllers/files.py:311
+msgid "You can only delete files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:322
+#, python-format
+msgid "Deleted file %s via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:344
+#, python-format
+msgid "Successfully deleted file %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:348 rhodecode/controllers/files.py:414
+#: rhodecode/controllers/files.py:496
+msgid "Error occurred during commit"
+msgstr "提交时发生错误"
+
+#: rhodecode/controllers/files.py:371
 msgid "You can only edit files with revision being a valid branch "
 msgstr ""
 
-#: rhodecode/controllers/files.py:297
+#: rhodecode/controllers/files.py:385
 #, python-format
 msgid "Edited file %s via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:313
+#: rhodecode/controllers/files.py:401
 msgid "No changes"
 msgstr "无变更"
 
-#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394
+#: rhodecode/controllers/files.py:410 rhodecode/controllers/files.py:485
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "成功提交到%s"
 
-#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405
-msgid "Error occurred during commit"
-msgstr "提交时发生错误"
-
-#: rhodecode/controllers/files.py:351
+#: rhodecode/controllers/files.py:438
 msgid "Added file via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:368
+#: rhodecode/controllers/files.py:459
 msgid "No content"
 msgstr "无内容"
 
-#: rhodecode/controllers/files.py:372
+#: rhodecode/controllers/files.py:463
 msgid "No filename"
 msgstr "无文件名"
 
-#: rhodecode/controllers/files.py:397
+#: rhodecode/controllers/files.py:488
 msgid "Location must be relative path and must not contain .. in path"
 msgstr ""
 
-#: rhodecode/controllers/files.py:431
+#: rhodecode/controllers/files.py:522
 msgid "Downloads disabled"
 msgstr ""
 
-#: rhodecode/controllers/files.py:442
+#: rhodecode/controllers/files.py:533
 #, python-format
 msgid "Unknown revision %s"
 msgstr "未知版本%s"
 
-#: rhodecode/controllers/files.py:444
+#: rhodecode/controllers/files.py:535
 msgid "Empty repository"
 msgstr "空版本库"
 
-#: rhodecode/controllers/files.py:446
+#: rhodecode/controllers/files.py:537
 msgid "Unknown archive type"
 msgstr "未知包类型"
 
-#: rhodecode/controllers/files.py:631
-#: rhodecode/templates/changeset/changeset_range.html:9
+#: rhodecode/controllers/files.py:773
+#: rhodecode/templates/changeset/changeset_range.html:12
 #: rhodecode/templates/email_templates/pull_request.html:12
-#: rhodecode/templates/pullrequests/pullrequest.html:124
+#: rhodecode/templates/pullrequests/pullrequest.html:123
 msgid "Changesets"
 msgstr "修订集"
 
-#: rhodecode/controllers/files.py:632
-#: rhodecode/controllers/pullrequests.py:149
-#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682
+#: rhodecode/controllers/files.py:774
+#: rhodecode/controllers/pullrequests.py:158
+#: rhodecode/controllers/summary.py:74 rhodecode/model/scm.py:816
 #: rhodecode/templates/switch_to_list.html:3
-#: rhodecode/templates/branches/branches.html:10
+#: rhodecode/templates/branches/branches.html:13
 msgid "Branches"
 msgstr "分支"
 
-#: rhodecode/controllers/files.py:633
-#: rhodecode/controllers/pullrequests.py:150
-#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693
-#: rhodecode/templates/switch_to_list.html:15
-#: rhodecode/templates/tags/tags.html:10
+#: rhodecode/controllers/files.py:775
+#: rhodecode/controllers/pullrequests.py:159
+#: rhodecode/controllers/summary.py:75 rhodecode/model/scm.py:827
+#: rhodecode/templates/switch_to_list.html:25
+#: rhodecode/templates/tags/tags.html:13
 msgid "Tags"
 msgstr "标签"
 
-#: rhodecode/controllers/forks.py:176
-#, python-format
-msgid "Forked repository %s as %s"
-msgstr ""
-
-#: rhodecode/controllers/forks.py:190
+#: rhodecode/controllers/forks.py:189
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "在复刻版本库%s的时候发生错误"
 
-#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153
+#: rhodecode/controllers/home.py:81
+msgid "Groups"
+msgstr ""
+
+#: rhodecode/controllers/home.py:86
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:106
+#: rhodecode/templates/admin/repos/repo_add.html:15
+#: rhodecode/templates/admin/repos/repo_add.html:19
+#: rhodecode/templates/admin/users/user_edit_advanced.html:6
+#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:87
+#: rhodecode/templates/base/base.html:136
+#: rhodecode/templates/base/base.html:389
+#: rhodecode/templates/base/base.html:560
+msgid "Repositories"
+msgstr "版本库"
+
+#: rhodecode/controllers/home.py:127 rhodecode/templates/files/files.html:33
+#: rhodecode/templates/files/files_add.html:37
+#: rhodecode/templates/files/files_delete.html:37
+#: rhodecode/templates/files/files_edit.html:37
+msgid "Branch"
+msgstr ""
+
+#: rhodecode/controllers/home.py:133
+msgid "Tag"
+msgstr ""
+
+#: rhodecode/controllers/home.py:139
+msgid "Bookmark"
+msgstr ""
+
+#: rhodecode/controllers/journal.py:112 rhodecode/controllers/journal.py:155
 msgid "public journal"
 msgstr "公共日志"
 
-#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157
-#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/controllers/journal.py:116 rhodecode/controllers/journal.py:159
+#: rhodecode/templates/journal/journal.html:15
 msgid "journal"
 msgstr "日志"
 
-#: rhodecode/controllers/login.py:138
+#: rhodecode/controllers/login.py:185 rhodecode/controllers/login.py:230
+msgid "bad captcha"
+msgstr ""
+
+#: rhodecode/controllers/login.py:191
 msgid "You have successfully registered into RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/login.py:159
+#: rhodecode/controllers/login.py:235
 msgid "Your password reset link was sent"
 msgstr "密码重置链接已经发送"
 
-#: rhodecode/controllers/login.py:179
+#: rhodecode/controllers/login.py:255
 msgid ""
 "Your password reset was successful, new password has been sent to your email"
 msgstr "密码已经成功重置，新密码已经发送到你的邮箱"
 
-#: rhodecode/controllers/pullrequests.py:136
-#: rhodecode/templates/changeset/changeset.html:10
-#: rhodecode/templates/email_templates/changeset_comment.html:8
+#: rhodecode/controllers/pullrequests.py:138
+#: rhodecode/templates/changeset/changeset.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:15
 msgid "Changeset"
 msgstr "修订集"
 
-#: rhodecode/controllers/pullrequests.py:146
+#: rhodecode/controllers/pullrequests.py:155
 msgid "Special"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:147
+#: rhodecode/controllers/pullrequests.py:156
 msgid "Peer branches"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:148 rhodecode/model/scm.py:688
-#: rhodecode/templates/switch_to_list.html:28
-#: rhodecode/templates/bookmarks/bookmarks.html:10
+#: rhodecode/controllers/pullrequests.py:157 rhodecode/model/scm.py:822
+#: rhodecode/templates/switch_to_list.html:38
+#: rhodecode/templates/bookmarks/bookmarks.html:13
 msgid "Bookmarks"
 msgstr "书签"
 
-#: rhodecode/controllers/pullrequests.py:321
+#: rhodecode/controllers/pullrequests.py:328
 msgid "Pull request requires a title with min. 3 chars"
 msgstr "拉取请求的标题至少3个字符"
 
-#: rhodecode/controllers/pullrequests.py:323
-msgid "Error creating pull request"
-msgstr ""
-
-#: rhodecode/controllers/pullrequests.py:343
+#: rhodecode/controllers/pullrequests.py:330
+#, python-format
+msgid "Error creating pull request: %s"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:352
 msgid "Successfully opened new pull request"
 msgstr "成功提交拉取请求"
 
-#: rhodecode/controllers/pullrequests.py:346
+#: rhodecode/controllers/pullrequests.py:355
 msgid "Error occurred during sending pull request"
 msgstr "提交拉取请求时发生错误"
 
-#: rhodecode/controllers/pullrequests.py:385
+#: rhodecode/controllers/pullrequests.py:395
 msgid "Successfully deleted pull request"
 msgstr "成功删除拉取请求"
 
-#: rhodecode/controllers/pullrequests.py:481
+#: rhodecode/controllers/pullrequests.py:483
 msgid "Closing with"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:518
+#: rhodecode/controllers/pullrequests.py:520
 msgid ""
 "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr "只能以批准或者驳回的状态关闭拉取请求"
 
-#: rhodecode/controllers/search.py:132
+#: rhodecode/controllers/search.py:133
 msgid "Invalid search query. Try quoting it."
 msgstr "错误的搜索。请尝试用引号包含它。"
 
-#: rhodecode/controllers/search.py:137
+#: rhodecode/controllers/search.py:138
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr "没有索引用于搜索。请运行whoosh索引器"
 
-#: rhodecode/controllers/search.py:141
+#: rhodecode/controllers/search.py:142
 msgid "An error occurred during this search operation"
 msgstr "在搜索操作中发生异常"
 
-#: rhodecode/controllers/summary.py:182
+#: rhodecode/controllers/summary.py:201
 msgid "No data loaded yet"
 msgstr "数据未加载"
 
-#: rhodecode/controllers/summary.py:188
-#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/controllers/summary.py:204
+#: rhodecode/templates/summary/summary.html:105
 msgid "Statistics are disabled for this repository"
 msgstr "该版本库统计功能已经禁用"
 
-#: rhodecode/controllers/admin/defaults.py:96
+#: rhodecode/controllers/admin/auth_settings.py:125
+msgid "Auth settings updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/auth_settings.py:136
+msgid "error occurred during update of auth settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/defaults.py:95
 msgid "Default settings updated successfully"
 msgstr "默认设置已经成功更新"
 
-#: rhodecode/controllers/admin/defaults.py:110
+#: rhodecode/controllers/admin/defaults.py:109
 msgid "Error occurred during update of defaults"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:56
-msgid "forever"
-msgstr ""
-
-#: rhodecode/controllers/admin/gists.py:57
-msgid "5 minutes"
-msgstr ""
-
 #: rhodecode/controllers/admin/gists.py:58
-msgid "1 hour"
+#: rhodecode/controllers/admin/my_account.py:255
+#: rhodecode/controllers/admin/users.py:287
+msgid "forever"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:59
-msgid "1 day"
+#: rhodecode/controllers/admin/my_account.py:256
+#: rhodecode/controllers/admin/users.py:288
+msgid "5 minutes"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:60
-msgid "1 month"
+#: rhodecode/controllers/admin/my_account.py:257
+#: rhodecode/controllers/admin/users.py:289
+msgid "1 hour"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:61
+#: rhodecode/controllers/admin/my_account.py:258
+#: rhodecode/controllers/admin/users.py:290
+msgid "1 day"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/my_account.py:259
+#: rhodecode/controllers/admin/users.py:291
+msgid "1 month"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:66
+#: rhodecode/controllers/admin/my_account.py:261
+#: rhodecode/controllers/admin/users.py:293
 msgid "Lifetime"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:127
+#: rhodecode/controllers/admin/gists.py:145
 msgid "Error occurred during gist creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:165
+#: rhodecode/controllers/admin/gists.py:183
 #, python-format
 msgid "Deleted gist %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/ldap_settings.py:50
-msgid "BASE"
-msgstr "BASE"
-
-#: rhodecode/controllers/admin/ldap_settings.py:51
-msgid "ONELEVEL"
-msgstr "ONELEVEL"
-
-#: rhodecode/controllers/admin/ldap_settings.py:52
-msgid "SUBTREE"
-msgstr "SUBTREE"
-
-#: rhodecode/controllers/admin/ldap_settings.py:56
-msgid "NEVER"
-msgstr "NEVER"
-
-#: rhodecode/controllers/admin/ldap_settings.py:57
-msgid "ALLOW"
-msgstr "ALLOW"
-
-#: rhodecode/controllers/admin/ldap_settings.py:58
-msgid "TRY"
-msgstr "TRY"
-
-#: rhodecode/controllers/admin/ldap_settings.py:59
-msgid "DEMAND"
-msgstr "DEMAND"
-
-#: rhodecode/controllers/admin/ldap_settings.py:60
-msgid "HARD"
-msgstr "HARD"
-
-#: rhodecode/controllers/admin/ldap_settings.py:64
-msgid "No encryption"
-msgstr "未加密"
-
-#: rhodecode/controllers/admin/ldap_settings.py:65
-msgid "LDAPS connection"
-msgstr "LDAPS连接"
-
-#: rhodecode/controllers/admin/ldap_settings.py:66
-msgid "START_TLS on LDAP connection"
-msgstr "LDAP连接上的START_TLS"
-
-#: rhodecode/controllers/admin/ldap_settings.py:124
-msgid "LDAP settings updated successfully"
-msgstr "LDAP设置已经成功更新"
-
-#: rhodecode/controllers/admin/ldap_settings.py:128
-msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
-msgstr "无法启用LDAP。缺失“python-ldap”库。"
-
-#: rhodecode/controllers/admin/ldap_settings.py:145
-msgid "Error occurred during update of ldap settings"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:58
-#: rhodecode/controllers/admin/permissions.py:62
-#: rhodecode/controllers/admin/permissions.py:66
-msgid "None"
-msgstr "无"
-
-#: rhodecode/controllers/admin/permissions.py:59
-#: rhodecode/controllers/admin/permissions.py:63
-#: rhodecode/controllers/admin/permissions.py:67
-msgid "Read"
-msgstr "读"
+#: rhodecode/controllers/admin/gists.py:232
+msgid "unmodified"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:261
+msgid "Successfully updated gist content"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:266
+msgid "Successfully updated gist data"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:269
+#, python-format
+msgid "Error occurred during update of gist %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:68
+msgid "You can't edit this user since it's crucial for entire application"
+msgstr "由于是系统帐号，无法编辑该用户"
+
+#: rhodecode/controllers/admin/my_account.py:125
+msgid "Your account was updated successfully"
+msgstr "你的帐号已经更新完成"
+
+#: rhodecode/controllers/admin/my_account.py:139
+#: rhodecode/controllers/admin/users.py:205
+#, python-format
+msgid "Error occurred during update of user %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:159
+msgid "Successfully updated password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:169
+msgid "Error occurred during update of user password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:211
+#: rhodecode/controllers/admin/users.py:430
+#, python-format
+msgid "Added email %s to user"
+msgstr "已为用户添加电子邮件 %s"
+
+#: rhodecode/controllers/admin/my_account.py:217
+#: rhodecode/controllers/admin/users.py:436
+msgid "An error occurred during email saving"
+msgstr "保存电子邮件时发生错误"
+
+#: rhodecode/controllers/admin/my_account.py:226
+#: rhodecode/controllers/admin/users.py:447
+msgid "Removed email from user"
+msgstr "成功删除用户电子邮件"
+
+#: rhodecode/controllers/admin/my_account.py:272
+#: rhodecode/controllers/admin/users.py:313
+msgid "Api key successfully created"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:284
+#: rhodecode/controllers/admin/users.py:329
+msgid "Api key successfully reset"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:288
+#: rhodecode/controllers/admin/users.py:333
+msgid "Api key successfully deleted"
+msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:60
 #: rhodecode/controllers/admin/permissions.py:64
 #: rhodecode/controllers/admin/permissions.py:68
-msgid "Write"
-msgstr "写"
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:104
+msgid "None"
+msgstr "无"
 
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
 #: rhodecode/controllers/admin/permissions.py:69
-#: rhodecode/templates/admin/defaults/defaults.html:9
-#: rhodecode/templates/admin/ldap/ldap.html:9
-#: rhodecode/templates/admin/permissions/permissions.html:9
-#: rhodecode/templates/admin/repos/repo_add.html:10
-#: rhodecode/templates/admin/repos/repo_add.html:14
-#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:9
-#: rhodecode/templates/admin/users/user_add.html:8
-#: rhodecode/templates/admin/users/user_edit.html:9
-#: rhodecode/templates/admin/users/user_edit.html:133
-#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/admin/users_groups/users_group_add.html:8
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:9
-#: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:317
-#: rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:325
+msgid "Read"
+msgstr "读"
+
+#: rhodecode/controllers/admin/permissions.py:62
+#: rhodecode/controllers/admin/permissions.py:66
+#: rhodecode/controllers/admin/permissions.py:70
+msgid "Write"
+msgstr "写"
+
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
+#: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/templates/admin/auth/auth_settings.html:12
+#: rhodecode/templates/admin/defaults/defaults.html:12
+#: rhodecode/templates/admin/permissions/permissions.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:17
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/settings/settings.html:12
+#: rhodecode/templates/admin/user_groups/user_group_add.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+#: rhodecode/templates/admin/users/user_add.html:11
+#: rhodecode/templates/admin/users/user_edit.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:114
+#: rhodecode/templates/admin/users/users.html:13
+#: rhodecode/templates/admin/users/users.html:58
+#: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:340
+#: rhodecode/templates/base/base.html:346
+#: rhodecode/templates/base/base.html:347
 msgid "Admin"
 msgstr "管理"
 
-#: rhodecode/controllers/admin/permissions.py:72
-#: rhodecode/controllers/admin/permissions.py:83
-#: rhodecode/controllers/admin/permissions.py:86
-#: rhodecode/controllers/admin/permissions.py:89
-#: rhodecode/controllers/admin/permissions.py:92
+#: rhodecode/controllers/admin/permissions.py:74
+#: rhodecode/controllers/admin/permissions.py:85
+#: rhodecode/controllers/admin/permissions.py:90
+#: rhodecode/controllers/admin/permissions.py:93
+#: rhodecode/controllers/admin/permissions.py:96
+#: rhodecode/controllers/admin/permissions.py:99
 msgid "Disabled"
 msgstr "停用"
 
-#: rhodecode/controllers/admin/permissions.py:74
-msgid "Allowed with manual account activation"
-msgstr ""
-
 #: rhodecode/controllers/admin/permissions.py:76
+msgid "Allowed with manual account activation"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:78
 msgid "Allowed with automatic account activation"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:79
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444
+#: rhodecode/controllers/admin/permissions.py:81
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1485
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1542
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1564
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1603
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1655
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1682 rhodecode/model/db.py:1692
 msgid "Manual activation of external account"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:80
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445
+#: rhodecode/controllers/admin/permissions.py:82
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1486
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1565
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1604
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1656
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1683 rhodecode/model/db.py:1693
 msgid "Automatic activation of external account"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:84
-#: rhodecode/controllers/admin/permissions.py:87
-#: rhodecode/controllers/admin/permissions.py:90
-#: rhodecode/controllers/admin/permissions.py:93
+#: rhodecode/controllers/admin/permissions.py:86
+#: rhodecode/controllers/admin/permissions.py:89
+#: rhodecode/controllers/admin/permissions.py:94
+#: rhodecode/controllers/admin/permissions.py:97
+#: rhodecode/controllers/admin/permissions.py:100
 msgid "Enabled"
 msgstr "启用"
 
-#: rhodecode/controllers/admin/permissions.py:138
-msgid "Default permissions updated successfully"
-msgstr "成功更新默认权限"
-
-#: rhodecode/controllers/admin/permissions.py:152
+#: rhodecode/controllers/admin/permissions.py:123
+msgid "Global permissions updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:137
 msgid "Error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:128
-msgid "--REMOVE FORK--"
-msgstr "-- 移除复刻 --"
-
-#: rhodecode/controllers/admin/repos.py:168
-#, python-format
-msgid "Created repository %s from %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:174
-#, python-format
-msgid "Created repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:197
-#, python-format
-msgid "Error creating repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:270
-#, python-format
-msgid "Repository %s updated successfully"
-msgstr "版本库%s成功更新"
-
-#: rhodecode/controllers/admin/repos.py:288
-#, python-format
-msgid "Error occurred during update of repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:315
-#, python-format
-msgid "Detached %s forks"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:318
-#, python-format
-msgid "Deleted %s forks"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:323
-#, python-format
-msgid "Deleted repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:326
-#, python-format
-msgid "Cannot delete %s it still contains attached forks"
-msgstr "无法删除%s因为它还有其他分复刻本库"
-
-#: rhodecode/controllers/admin/repos.py:331
-#, python-format
-msgid "An error occurred during deletion of %s"
-msgstr "在删除%s的时候发生错误"
-
-#: rhodecode/controllers/admin/repos.py:345
-msgid "Repository permissions updated"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:375
-#: rhodecode/controllers/admin/repos_groups.py:332
-#: rhodecode/controllers/admin/users_groups.py:312
-msgid "An error occurred during revoking of permission"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:392
-msgid "An error occurred during deletion of repository stats"
-msgstr "删除版本库统计时发生错误"
-
-#: rhodecode/controllers/admin/repos.py:409
-msgid "An error occurred during cache invalidation"
-msgstr "清除缓存时发生错误"
-
-#: rhodecode/controllers/admin/repos.py:429
-#: rhodecode/controllers/admin/repos.py:456
-msgid "An error occurred during unlocking"
-msgstr "解锁时发生错误"
-
-#: rhodecode/controllers/admin/repos.py:447
-msgid "Unlocked"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:450
-msgid "Locked"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:452
-#, python-format
-msgid "Repository has been %s"
-msgstr "版本库已被%s"
-
-#: rhodecode/controllers/admin/repos.py:476
-msgid "Updated repository visibility in public journal"
-msgstr "成功更新在公共日志中的可见性"
-
-#: rhodecode/controllers/admin/repos.py:480
-msgid "An error occurred during setting this repository in public journal"
-msgstr "设置版本库到公共日志时发生错误"
-
-#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302
-msgid "Token mismatch"
-msgstr "令牌不匹配"
-
-#: rhodecode/controllers/admin/repos.py:498
-msgid "Pulled from remote location"
-msgstr "成功拉取自远程路径"
-
-#: rhodecode/controllers/admin/repos.py:501
-msgid "An error occurred during pull from remote location"
-msgstr "从远程路径拉取时发生错误"
-
-#: rhodecode/controllers/admin/repos.py:517
-msgid "Nothing"
-msgstr "无"
-
-#: rhodecode/controllers/admin/repos.py:519
-#, python-format
-msgid "Marked repo %s as fork of %s"
-msgstr "成功将版本库%s标记为复刻自%s"
-
-#: rhodecode/controllers/admin/repos.py:523
-msgid "An error occurred during this operation"
-msgstr "在搜索操作中发生错误"
-
-#: rhodecode/controllers/admin/repos.py:562
-msgid "An error occurred during creation of field"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:576
-msgid "An error occurred during removal of field"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:147
+#: rhodecode/controllers/admin/repo_groups.py:184
 #, python-format
 msgid "Created repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:159
+#: rhodecode/controllers/admin/repo_groups.py:196
 #, python-format
 msgid "Error occurred during creation of repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:217
+#: rhodecode/controllers/admin/repo_groups.py:254
 #, python-format
 msgid "Updated repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:232
+#: rhodecode/controllers/admin/repo_groups.py:269
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:250
+#: rhodecode/controllers/admin/repo_groups.py:287
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr "这个组内有%s个版本库因而无法删除"
 
-#: rhodecode/controllers/admin/repos_groups.py:257
+#: rhodecode/controllers/admin/repo_groups.py:294
 #, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:263
+#: rhodecode/controllers/admin/repo_groups.py:300
 #, python-format
 msgid "Removed repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:268
+#: rhodecode/controllers/admin/repo_groups.py:305
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:279
-#: rhodecode/controllers/admin/repos_groups.py:314
-#: rhodecode/controllers/admin/users_groups.py:300
+#: rhodecode/controllers/admin/repo_groups.py:417
+#: rhodecode/controllers/admin/repo_groups.py:452
+#: rhodecode/controllers/admin/user_groups.py:335
 msgid "Cannot revoke permission for yourself as admin"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:294
+#: rhodecode/controllers/admin/repo_groups.py:432
 msgid "Repository Group permissions updated"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:123
+#: rhodecode/controllers/admin/repo_groups.py:469
+#: rhodecode/controllers/admin/repos.py:424
+#: rhodecode/controllers/admin/user_groups.py:347
+msgid "An error occurred during revoking of permission"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:160
+#, python-format
+msgid "Error creating repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:235
+#, python-format
+msgid "Created repository %s from %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:244
+#, python-format
+msgid "Forked repository %s as %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:247
+#, python-format
+msgid "Created repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:287
+#, python-format
+msgid "Repository %s updated successfully"
+msgstr "版本库%s成功更新"
+
+#: rhodecode/controllers/admin/repos.py:305
+#, python-format
+msgid "Error occurred during update of repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:332
+#, python-format
+msgid "Detached %s forks"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:335
+#, python-format
+msgid "Deleted %s forks"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:340
+#, python-format
+msgid "Deleted repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:343
+#, python-format
+msgid "Cannot delete %s it still contains attached forks"
+msgstr "无法删除%s因为它还有其他分复刻本库"
+
+#: rhodecode/controllers/admin/repos.py:348
+#, python-format
+msgid "An error occurred during deletion of %s"
+msgstr "在删除%s的时候发生错误"
+
+#: rhodecode/controllers/admin/repos.py:400
+msgid "Repository permissions updated"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:456
+msgid "An error occurred during creation of field"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:470
+msgid "An error occurred during removal of field"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:486
+msgid "-- Not a fork --"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:520
+msgid "Updated repository visibility in public journal"
+msgstr "成功更新在公共日志中的可见性"
+
+#: rhodecode/controllers/admin/repos.py:524
+msgid "An error occurred during setting this repository in public journal"
+msgstr "设置版本库到公共日志时发生错误"
+
+#: rhodecode/controllers/admin/repos.py:529 rhodecode/model/validators.py:359
+msgid "Token mismatch"
+msgstr "令牌不匹配"
+
+#: rhodecode/controllers/admin/repos.py:544
+msgid "Nothing"
+msgstr "无"
+
+#: rhodecode/controllers/admin/repos.py:546
+#, python-format
+msgid "Marked repo %s as fork of %s"
+msgstr "成功将版本库%s标记为复刻自%s"
+
+#: rhodecode/controllers/admin/repos.py:553
+msgid "An error occurred during this operation"
+msgstr "在搜索操作中发生错误"
+
+#: rhodecode/controllers/admin/repos.py:569
+msgid "Locked repository"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:572
+msgid "Unlocked repository"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:575
+#: rhodecode/controllers/admin/repos.py:602
+msgid "An error occurred during unlocking"
+msgstr "解锁时发生错误"
+
+#: rhodecode/controllers/admin/repos.py:593
+msgid "Unlocked"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:596
+msgid "Locked"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:598
+#, python-format
+msgid "Repository has been %s"
+msgstr "版本库已被%s"
+
+#: rhodecode/controllers/admin/repos.py:616
+msgid "Cache invalidation successful"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:620
+msgid "An error occurred during cache invalidation"
+msgstr "清除缓存时发生错误"
+
+#: rhodecode/controllers/admin/repos.py:635
+msgid "Pulled from remote location"
+msgstr "成功拉取自远程路径"
+
+#: rhodecode/controllers/admin/repos.py:638
+msgid "An error occurred during pull from remote location"
+msgstr "从远程路径拉取时发生错误"
+
+#: rhodecode/controllers/admin/repos.py:671
+msgid "An error occurred during deletion of repository stats"
+msgstr "删除版本库统计时发生错误"
+
+#: rhodecode/controllers/admin/settings.py:171
+msgid "Updated VCS settings"
+msgstr "成功更新版本控制系统设置"
+
+#: rhodecode/controllers/admin/settings.py:175
+msgid ""
+"Unable to activate hgsubversion support. The \"hgsubversion\" library is "
+"missing"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:181
+#: rhodecode/controllers/admin/settings.py:273
+msgid "Error occurred during updating application settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:214
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:132
-msgid "Whoosh reindex task scheduled"
-msgstr "Whoosh重新索引任务调度"
-
-#: rhodecode/controllers/admin/settings.py:163
+#: rhodecode/controllers/admin/settings.py:269
 msgid "Updated application settings"
 msgstr "更新应用设置"
 
-#: rhodecode/controllers/admin/settings.py:167
-#: rhodecode/controllers/admin/settings.py:304
-msgid "Error occurred during updating application settings"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:219
+#: rhodecode/controllers/admin/settings.py:326
 msgid "Updated visualisation settings"
 msgstr "成功更新可视化设置"
 
-#: rhodecode/controllers/admin/settings.py:224
+#: rhodecode/controllers/admin/settings.py:331
 msgid "Error occurred during updating visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:300
-msgid "Updated VCS settings"
-msgstr "成功更新版本控制系统设置"
-
-#: rhodecode/controllers/admin/settings.py:314
+#: rhodecode/controllers/admin/settings.py:357
+msgid "Please enter email address"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:369
+msgid "Send email task created"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:399
 msgid "Added new hook"
 msgstr "新建钩子"
 
-#: rhodecode/controllers/admin/settings.py:326
-msgid "Updated hooks"
-msgstr "更新钩子"
-
-#: rhodecode/controllers/admin/settings.py:330
-msgid "Error occurred during hook creation"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:349
-msgid "Email task created"
-msgstr "已创建电子邮件任务"
-
 #: rhodecode/controllers/admin/settings.py:413
-msgid "You can't edit this user since it's crucial for entire application"
-msgstr "由于是系统帐号，无法编辑该用户"
-
-#: rhodecode/controllers/admin/settings.py:455
-msgid "Your account was updated successfully"
-msgstr "你的帐号已经更新完成"
-
-#: rhodecode/controllers/admin/settings.py:470
-#: rhodecode/controllers/admin/users.py:198
-#, python-format
-msgid "Error occurred during update of user %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:130
+msgid "Updated hooks"
+msgstr "更新钩子"
+
+#: rhodecode/controllers/admin/settings.py:417
+msgid "Error occurred during hook creation"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:443
+msgid "Whoosh reindex task scheduled"
+msgstr "Whoosh重新索引任务调度"
+
+#: rhodecode/controllers/admin/settings.py:535
+msgid "Updated license information"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:540
+msgid "Error occurred during updating license info"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:563
+#, python-format
+msgid ""
+"Your license will expire on %s, please contact support to extend your "
+"license."
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:566
+#, python-format
+msgid ""
+"Your license has expired on %s, please contact support to extend your "
+"license."
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:571
+msgid ""
+"Unexpected error while reading license key. Please make sure your license "
+"token and key are correct"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:148
+#, python-format
+msgid "Created user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:159
+#, python-format
+msgid "Error occurred during creation of user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:197
+#, python-format
+msgid "Updated user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:219
+#, python-format
+msgid "Error occurred during update of user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:237
+msgid "Successfully deleted user group"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:242
+msgid "An error occurred during deletion of user group"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:309
+msgid "Target group cannot be the same"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:315
+msgid "User Group permissions updated"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:435
+#: rhodecode/controllers/admin/users.py:395
+msgid "Updated permissions"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:439
+#: rhodecode/controllers/admin/users.py:399
+msgid "An error occurred during permissions saving"
+msgstr "保存权限时发生错误"
+
+#: rhodecode/controllers/admin/users.py:133
 #, python-format
 msgid "Created user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:142
+#: rhodecode/controllers/admin/users.py:147
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:176
+#: rhodecode/controllers/admin/users.py:186
 msgid "User updated successfully"
 msgstr "用户更新成功"
 
-#: rhodecode/controllers/admin/users.py:214
+#: rhodecode/controllers/admin/users.py:221
 msgid "Successfully deleted user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:219
+#: rhodecode/controllers/admin/users.py:226
 msgid "An error occurred during deletion of user"
 msgstr "删除用户时发生错误"
 
-#: rhodecode/controllers/admin/users.py:234
+#: rhodecode/controllers/admin/users.py:240
+#: rhodecode/controllers/admin/users.py:258
+#: rhodecode/controllers/admin/users.py:281
+#: rhodecode/controllers/admin/users.py:306
+#: rhodecode/controllers/admin/users.py:319
+#: rhodecode/controllers/admin/users.py:343
+#: rhodecode/controllers/admin/users.py:406
+#: rhodecode/controllers/admin/users.py:453
 msgid "You can't edit this user"
 msgstr "无法编辑该用户"
 
-#: rhodecode/controllers/admin/users.py:293
-#: rhodecode/controllers/admin/users_groups.py:372
-msgid "Updated permissions"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:297
-#: rhodecode/controllers/admin/users_groups.py:376
-msgid "An error occurred during permissions saving"
-msgstr "保存权限时发生错误"
-
-#: rhodecode/controllers/admin/users.py:311
-#, python-format
-msgid "Added email %s to user"
-msgstr "已为用户添加电子邮件 %s"
-
-#: rhodecode/controllers/admin/users.py:317
-msgid "An error occurred during email saving"
-msgstr "保存电子邮件时发生错误"
-
-#: rhodecode/controllers/admin/users.py:327
-msgid "Removed email from user"
-msgstr "成功删除用户电子邮件"
-
-#: rhodecode/controllers/admin/users.py:340
-#, python-format
-msgid "Added ip %s to user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:346
+#: rhodecode/controllers/admin/users.py:481
+#, python-format
+msgid "Added ip %s to user whitelist"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:487
 msgid "An error occurred during ip saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:358
-msgid "Removed ip from user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:162
-#, python-format
-msgid "Created user group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:173
-#, python-format
-msgid "Error occurred during creation of user group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:210
-#, python-format
-msgid "Updated user group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:232
-#, python-format
-msgid "Error occurred during update of user group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:250
-msgid "Successfully deleted user group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:255
-msgid "An error occurred during deletion of user group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:274
-msgid "Target group cannot be the same"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:280
-msgid "User Group permissions updated"
-msgstr ""
-
-#: rhodecode/lib/auth.py:544
+#: rhodecode/controllers/admin/users.py:501
+msgid "Removed ip address from user whitelist"
+msgstr ""
+
+#: rhodecode/lib/auth.py:746
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 
-#: rhodecode/lib/auth.py:593
+#: rhodecode/lib/auth.py:807
 msgid "You need to be a registered user to perform this action"
 msgstr "必须是注册用户才能进行此操作"
 
-#: rhodecode/lib/auth.py:634
+#: rhodecode/lib/auth.py:844
 msgid "You need to be a signed in to view this page"
 msgstr "必须登录才能访问该页面"
 
-#: rhodecode/lib/diffs.py:66
+#: rhodecode/lib/diffs.py:64
 msgid "Binary file"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:82
+#: rhodecode/lib/diffs.py:80
 msgid ""
 "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr "修订集因过大而被截断，可查看原始修订集作为替代"
 
-#: rhodecode/lib/diffs.py:92
+#: rhodecode/lib/diffs.py:90
 msgid "No changes detected"
 msgstr "未发现差异"
 
-#: rhodecode/lib/helpers.py:539
-msgid "True"
-msgstr "是"
-
-#: rhodecode/lib/helpers.py:542
-msgid "False"
-msgstr "否"
-
-#: rhodecode/lib/helpers.py:580
+#: rhodecode/lib/helpers.py:598
 #, python-format
 msgid "Deleted branch: %s"
 msgstr "已经删除分支%s"
 
-#: rhodecode/lib/helpers.py:583
+#: rhodecode/lib/helpers.py:601
 #, python-format
 msgid "Created tag: %s"
 msgstr "创建标签%s"
 
-#: rhodecode/lib/helpers.py:596
+#: rhodecode/lib/helpers.py:614
 msgid "Changeset not found"
 msgstr "未找到修订集"
 
-#: rhodecode/lib/helpers.py:646
+#: rhodecode/lib/helpers.py:664
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "显示合并的修订集%s->%s"
 
-#: rhodecode/lib/helpers.py:652
+#: rhodecode/lib/helpers.py:670
 msgid "compare view"
 msgstr "比较显示"
 
-#: rhodecode/lib/helpers.py:672
+#: rhodecode/lib/helpers.py:690
 msgid "and"
 msgstr "还有"
 
-#: rhodecode/lib/helpers.py:673
+#: rhodecode/lib/helpers.py:691
 #, python-format
 msgid "%s more"
 msgstr "%s个"
 
-#: rhodecode/lib/helpers.py:674
-#: rhodecode/templates/changelog/changelog.html:53
+#: rhodecode/lib/helpers.py:692
+#: rhodecode/templates/changelog/changelog.html:58
 msgid "revisions"
 msgstr "修订"
 
-#: rhodecode/lib/helpers.py:698
+#: rhodecode/lib/helpers.py:716
 #, python-format
 msgid "fork name %s"
 msgstr "复刻名称%s"
 
-#: rhodecode/lib/helpers.py:715
-#: rhodecode/templates/pullrequests/pullrequest_show.html:8
+#: rhodecode/lib/helpers.py:733
+#: rhodecode/templates/pullrequests/pullrequest_show.html:11
 #, python-format
 msgid "Pull request #%s"
 msgstr "拉取请求#%s"
 
-#: rhodecode/lib/helpers.py:725
+#: rhodecode/lib/helpers.py:743
 msgid "[deleted] repository"
 msgstr "[删除]版本库"
 
-#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739
+#: rhodecode/lib/helpers.py:745 rhodecode/lib/helpers.py:757
 msgid "[created] repository"
 msgstr "[创建]版本库"
 
-#: rhodecode/lib/helpers.py:729
+#: rhodecode/lib/helpers.py:747
 msgid "[created] repository as fork"
 msgstr "[创建]复刻版本库"
 
-#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741
+#: rhodecode/lib/helpers.py:749 rhodecode/lib/helpers.py:759
 msgid "[forked] repository"
 msgstr "[复刻]版本库"
 
-#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743
+#: rhodecode/lib/helpers.py:751 rhodecode/lib/helpers.py:761
 msgid "[updated] repository"
 msgstr "[更新]版本库"
 
-#: rhodecode/lib/helpers.py:735
+#: rhodecode/lib/helpers.py:753
 msgid "[downloaded] archive from repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:737
+#: rhodecode/lib/helpers.py:755
 msgid "[delete] repository"
 msgstr "[删除]版本库"
 
-#: rhodecode/lib/helpers.py:745
+#: rhodecode/lib/helpers.py:763
 msgid "[created] user"
 msgstr "[创建]用户"
 
-#: rhodecode/lib/helpers.py:747
+#: rhodecode/lib/helpers.py:765
 msgid "[updated] user"
 msgstr "[更新]用户"
 
-#: rhodecode/lib/helpers.py:749
+#: rhodecode/lib/helpers.py:767
 msgid "[created] user group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:751
+#: rhodecode/lib/helpers.py:769
 msgid "[updated] user group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:753
+#: rhodecode/lib/helpers.py:771
 msgid "[commented] on revision in repository"
 msgstr "[评论]了版本库中的修订"
 
-#: rhodecode/lib/helpers.py:755
+#: rhodecode/lib/helpers.py:773
 msgid "[commented] on pull request for"
 msgstr "[评论]拉取请求"
 
-#: rhodecode/lib/helpers.py:757
+#: rhodecode/lib/helpers.py:775
 msgid "[closed] pull request for"
 msgstr "[关闭] 拉取请求"
 
-#: rhodecode/lib/helpers.py:759
+#: rhodecode/lib/helpers.py:777
 msgid "[pushed] into"
 msgstr "[推送]到"
 
-#: rhodecode/lib/helpers.py:761
+#: rhodecode/lib/helpers.py:779
 msgid "[committed via RhodeCode] into repository"
 msgstr "[通过RhodeCode提交]到版本库"
 
-#: rhodecode/lib/helpers.py:763
+#: rhodecode/lib/helpers.py:781
 msgid "[pulled from remote] into repository"
 msgstr "[远程拉取]到版本库"
 
-#: rhodecode/lib/helpers.py:765
+#: rhodecode/lib/helpers.py:783
 msgid "[pulled] from"
 msgstr "[拉取]自"
 
-#: rhodecode/lib/helpers.py:767
+#: rhodecode/lib/helpers.py:785
 msgid "[started following] repository"
 msgstr "[开始关注]版本库"
 
-#: rhodecode/lib/helpers.py:769
+#: rhodecode/lib/helpers.py:787
 msgid "[stopped following] repository"
 msgstr "[停止关注]版本库"
 
-#: rhodecode/lib/helpers.py:1088
+#: rhodecode/lib/helpers.py:1102
 #, python-format
 msgid " and %s more"
 msgstr "还有%s个"
 
-#: rhodecode/lib/helpers.py:1092
+#: rhodecode/lib/helpers.py:1106
 msgid "No Files"
 msgstr "没有文件"
 
-#: rhodecode/lib/helpers.py:1158
+#: rhodecode/lib/helpers.py:1172
 msgid "new file"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1161
+#: rhodecode/lib/helpers.py:1175
 msgid "mod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1164
+#: rhodecode/lib/helpers.py:1178
 msgid "del"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1167
+#: rhodecode/lib/helpers.py:1181
 msgid "rename"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1172
+#: rhodecode/lib/helpers.py:1186
 msgid "chmod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1404
+#: rhodecode/lib/helpers.py:1418
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from the"
 " filesystem please run the application again in order to rescan repositories"
 msgstr "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库"
 
-#: rhodecode/lib/unionrepo.py:193
-msgid "cannot create new union repository"
-msgstr ""
-
-#: rhodecode/lib/utils2.py:410
+#: rhodecode/lib/utils2.py:413
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d年"
 
-#: rhodecode/lib/utils2.py:411
+#: rhodecode/lib/utils2.py:414
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d月"
 
-#: rhodecode/lib/utils2.py:412
+#: rhodecode/lib/utils2.py:415
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d天"
 
-#: rhodecode/lib/utils2.py:413
+#: rhodecode/lib/utils2.py:416
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d时"
 
-#: rhodecode/lib/utils2.py:414
+#: rhodecode/lib/utils2.py:417
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d分"
 
-#: rhodecode/lib/utils2.py:415
+#: rhodecode/lib/utils2.py:418
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d秒"
 
-#: rhodecode/lib/utils2.py:431
+#: rhodecode/lib/utils2.py:434
 #, python-format
 msgid "in %s"
 msgstr "%s"
 
-#: rhodecode/lib/utils2.py:433
+#: rhodecode/lib/utils2.py:436
 #, python-format
 msgid "%s ago"
 msgstr "%s前"
 
-#: rhodecode/lib/utils2.py:435
+#: rhodecode/lib/utils2.py:438
 #, python-format
 msgid "in %s and %s"
 msgstr "%s零%s"
 
-#: rhodecode/lib/utils2.py:438
+#: rhodecode/lib/utils2.py:441
 #, python-format
 msgid "%s and %s ago"
 msgstr "%s零%s前"
 
-#: rhodecode/lib/utils2.py:441
+#: rhodecode/lib/utils2.py:444
 msgid "just now"
 msgstr "刚才"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1454
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1511
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1572
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1622
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1649 rhodecode/model/db.py:1659
 msgid "Repository no access"
 msgstr "无版本库访问权限"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1455
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1573
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1623
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1650 rhodecode/model/db.py:1660
 msgid "Repository read access"
 msgstr "版本库读取权限"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1456
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1574
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1651 rhodecode/model/db.py:1661
 msgid "Repository write access"
 msgstr "版本库写入权限"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1167
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1457
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1515
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1575
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1652 rhodecode/model/db.py:1662
 msgid "Repository admin access"
 msgstr "版本库管理权限"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308
 msgid "Repositories Group no access"
 msgstr "无版本库组访问权限"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309
 msgid "Repositories Group read access"
 msgstr "版本库组读取权限"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310
 msgid "Repositories Group write access"
 msgstr "版本库组写入"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311
 msgid "Repositories Group admin access"
 msgstr "版本库组管理权限"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1452
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1509
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1510
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1570
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1620
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1647 rhodecode/model/db.py:1657
 msgid "RhodeCode Administrator"
 msgstr "RhodeCode 管理员"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1475
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1532
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1554
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1593
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1670 rhodecode/model/db.py:1680
 msgid "Repository creation disabled"
 msgstr "禁用创建版本库"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1476
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1555
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1594
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1671 rhodecode/model/db.py:1681
 msgid "Repository creation enabled"
 msgstr "允许创建版本库"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1478
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1557
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1596
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1648
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1675 rhodecode/model/db.py:1685
 msgid "Repository forking disabled"
 msgstr "禁用复刻版本库"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1479
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1537
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1558
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1597
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1649
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1676 rhodecode/model/db.py:1686
 msgid "Repository forking enabled"
 msgstr "允许复刻版本库"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1403
 msgid "Register disabled"
 msgstr "禁用注册"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1180
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1404
 msgid "Register new user with RhodeCode with manual activation"
 msgstr "用手动激活注册新用户"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1183
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1407
 msgid "Register new user with RhodeCode with auto activation"
 msgstr "用自动激活注册新用户"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1651
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1980
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2040
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2062
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2101
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2154
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2200 rhodecode/model/db.py:2210
 msgid "Not Reviewed"
 msgstr "未检视"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1652
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1981
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2063
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2102
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2155
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2201 rhodecode/model/db.py:2211
 msgid "Approved"
 msgstr "已批准"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1653
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1982
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2064
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2103
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2156
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2202 rhodecode/model/db.py:2212
 msgid "Rejected"
 msgstr "驳回"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1654
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1983
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2044
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2065
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2104
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2157
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2203 rhodecode/model/db.py:2213
 msgid "Under Review"
 msgstr "检视中"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1300
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1357
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1358
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1379
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1471
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1498 rhodecode/model/db.py:1508
 msgid "top level"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1459
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1516
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1577
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1654 rhodecode/model/db.py:1664
 msgid "Repository group no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1460
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1578
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1628
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1655 rhodecode/model/db.py:1665
 msgid "Repository group read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1461
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1579
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1629
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1656 rhodecode/model/db.py:1666
 msgid "Repository group write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1462
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1520
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1580
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1630
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1657 rhodecode/model/db.py:1667
 msgid "Repository group admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1464
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1521
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1582
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1632
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1659 rhodecode/model/db.py:1669
 msgid "User group no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1465
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1583
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1633
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1660 rhodecode/model/db.py:1670
 msgid "User group read access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1466
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1545
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1584
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1634
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1661 rhodecode/model/db.py:1671
 msgid "User group write access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1467
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1525
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1546
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1585
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1635
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1662 rhodecode/model/db.py:1672
 msgid "User group admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1469
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1526
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1548
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1587
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1637
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1664 rhodecode/model/db.py:1674
 msgid "Repository Group creation disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1470
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1528
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1549
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1588
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1638
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1665 rhodecode/model/db.py:1675
 msgid "Repository Group creation enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1472
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1529
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1551
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1590
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1640
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1667 rhodecode/model/db.py:1677
 msgid "User Group creation disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1473
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1552
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1591
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1641
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1668 rhodecode/model/db.py:1678
 msgid "User Group creation enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1481
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1560
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1599
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1651
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1678 rhodecode/model/db.py:1688
 msgid "Registration disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1482
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1561
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1600
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1652
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1679 rhodecode/model/db.py:1689
 msgid "User Registration with manual account activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1483
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1562
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1601
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1653
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1680 rhodecode/model/db.py:1690
 msgid "User Registration with automatic account activation"
 msgstr ""
 
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1672 rhodecode/model/db.py:1682
+msgid ""
+"Repository creation enabled with write permission to a repository group"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1673 rhodecode/model/db.py:1683
+msgid ""
+"Repository creation disabled with write permission to a repository group"
+msgstr ""
+
 #: rhodecode/model/comment.py:75
 #, python-format
 msgid "on line %s"
@@ -1314,470 +1661,487 @@
 msgid "[Mention]"
 msgstr "[提及]"
 
-#: rhodecode/model/forms.py:43
+#: rhodecode/model/forms.py:57
 msgid "Please enter a login"
 msgstr "请登录"
 
-#: rhodecode/model/forms.py:44
+#: rhodecode/model/forms.py:58
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr "输入一个不少于%(min)i个字符的值"
 
-#: rhodecode/model/forms.py:52
+#: rhodecode/model/forms.py:66
 msgid "Please enter a password"
 msgstr "请输入密码"
 
-#: rhodecode/model/forms.py:53
+#: rhodecode/model/forms.py:67
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr "输入少于%(min)i个字符"
 
-#: rhodecode/model/notification.py:228
-#, python-format
-msgid "%(user)s commented on changeset at %(when)s"
+#: rhodecode/model/forms.py:156
+msgid "Name must not contain only digits"
 msgstr ""
 
 #: rhodecode/model/notification.py:229
 #, python-format
-msgid "%(user)s sent message at %(when)s"
+msgid "%(user)s commented on changeset at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:230
 #, python-format
-msgid "%(user)s mentioned you at %(when)s"
+msgid "%(user)s sent message at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:231
 #, python-format
-msgid "%(user)s registered in RhodeCode at %(when)s"
+msgid "%(user)s mentioned you at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:232
 #, python-format
-msgid "%(user)s opened new pull request at %(when)s"
+msgid "%(user)s registered in RhodeCode at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:233
 #, python-format
+msgid "%(user)s opened new pull request at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:234
+#, python-format
 msgid "%(user)s commented on pull request at %(when)s"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:98
+#: rhodecode/model/pull_request.py:105
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr ""
 
-#: rhodecode/model/scm.py:674
+#: rhodecode/model/scm.py:808
 msgid "latest tip"
 msgstr "最新tip版本"
 
-#: rhodecode/model/user.py:232
+#: rhodecode/model/user.py:196
 msgid "New user registration"
 msgstr ""
 
-#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
+#: rhodecode/model/user.py:220 rhodecode/model/user.py:245
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr "由于是系统帐号，无法编辑该用户"
 
-#: rhodecode/model/user.py:303
+#: rhodecode/model/user.py:268
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr "由于是系统帐号，无法删除该用户"
 
-#: rhodecode/model/user.py:309
+#: rhodecode/model/user.py:274
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch owners "
 "or remove those repositories. %s"
 msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s"
 
-#: rhodecode/model/user.py:334
+#: rhodecode/model/user.py:302
 msgid "Password reset link"
 msgstr ""
 
-#: rhodecode/model/user.py:366
+#: rhodecode/model/user.py:331
 msgid "Your new password"
 msgstr ""
 
-#: rhodecode/model/user.py:367
+#: rhodecode/model/user.py:332
 #, python-format
 msgid "Your new RhodeCode password:%s"
 msgstr ""
 
-#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39
+#: rhodecode/model/validators.py:82 rhodecode/model/validators.py:83
 msgid "Value cannot be an empty list"
 msgstr "值不能为空"
 
-#: rhodecode/model/validators.py:85
+#: rhodecode/model/validators.py:120
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "用户名称%(username)s已经存在"
 
-#: rhodecode/model/validators.py:87
+#: rhodecode/model/validators.py:122
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr "不允许用户名 \"%(username)s\""
 
-#: rhodecode/model/validators.py:89
+#: rhodecode/model/validators.py:124
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or "
 "dashes and must begin with alphanumeric character or underscore"
 msgstr ""
 
-#: rhodecode/model/validators.py:117
+#: rhodecode/model/validators.py:151
+msgid "The input is not valid"
+msgstr ""
+
+#: rhodecode/model/validators.py:158
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr "用户名称 %(username)s 无效"
 
-#: rhodecode/model/validators.py:136
+#: rhodecode/model/validators.py:177
 msgid "Invalid user group name"
 msgstr ""
 
-#: rhodecode/model/validators.py:137
+#: rhodecode/model/validators.py:178
 #, python-format
 msgid "User group \"%(usergroup)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:139
+#: rhodecode/model/validators.py:180
 msgid ""
 "user group name may only contain alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr ""
 
-#: rhodecode/model/validators.py:177
+#: rhodecode/model/validators.py:218
 msgid "Cannot assign this group as parent"
 msgstr "不能将这个组作为parent"
 
-#: rhodecode/model/validators.py:178
+#: rhodecode/model/validators.py:219
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "组 \"%(group_name)s\" 已经存在"
 
-#: rhodecode/model/validators.py:180
+#: rhodecode/model/validators.py:221
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "已经存在名为 \"%(group_name)s\" 的版本库"
 
-#: rhodecode/model/validators.py:238
+#: rhodecode/model/validators.py:279
 msgid "Invalid characters (non-ascii) in password"
 msgstr "密码含有无效（非ASCII）字符"
 
-#: rhodecode/model/validators.py:253
+#: rhodecode/model/validators.py:294
+msgid "Invalid old password"
+msgstr ""
+
+#: rhodecode/model/validators.py:310
 msgid "Passwords do not match"
 msgstr "密码不符"
 
-#: rhodecode/model/validators.py:270
+#: rhodecode/model/validators.py:327
 msgid "invalid password"
 msgstr "无效密码"
 
-#: rhodecode/model/validators.py:271
+#: rhodecode/model/validators.py:328
 msgid "invalid user name"
 msgstr "无效用户名"
 
-#: rhodecode/model/validators.py:272
+#: rhodecode/model/validators.py:329
 msgid "Your account is disabled"
 msgstr "该帐号已被禁用"
 
-#: rhodecode/model/validators.py:316
+#: rhodecode/model/validators.py:373
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr "版本库名称不能为%(repo)s"
 
-#: rhodecode/model/validators.py:318
+#: rhodecode/model/validators.py:375
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "已经存在版本库%(repo)s"
 
-#: rhodecode/model/validators.py:319
+#: rhodecode/model/validators.py:376
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "版本库组 \"%(group)s\" 中已经存在版本库 \"%(repo)s\""
 
-#: rhodecode/model/validators.py:321
+#: rhodecode/model/validators.py:378
 #, python-format
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:438
+#: rhodecode/model/validators.py:493
 msgid "invalid clone url"
 msgstr "无效的克隆地址"
 
-#: rhodecode/model/validators.py:439
+#: rhodecode/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr "无效的克隆地址，提供一个有效的克隆 http(s)或svn+http(s)地址"
 
-#: rhodecode/model/validators.py:464
+#: rhodecode/model/validators.py:519
 msgid "Fork have to be the same type as parent"
 msgstr "复刻版本库必须和父版本库类型相同"
 
-#: rhodecode/model/validators.py:479
+#: rhodecode/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr "没有在该版本库组中创建版本库的权限"
 
-#: rhodecode/model/validators.py:481
+#: rhodecode/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr ""
 
-#: rhodecode/model/validators.py:518
+#: rhodecode/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
 msgstr ""
 
-#: rhodecode/model/validators.py:559
+#: rhodecode/model/validators.py:626
 msgid "This username or user group name is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:652
+#: rhodecode/model/validators.py:719
 msgid "This is not a valid path"
 msgstr "不是一个合法的路径"
 
-#: rhodecode/model/validators.py:667
+#: rhodecode/model/validators.py:734
 msgid "This e-mail address is already taken"
 msgstr "该邮件地址已被使用"
 
-#: rhodecode/model/validators.py:687
+#: rhodecode/model/validators.py:754
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "邮件地址\"%(email)s\"不存在"
 
-#: rhodecode/model/validators.py:724
+#: rhodecode/model/validators.py:791
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name of "
 "the attribute that is equivalent to \"username\""
 msgstr "LDAP 登陆属性的 CN 必须指定 - 这个名字作为用户名"
 
-#: rhodecode/model/validators.py:737
+#: rhodecode/model/validators.py:804
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr "修订%(revs)s已经包含在拉取请求中或者或者已经设置状态"
 
-#: rhodecode/model/validators.py:769
+#: rhodecode/model/validators.py:836
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
-#: rhodecode/model/validators.py:770
+#: rhodecode/model/validators.py:837
 #, python-format
 msgid ""
 "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
 
-#: rhodecode/model/validators.py:803
+#: rhodecode/model/validators.py:870
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 
-#: rhodecode/model/validators.py:817
+#: rhodecode/model/validators.py:884
 msgid "Filename cannot be inside a directory"
 msgstr ""
 
+#: rhodecode/model/validators.py:900
+#, python-format
+msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
+msgstr ""
+
 #: rhodecode/templates/index.html:5
 msgid "Dashboard"
 msgstr "控制面板"
 
 #: rhodecode/templates/index_base.html:6
-#: rhodecode/templates/repo_switcher_list.html:4
-#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/users/user_edit_my_account.html:31
-#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/bookmarks/bookmarks.html:9
-#: rhodecode/templates/branches/branches.html:9
-#: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:46
-#: rhodecode/templates/journal/journal.html:47
-#: rhodecode/templates/tags/tags.html:9
+#: rhodecode/templates/admin/my_account/my_account_repos.html:3
+#: rhodecode/templates/admin/my_account/my_account_watched.html:3
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:12
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:12
+#: rhodecode/templates/admin/users/users.html:12
+#: rhodecode/templates/bookmarks/bookmarks.html:12
+#: rhodecode/templates/branches/branches.html:12
+#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:50
+#: rhodecode/templates/tags/tags.html:12
 msgid "quick filter..."
 msgstr "快速过滤..."
 
 #: rhodecode/templates/index_base.html:6
-#: rhodecode/templates/admin/repos/repos.html:9
+#: rhodecode/templates/admin/repos/repos.html:12
 msgid "repositories"
 msgstr "版本库"
 
-#: rhodecode/templates/index_base.html:13
-#: rhodecode/templates/index_base.html:18
-#: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repos.html:22
-msgid "Add repository"
-msgstr "添加版本库"
-
-#: rhodecode/templates/index_base.html:15
 #: rhodecode/templates/index_base.html:20
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31
-msgid "Add group"
-msgstr ""
-
+#: rhodecode/templates/index_base.html:25
+#: rhodecode/templates/admin/repos/repo_add.html:22
+#: rhodecode/templates/admin/repos/repos.html:25
+msgid "Add Repository"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:22
 #: rhodecode/templates/index_base.html:27
-msgid "Edit group"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:27
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:16
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:29
+msgid "Add Repository Group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:32
 msgid "You have admin right to this group, and can edit it"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:40
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43
-#: rhodecode/templates/admin/users_groups/users_group_add.html:32
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:33
-#: rhodecode/templates/admin/users_groups/users_groups.html:37
-msgid "Group name"
-msgstr "组名"
-
-#: rhodecode/templates/index_base.html:41
-#: rhodecode/templates/index_base.html:123
-#: rhodecode/templates/admin/repos/repo_add_base.html:56
-#: rhodecode/templates/admin/repos/repo_edit.html:68
-#: rhodecode/templates/admin/repos/repos.html:75
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44
-#: rhodecode/templates/email_templates/changeset_comment.html:9
+#: rhodecode/templates/index_base.html:32
+msgid "Edit Repository Group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:45
+msgid "Group Name"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:46
+#: rhodecode/templates/index_base.html:128
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:64
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:45
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:17
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:32
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:72
+#: rhodecode/templates/admin/repos/repos.html:51
+#: rhodecode/templates/admin/user_groups/user_group_add.html:43
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:51
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:64
+#: rhodecode/templates/email_templates/changeset_comment.html:16
 #: rhodecode/templates/email_templates/pull_request.html:9
-#: rhodecode/templates/forks/fork.html:56
-#: rhodecode/templates/pullrequests/pullrequest.html:43
-#: rhodecode/templates/pullrequests/pullrequest_show.html:81
-#: rhodecode/templates/summary/summary.html:106
+#: rhodecode/templates/forks/fork.html:41
+#: rhodecode/templates/pullrequests/pullrequest.html:40
+#: rhodecode/templates/pullrequests/pullrequest_show.html:86
+#: rhodecode/templates/summary/summary.html:88
 msgid "Description"
 msgstr "描述"
 
-#: rhodecode/templates/index_base.html:51
-#: rhodecode/templates/admin/permissions/permissions.html:55
-#: rhodecode/templates/admin/repos/repo_add_base.html:29
-#: rhodecode/templates/admin/repos/repo_edit.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57
-#: rhodecode/templates/forks/fork.html:47
-msgid "Repository group"
-msgstr "版本库组"
-
-#: rhodecode/templates/index_base.html:121
+#: rhodecode/templates/index_base.html:126
+#: rhodecode/templates/admin/my_account/my_account_repos.html:46
+#: rhodecode/templates/admin/my_account/my_account_watched.html:46
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:50
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
-#: rhodecode/templates/admin/repos/repo_edit.html:32
-#: rhodecode/templates/admin/repos/repos.html:73
-#: rhodecode/templates/admin/users/user_edit_my_account.html:172
-#: rhodecode/templates/base/perms_summary.html:37
-#: rhodecode/templates/bookmarks/bookmarks.html:48
-#: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:47
-#: rhodecode/templates/branches/branches_data.html:6
-#: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:193
-#: rhodecode/templates/journal/journal.html:283
-#: rhodecode/templates/summary/summary.html:55
-#: rhodecode/templates/summary/summary.html:124
-#: rhodecode/templates/tags/tags.html:48
-#: rhodecode/templates/tags/tags_data.html:6
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:7
+#: rhodecode/templates/admin/repos/repos.html:50
+#: rhodecode/templates/admin/user_groups/user_groups.html:50
+#: rhodecode/templates/base/perms_summary.html:53
+#: rhodecode/templates/bookmarks/bookmarks.html:51
+#: rhodecode/templates/bookmarks/bookmarks_data.html:7
+#: rhodecode/templates/branches/branches.html:50
+#: rhodecode/templates/branches/branches_data.html:7
+#: rhodecode/templates/files/files_browser.html:41
+#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/journal/journal.html:288
+#: rhodecode/templates/tags/tags.html:51
+#: rhodecode/templates/tags/tags_data.html:7
 msgid "Name"
 msgstr "名称"
 
-#: rhodecode/templates/index_base.html:124
+#: rhodecode/templates/index_base.html:129
 msgid "Last Change"
 msgstr "最后修改"
 
-#: rhodecode/templates/index_base.html:126
-#: rhodecode/templates/admin/repos/repos.html:76
-#: rhodecode/templates/admin/users/user_edit_my_account.html:174
-#: rhodecode/templates/journal/journal.html:195
-#: rhodecode/templates/journal/journal.html:285
+#: rhodecode/templates/index_base.html:131
+#: rhodecode/templates/admin/my_account/my_account_repos.html:48
+#: rhodecode/templates/admin/my_account/my_account_watched.html:48
+#: rhodecode/templates/admin/repos/repos.html:52
+#: rhodecode/templates/journal/journal.html:199
+#: rhodecode/templates/journal/journal.html:290
 msgid "Tip"
 msgstr "Tip"
 
-#: rhodecode/templates/index_base.html:128
-#: rhodecode/templates/admin/repos/repo_edit.html:114
-#: rhodecode/templates/admin/repos/repos.html:78
+#: rhodecode/templates/index_base.html:133
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:10
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:53
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:60
+#: rhodecode/templates/admin/repos/repos.html:53
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:8
+#: rhodecode/templates/admin/user_groups/user_groups.html:54
+#: rhodecode/templates/summary/summary.html:141
 msgid "Owner"
 msgstr "所有者"
 
-#: rhodecode/templates/index_base.html:136
-#: rhodecode/templates/admin/repos/repos.html:86
-#: rhodecode/templates/admin/users/user_edit_my_account.html:183
-#: rhodecode/templates/admin/users/users.html:107
-#: rhodecode/templates/bookmarks/bookmarks.html:74
-#: rhodecode/templates/branches/branches.html:73
-#: rhodecode/templates/journal/journal.html:204
-#: rhodecode/templates/journal/journal.html:294
-#: rhodecode/templates/tags/tags.html:74
+#: rhodecode/templates/index_base.html:141
+#: rhodecode/templates/admin/my_account/my_account_repos.html:57
+#: rhodecode/templates/admin/my_account/my_account_watched.html:57
+#: rhodecode/templates/base/root.html:69
+#: rhodecode/templates/bookmarks/bookmarks.html:81
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:208
+#: rhodecode/templates/journal/journal.html:299
+#: rhodecode/templates/tags/tags.html:81
 msgid "Click to sort ascending"
 msgstr "点击以升序排列"
 
-#: rhodecode/templates/index_base.html:137
-#: rhodecode/templates/admin/repos/repos.html:87
-#: rhodecode/templates/admin/users/user_edit_my_account.html:184
-#: rhodecode/templates/admin/users/users.html:108
-#: rhodecode/templates/bookmarks/bookmarks.html:75
-#: rhodecode/templates/branches/branches.html:74
-#: rhodecode/templates/journal/journal.html:205
-#: rhodecode/templates/journal/journal.html:295
-#: rhodecode/templates/tags/tags.html:75
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/admin/my_account/my_account_repos.html:58
+#: rhodecode/templates/admin/my_account/my_account_watched.html:58
+#: rhodecode/templates/base/root.html:70
+#: rhodecode/templates/bookmarks/bookmarks.html:82
+#: rhodecode/templates/branches/branches.html:81
+#: rhodecode/templates/journal/journal.html:209
+#: rhodecode/templates/journal/journal.html:300
+#: rhodecode/templates/tags/tags.html:82
 msgid "Click to sort descending"
 msgstr "点击以降序排列"
 
-#: rhodecode/templates/index_base.html:138
+#: rhodecode/templates/index_base.html:143
 msgid "No repositories found."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:139
-#: rhodecode/templates/admin/repos/repos.html:89
-#: rhodecode/templates/admin/users/user_edit_my_account.html:186
-#: rhodecode/templates/admin/users/users.html:110
-#: rhodecode/templates/bookmarks/bookmarks.html:77
-#: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:207
-#: rhodecode/templates/journal/journal.html:297
-#: rhodecode/templates/tags/tags.html:77
+#: rhodecode/templates/index_base.html:144
+#: rhodecode/templates/admin/my_account/my_account_repos.html:60
+#: rhodecode/templates/admin/my_account/my_account_watched.html:60
+#: rhodecode/templates/base/root.html:72
+#: rhodecode/templates/bookmarks/bookmarks.html:84
+#: rhodecode/templates/branches/branches.html:83
+#: rhodecode/templates/journal/journal.html:211
+#: rhodecode/templates/journal/journal.html:302
+#: rhodecode/templates/tags/tags.html:84
 msgid "Data error."
 msgstr "数据错误"
 
-#: rhodecode/templates/index_base.html:140
-#: rhodecode/templates/admin/repos/repos.html:90
-#: rhodecode/templates/admin/users/user_edit_my_account.html:58
-#: rhodecode/templates/admin/users/user_edit_my_account.html:187
-#: rhodecode/templates/admin/users/users.html:111
-#: rhodecode/templates/bookmarks/bookmarks.html:78
-#: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:208
-#: rhodecode/templates/journal/journal.html:298
-#: rhodecode/templates/tags/tags.html:78
+#: rhodecode/templates/index_base.html:145
+#: rhodecode/templates/admin/my_account/my_account_repos.html:61
+#: rhodecode/templates/admin/my_account/my_account_watched.html:61
+#: rhodecode/templates/base/base.html:148
+#: rhodecode/templates/base/root.html:73
+#: rhodecode/templates/bookmarks/bookmarks.html:85
+#: rhodecode/templates/branches/branches.html:84
+#: rhodecode/templates/journal/journal.html:212
+#: rhodecode/templates/journal/journal.html:303
+#: rhodecode/templates/tags/tags.html:85
 msgid "Loading..."
 msgstr "载入中..."
 
-#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239
+#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:32
+#: rhodecode/templates/base/base.html:267
 msgid "Log In"
 msgstr "登录"
 
-#: rhodecode/templates/login.html:21
+#: rhodecode/templates/login.html:30
 #, python-format
 msgid "Log In to %s"
 msgstr ""
 
-#: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
+#: rhodecode/templates/login.html:43 rhodecode/templates/register.html:40
 #: rhodecode/templates/admin/admin_log.html:5
-#: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:57
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31
-#: rhodecode/templates/admin/users/users.html:77
-#: rhodecode/templates/base/base.html:215
-#: rhodecode/templates/summary/summary.html:123
+#: rhodecode/templates/admin/my_account/my_account_profile.html:30
+#: rhodecode/templates/admin/users/user_add.html:35
+#: rhodecode/templates/admin/users/user_edit_profile.html:33
+#: rhodecode/templates/admin/users/users.html:53
+#: rhodecode/templates/base/base.html:243
 msgid "Username"
 msgstr "帐号"
 
-#: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
-#: rhodecode/templates/admin/ldap/ldap.html:46
-#: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:224
+#: rhodecode/templates/login.html:52 rhodecode/templates/register.html:49
+#: rhodecode/templates/admin/my_account/my_account.html:39
+#: rhodecode/templates/admin/users/user_add.html:44
+#: rhodecode/templates/base/base.html:252
 msgid "Password"
 msgstr "密码"
 
-#: rhodecode/templates/login.html:50
+#: rhodecode/templates/login.html:62
 msgid "Remember me"
 msgstr "记住密码"
 
-#: rhodecode/templates/login.html:54
+#: rhodecode/templates/login.html:66
 msgid "Sign In"
 msgstr "登录"
 
-#: rhodecode/templates/login.html:60
+#: rhodecode/templates/login.html:72
 msgid "Forgot your password ?"
 msgstr "忘记了密码？"
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235
+#: rhodecode/templates/login.html:75 rhodecode/templates/base/base.html:263
 msgid "Don't have an account ?"
 msgstr "还没有帐号？"
 
@@ -1785,139 +2149,142 @@
 msgid "Password Reset"
 msgstr ""
 
-#: rhodecode/templates/password_reset.html:11
-msgid "Reset your password to"
-msgstr "重置密码"
-
-#: rhodecode/templates/password_reset.html:21
-msgid "Email address"
-msgstr "邮件地址"
-
-#: rhodecode/templates/password_reset.html:30
-msgid "Reset my password"
-msgstr "重置密码"
+#: rhodecode/templates/password_reset.html:29
+#, python-format
+msgid "Reset your Password to %s"
+msgstr ""
 
 #: rhodecode/templates/password_reset.html:31
+msgid "Reset your Password"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:42
+msgid "Email Address"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:52
+#: rhodecode/templates/register.html:95
+msgid "Captcha"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:63
+msgid "Send password reset email"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:64
 msgid "Password reset link will be send to matching email address"
 msgstr "密码重置地址已经发送到邮件"
 
-#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74
+#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:30
+#: rhodecode/templates/register.html:106
 msgid "Sign Up"
 msgstr "注册"
 
-#: rhodecode/templates/register.html:11
-msgid "Sign Up to"
-msgstr "注册"
-
-#: rhodecode/templates/register.html:38
+#: rhodecode/templates/register.html:28
+#, python-format
+msgid "Sign Up to %s"
+msgstr ""
+
+#: rhodecode/templates/register.html:58
 msgid "Re-enter password"
 msgstr "确认密码"
 
-#: rhodecode/templates/register.html:47
-#: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
+#: rhodecode/templates/register.html:67
+#: rhodecode/templates/admin/my_account/my_account_profile.html:41
+#: rhodecode/templates/admin/users/user_add.html:62
+#: rhodecode/templates/admin/users/user_edit_profile.html:87
 msgid "First Name"
 msgstr "名"
 
-#: rhodecode/templates/register.html:56
-#: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:106
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
+#: rhodecode/templates/register.html:76
+#: rhodecode/templates/admin/my_account/my_account_profile.html:50
+#: rhodecode/templates/admin/users/user_add.html:71
+#: rhodecode/templates/admin/users/user_edit_profile.html:96
 msgid "Last Name"
 msgstr "姓"
 
-#: rhodecode/templates/register.html:65
-#: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:115
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/summary/summary.html:125
+#: rhodecode/templates/register.html:85
+#: rhodecode/templates/admin/my_account/my_account_profile.html:59
+#: rhodecode/templates/admin/settings/settings.html:44
+#: rhodecode/templates/admin/users/user_add.html:80
+#: rhodecode/templates/admin/users/user_edit_profile.html:42
 msgid "Email"
 msgstr "电子邮件"
 
-#: rhodecode/templates/register.html:76
+#: rhodecode/templates/register.html:108
 msgid "Your account will be activated right after registration"
 msgstr "注册后，帐号将启用"
 
-#: rhodecode/templates/register.html:78
+#: rhodecode/templates/register.html:110
 msgid "Your account must wait for activation by administrator"
 msgstr "管理员审核后，你注册的帐号将被启用"
 
-#: rhodecode/templates/repo_switcher_list.html:10
-#: rhodecode/templates/admin/defaults/defaults.html:44
-#: rhodecode/templates/admin/repos/repo_add_base.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:78
-#: rhodecode/templates/data_table/_dt_elements.html:61
-#: rhodecode/templates/summary/summary.html:77
-msgid "Private repository"
-msgstr "私有版本库"
-
-#: rhodecode/templates/repo_switcher_list.html:12
-#: rhodecode/templates/data_table/_dt_elements.html:63
-#: rhodecode/templates/summary/summary.html:79
-msgid "Public repository"
-msgstr "公共版本库"
-
 #: rhodecode/templates/switch_to_list.html:10
-#: rhodecode/templates/branches/branches_data.html:57
+#: rhodecode/templates/branches/branches_data.html:67
 msgid "There are no branches yet"
 msgstr "没有任何分支"
 
-#: rhodecode/templates/switch_to_list.html:22
-#: rhodecode/templates/tags/tags_data.html:38
+#: rhodecode/templates/switch_to_list.html:16
+msgid "Closed Branches"
+msgstr ""
+
+#: rhodecode/templates/switch_to_list.html:32
+#: rhodecode/templates/tags/tags_data.html:44
 msgid "There are no tags yet"
 msgstr "没有任何标签"
 
-#: rhodecode/templates/switch_to_list.html:35
-#: rhodecode/templates/bookmarks/bookmarks_data.html:37
+#: rhodecode/templates/switch_to_list.html:45
+#: rhodecode/templates/bookmarks/bookmarks_data.html:43
 msgid "There are no bookmarks yet"
 msgstr "无书签"
 
 #: rhodecode/templates/admin/admin.html:5
-#: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/base/base.html:73
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/base/base.html:69
 msgid "Admin journal"
 msgstr "系统日志"
 
-#: rhodecode/templates/admin/admin.html:10
+#: rhodecode/templates/admin/admin.html:13
 msgid "journal filter..."
 msgstr "日志过滤..."
 
-#: rhodecode/templates/admin/admin.html:12
-#: rhodecode/templates/journal/journal.html:11
+#: rhodecode/templates/admin/admin.html:15
+#: rhodecode/templates/journal/journal.html:14
 msgid "filter"
 msgstr "过滤"
 
-#: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/journal/journal.html:15
 #, python-format
 msgid "%s entry"
 msgid_plural "%s entries"
 msgstr[0] "%s条"
 
 #: rhodecode/templates/admin/admin_log.html:6
-#: rhodecode/templates/admin/repos/repos.html:79
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
-#: rhodecode/templates/admin/users/user_edit_my_account.html:176
-#: rhodecode/templates/admin/users/users.html:87
-#: rhodecode/templates/admin/users_groups/users_groups.html:40
-#: rhodecode/templates/journal/journal.html:197
-#: rhodecode/templates/journal/journal.html:287
+#: rhodecode/templates/admin/my_account/my_account_repos.html:50
+#: rhodecode/templates/admin/my_account/my_account_watched.html:50
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:54
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:8
+#: rhodecode/templates/admin/repos/repos.html:55
+#: rhodecode/templates/admin/user_groups/user_groups.html:55
+#: rhodecode/templates/admin/users/users.html:60
+#: rhodecode/templates/journal/journal.html:201
+#: rhodecode/templates/journal/journal.html:292
 msgid "Action"
 msgstr "操作"
 
 #: rhodecode/templates/admin/admin_log.html:7
-#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/permissions/permissions_globals.html:18
 msgid "Repository"
 msgstr "版本库"
 
 #: rhodecode/templates/admin/admin_log.html:8
-#: rhodecode/templates/bookmarks/bookmarks.html:49
-#: rhodecode/templates/bookmarks/bookmarks_data.html:7
-#: rhodecode/templates/branches/branches.html:48
-#: rhodecode/templates/branches/branches_data.html:7
-#: rhodecode/templates/tags/tags.html:49
-#: rhodecode/templates/tags/tags_data.html:7
+#: rhodecode/templates/bookmarks/bookmarks.html:53
+#: rhodecode/templates/bookmarks/bookmarks_data.html:9
+#: rhodecode/templates/branches/branches.html:52
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/tags/tags.html:53
+#: rhodecode/templates/tags/tags_data.html:9
 msgid "Date"
 msgstr "日期"
 
@@ -1929,309 +2296,598 @@
 msgid "No actions yet"
 msgstr "无操作"
 
+#: rhodecode/templates/admin/auth/auth_settings.html:5
+msgid "Authentication Settings"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:14
+#: rhodecode/templates/base/base.html:75
+msgid "Authentication"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:31
+msgid "Authentication Plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:34
+msgid "Enabled Plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:36
+msgid ""
+"Comma separated list of plugins. Order of plugins is also order in which "
+"RhodeCode will try to authenticate user"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:37
+msgid "Available built-in plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:65
+msgid "enabled"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:66
+msgid "disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:51
+#: rhodecode/templates/admin/defaults/defaults.html:87
+#: rhodecode/templates/admin/my_account/my_account_password.html:33
+#: rhodecode/templates/admin/my_account/my_account_profile.html:68
+#: rhodecode/templates/admin/permissions/permissions_globals.html:108
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:72
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:114
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:101
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:134
+#: rhodecode/templates/admin/settings/settings_hooks.html:53
+#: rhodecode/templates/admin/user_groups/user_group_add.html:60
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:104
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:67
+#: rhodecode/templates/admin/users/user_add.html:99
+#: rhodecode/templates/admin/users/user_edit_profile.html:122
+#: rhodecode/templates/base/default_perms_box.html:64
+msgid "Save"
+msgstr "保存"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:57
+msgid "Plugin"
+msgstr ""
+
 #: rhodecode/templates/admin/defaults/defaults.html:5
-#: rhodecode/templates/admin/defaults/defaults.html:25
+#: rhodecode/templates/admin/defaults/defaults.html:28
 msgid "Repositories defaults"
 msgstr "版本库默认设置"
 
-#: rhodecode/templates/admin/defaults/defaults.html:11
-#: rhodecode/templates/base/base.html:80
+#: rhodecode/templates/admin/defaults/defaults.html:14
+#: rhodecode/templates/base/base.html:76
 msgid "Defaults"
 msgstr "默认设置"
 
-#: rhodecode/templates/admin/defaults/defaults.html:35
-#: rhodecode/templates/admin/repos/repo_add_base.html:38
+#: rhodecode/templates/admin/defaults/defaults.html:38
+#: rhodecode/templates/admin/repos/repo_add_base.html:59
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:7
 msgid "Type"
 msgstr "类型"
 
-#: rhodecode/templates/admin/defaults/defaults.html:48
-#: rhodecode/templates/admin/repos/repo_add_base.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:82
-#: rhodecode/templates/forks/fork.html:69
+#: rhodecode/templates/admin/defaults/defaults.html:47
+#: rhodecode/templates/admin/repos/repo_add_base.html:77
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:82
+#: rhodecode/templates/data_table/_dt_elements.html:70
+msgid "Private repository"
+msgstr "私有版本库"
+
+#: rhodecode/templates/admin/defaults/defaults.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:81
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:86
+#: rhodecode/templates/forks/fork.html:75
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
 msgstr "私有版本库只对成员可见。"
 
-#: rhodecode/templates/admin/defaults/defaults.html:55
-#: rhodecode/templates/admin/repos/repo_edit.html:87
+#: rhodecode/templates/admin/defaults/defaults.html:58
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:91
 msgid "Enable statistics"
 msgstr "启用统计"
 
-#: rhodecode/templates/admin/defaults/defaults.html:59
-#: rhodecode/templates/admin/repos/repo_edit.html:91
+#: rhodecode/templates/admin/defaults/defaults.html:62
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:95
 msgid "Enable statistics window on summary page."
 msgstr "启用概况页的统计窗口"
 
-#: rhodecode/templates/admin/defaults/defaults.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:96
+#: rhodecode/templates/admin/defaults/defaults.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:100
 msgid "Enable downloads"
 msgstr "启用下载"
 
-#: rhodecode/templates/admin/defaults/defaults.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:100
+#: rhodecode/templates/admin/defaults/defaults.html:72
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:104
 msgid "Enable download menu on summary page."
 msgstr "启用概况页的下载菜单"
 
-#: rhodecode/templates/admin/defaults/defaults.html:75
-#: rhodecode/templates/admin/repos/repo_edit.html:105
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64
+#: rhodecode/templates/admin/defaults/defaults.html:78
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:34
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:109
 msgid "Enable locking"
 msgstr "启用锁定"
 
-#: rhodecode/templates/admin/defaults/defaults.html:79
-#: rhodecode/templates/admin/repos/repo_edit.html:109
+#: rhodecode/templates/admin/defaults/defaults.html:82
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:113
 msgid "Enable lock-by-pulling on repository."
 msgstr "启用版本库的拉取锁定"
 
-#: rhodecode/templates/admin/defaults/defaults.html:84
-#: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/permissions/permissions.html:122
-#: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos/repo_edit.html:166
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96
-#: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_add.html:94
-#: rhodecode/templates/admin/users/user_edit.html:140
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88
-#: rhodecode/templates/admin/users_groups/users_group_add.html:49
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:143
-#: rhodecode/templates/base/default_perms_box.html:53
-msgid "Save"
-msgstr "保存"
-
-#: rhodecode/templates/admin/gists/index.html:5
-#: rhodecode/templates/base/base.html:299
-msgid "Gists"
+#: rhodecode/templates/admin/gists/edit.html:5
+#: rhodecode/templates/admin/gists/edit.html:22
+msgid "Edit Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:40
+#, python-format
+msgid ""
+"Gist was update since you started editing. Copy your changes and click "
+"%(here)s to reload new version."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:59
+#: rhodecode/templates/admin/gists/new.html:43
+msgid "Gist description ..."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:61
+#: rhodecode/templates/admin/gists/new.html:45
+msgid "Gist lifetime"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/edit.html:67
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/index.html:62
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/gists/show.html:52
+msgid "Expires"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+msgid "never"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:80
+#: rhodecode/templates/admin/gists/new.html:52
+#: rhodecode/templates/files/files_add.html:59
+#: rhodecode/templates/files/files_edit.html:64
+msgid "plain"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:147
+msgid "Update Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:148
+#: rhodecode/templates/changeset/changeset_file_comment.html:89
+msgid "Cancel"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:6
+#: rhodecode/templates/admin/gists/index.html:19
+#, python-format
+msgid "Private Gists for user %s"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:8
+#: rhodecode/templates/admin/gists/index.html:21
+#, python-format
+msgid "Public Gists for user %s"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:10
-#, python-format
-msgid "Private Gists for user %s"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:12
-#, python-format
-msgid "Public Gists for user %s"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:14
+#: rhodecode/templates/admin/gists/index.html:23
 msgid "Public Gists"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.html:31
-#: rhodecode/templates/admin/gists/show.html:24
-#: rhodecode/templates/base/base.html:302
-msgid "Create new gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:48
+#: rhodecode/templates/admin/gists/index.html:40
+#: rhodecode/templates/admin/gists/show.html:28
+msgid "Create New Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:57
+#: rhodecode/templates/data_table/_dt_elements.html:143
 msgid "Created"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.html:51
-#: rhodecode/templates/admin/gists/index.html:53
-#: rhodecode/templates/admin/gists/show.html:43
-#: rhodecode/templates/admin/gists/show.html:45
-msgid "Expires"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:51
-#: rhodecode/templates/admin/gists/show.html:43
-msgid "never"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:68
+#: rhodecode/templates/admin/gists/index.html:77
 msgid "There are no gists yet"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/new.html:5
-#: rhodecode/templates/admin/gists/new.html:16
-msgid "New gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:37
-msgid "Gist description ..."
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:52
-msgid "Create private gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:53
-msgid "Create public gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:54
-#: rhodecode/templates/admin/permissions/permissions.html:123
-#: rhodecode/templates/admin/permissions/permissions.html:185
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos/repo_edit.html:167
-#: rhodecode/templates/admin/repos/repo_edit.html:381
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97
-#: rhodecode/templates/admin/settings/settings.html:115
-#: rhodecode/templates/admin/settings/settings.html:196
-#: rhodecode/templates/admin/settings/settings.html:288
-#: rhodecode/templates/admin/users/user_edit.html:141
-#: rhodecode/templates/admin/users/user_edit.html:198
-#: rhodecode/templates/admin/users/user_edit.html:246
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:144
-#: rhodecode/templates/base/default_perms_box.html:54
-#: rhodecode/templates/files/files_add.html:80
-#: rhodecode/templates/files/files_edit.html:66
-#: rhodecode/templates/pullrequests/pullrequest.html:86
+#: rhodecode/templates/admin/gists/new.html:22
+msgid "New Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:51
+msgid "name this file..."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:60
+msgid "Create Private Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:61
+msgid "Create Public Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:62
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:70
+#: rhodecode/templates/admin/my_account/my_account_emails.html:46
+#: rhodecode/templates/admin/my_account/my_account_password.html:34
+#: rhodecode/templates/admin/my_account/my_account_profile.html:69
+#: rhodecode/templates/admin/permissions/permissions_globals.html:109
+#: rhodecode/templates/admin/permissions/permissions_ips.html:41
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:115
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:43
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:59
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:102
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:135
+#: rhodecode/templates/admin/settings/settings_global.html:56
+#: rhodecode/templates/admin/settings/settings_license.html:43
+#: rhodecode/templates/admin/settings/settings_vcs.html:81
+#: rhodecode/templates/admin/settings/settings_visual.html:116
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:105
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:70
+#: rhodecode/templates/admin/users/user_edit_emails.html:46
+#: rhodecode/templates/admin/users/user_edit_ips.html:50
+#: rhodecode/templates/admin/users/user_edit_profile.html:123
+#: rhodecode/templates/base/default_perms_box.html:65
+#: rhodecode/templates/files/files_add.html:70
+#: rhodecode/templates/files/files_delete.html:58
+#: rhodecode/templates/files/files_edit.html:73
+#: rhodecode/templates/pullrequests/pullrequest.html:83
 msgid "Reset"
 msgstr "重置"
 
 #: rhodecode/templates/admin/gists/show.html:5
-msgid "gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:9
+#: rhodecode/templates/admin/gists/show.html:12
 msgid "Gist"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/show.html:36
-msgid "Public gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:38
-msgid "Private gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:54
-#: rhodecode/templates/admin/repos/repo_edit.html:299
-#: rhodecode/templates/changeset/changeset_file_comment.html:40
+#: rhodecode/templates/admin/gists/show.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:4
+#: rhodecode/templates/email_templates/pull_request.html:4
+#: rhodecode/templates/email_templates/pull_request_comment.html:4
+msgid "URL"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:40
+msgid "Public Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:42
+msgid "Private Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:59
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:80
+#: rhodecode/templates/changeset/changeset_file_comment.html:48
+#: rhodecode/templates/files/files_source.html:39
+#: rhodecode/templates/files/files_source.html:42
+#: rhodecode/templates/files/files_source.html:45
 msgid "Delete"
 msgstr "删除"
 
-#: rhodecode/templates/admin/gists/show.html:54
-msgid "Confirm to delete this gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:63
-#: rhodecode/templates/admin/gists/show.html:84
-#: rhodecode/templates/files/files_edit.html:48
-#: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:55
-msgid "Show as raw"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:71
+#: rhodecode/templates/admin/gists/show.html:59
+msgid "Confirm to delete this Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:66
+#: rhodecode/templates/changeset/changeset_file_comment.html:81
+#: rhodecode/templates/changeset/changeset_file_comment.html:190
+#: rhodecode/templates/data_table/_dt_elements.html:167
+#: rhodecode/templates/data_table/_dt_elements.html:183
+#: rhodecode/templates/files/files_source.html:41
+#: rhodecode/templates/files/files_source.html:44
+msgid "Edit"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:68
+#: rhodecode/templates/files/files_edit.html:54
+#: rhodecode/templates/files/files_source.html:34
+msgid "Show as Raw"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:76
 msgid "created"
 msgstr ""
 
-#: rhodecode/templates/admin/ldap/ldap.html:5
-msgid "LDAP administration"
-msgstr "LDAP管理员"
-
-#: rhodecode/templates/admin/ldap/ldap.html:11
-#: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:79
-msgid "LDAP"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:28
-msgid "Connection settings"
-msgstr "连接设置"
-
-#: rhodecode/templates/admin/ldap/ldap.html:30
-msgid "Enable LDAP"
-msgstr "启用LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:34
-msgid "Host"
-msgstr "主机"
-
-#: rhodecode/templates/admin/ldap/ldap.html:38
-msgid "Port"
-msgstr "端口"
-
-#: rhodecode/templates/admin/ldap/ldap.html:42
-msgid "Account"
-msgstr "帐号"
-
-#: rhodecode/templates/admin/ldap/ldap.html:50
-msgid "Connection security"
-msgstr "连接安全"
-
-#: rhodecode/templates/admin/ldap/ldap.html:54
-msgid "Certificate Checks"
-msgstr "凭证确认"
-
-#: rhodecode/templates/admin/ldap/ldap.html:57
-msgid "Search settings"
-msgstr "搜索设置"
-
-#: rhodecode/templates/admin/ldap/ldap.html:59
-msgid "Base DN"
-msgstr "Base DN"
-
-#: rhodecode/templates/admin/ldap/ldap.html:63
-msgid "LDAP Filter"
-msgstr "LDAP过滤器"
-
-#: rhodecode/templates/admin/ldap/ldap.html:67
-msgid "LDAP Search Scope"
-msgstr "LDAP搜索范围"
-
-#: rhodecode/templates/admin/ldap/ldap.html:70
-msgid "Attribute mappings"
-msgstr "属性映射"
-
-#: rhodecode/templates/admin/ldap/ldap.html:72
-msgid "Login Attribute"
-msgstr "登录属性"
-
-#: rhodecode/templates/admin/ldap/ldap.html:76
-msgid "First Name Attribute"
-msgstr "名"
-
-#: rhodecode/templates/admin/ldap/ldap.html:80
-msgid "Last Name Attribute"
-msgstr "姓"
-
-#: rhodecode/templates/admin/ldap/ldap.html:84
-msgid "E-mail Attribute"
-msgstr "电子邮件属性"
+#: rhodecode/templates/admin/gists/show.html:89
+#: rhodecode/templates/files/files_source.html:71
+msgid "Show as raw"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:5
+#: rhodecode/templates/base/base.html:282
+msgid "My account"
+msgstr "我的账户"
+
+#: rhodecode/templates/admin/my_account/my_account.html:12
+msgid "My Account"
+msgstr "我的账户"
+
+#: rhodecode/templates/admin/my_account/my_account.html:38
+#: rhodecode/templates/admin/users/user_edit.html:42
+msgid "Profile"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:40
+#: rhodecode/templates/admin/users/user_edit.html:43
+msgid "API keys"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:41
+msgid "My Emails"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:42
+msgid "My Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:43
+#: rhodecode/templates/journal/journal.html:54
+msgid "Watched"
+msgstr "关注的"
+
+#: rhodecode/templates/admin/my_account/my_account.html:44
+msgid "Pull requests"
+msgstr "拉取请求"
+
+#: rhodecode/templates/admin/my_account/my_account.html:45
+msgid "My permissions"
+msgstr "我的权限"
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:6
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:6
+msgid "Built-in"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:32
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:32
+msgid "expires"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:14
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:14
+#, python-format
+msgid "Confirm to reset this api key: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:15
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:15
+msgid "reset"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:30
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:30
+msgid "expired"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:40
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:40
+#, python-format
+msgid "Confirm to remove this api key: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:42
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:42
+msgid "remove"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:49
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:49
+msgid "No additional api keys specified"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:61
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:61
+msgid "New api key"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:69
+#: rhodecode/templates/admin/my_account/my_account_emails.html:45
+#: rhodecode/templates/admin/permissions/permissions_ips.html:40
+#: rhodecode/templates/admin/repos/repo_add_base.html:85
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:58
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:69
+#: rhodecode/templates/admin/users/user_edit_emails.html:45
+#: rhodecode/templates/admin/users/user_edit_ips.html:49
+msgid "Add"
+msgstr "增加"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:7
+#: rhodecode/templates/admin/users/user_edit_emails.html:7
+msgid "Primary"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:19
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:24
+#: rhodecode/templates/admin/permissions/permissions_ips.html:14
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:18
+#: rhodecode/templates/admin/settings/settings_hooks.html:36
+#: rhodecode/templates/admin/users/user_edit_emails.html:19
+#: rhodecode/templates/admin/users/user_edit_ips.html:22
+#: rhodecode/templates/data_table/_dt_elements.html:131
+#: rhodecode/templates/data_table/_dt_elements.html:159
+#: rhodecode/templates/data_table/_dt_elements.html:175
+#: rhodecode/templates/data_table/_dt_elements.html:191
+msgid "delete"
+msgstr "删除"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:20
+#: rhodecode/templates/admin/users/user_edit_emails.html:20
+#, python-format
+msgid "Confirm to delete this email: %s"
+msgstr "确认删除邮箱：%s"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:26
+#: rhodecode/templates/admin/users/user_edit_emails.html:26
+msgid "No additional emails specified"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:38
+#: rhodecode/templates/admin/users/user_edit_emails.html:38
+msgid "New email address"
+msgstr "增加邮箱"
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:1
+msgid "Change your account password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:7
+msgid "Current password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:16
+#: rhodecode/templates/admin/users/user_edit_profile.html:69
+msgid "New password"
+msgstr "新密码"
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:25
+msgid "Confirm new password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:9
+msgid "Change your avatar at"
+msgstr "修改你的头像"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:10
+#: rhodecode/templates/admin/users/user_edit_profile.html:9
+msgid "Using"
+msgstr "使用中"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:11
+msgid "Avatars are disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:13
+msgid "Missing email, please update your user email address."
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:14
+#: rhodecode/templates/admin/users/user_edit_profile.html:15
+msgid "current IP"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:26
+msgid ""
+"Your user is in an external Source of Record; some details cannot be managed"
+" here"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:2
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:4
+msgid "Show closed pull requests"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:6
+msgid "Opened by me"
+msgstr "我创建的"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:15
+#, python-format
+msgid "Pull request #%s opened on %s"
+msgstr "拉取请求#%s创建于%s"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:17
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:47
+#: rhodecode/templates/pullrequests/pullrequest_data.html:11
+#: rhodecode/templates/pullrequests/pullrequest_show.html:30
+#: rhodecode/templates/pullrequests/pullrequest_show.html:45
+msgid "Closed"
+msgstr "已关闭"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:25
+msgid "Confirm to delete this pull request"
+msgstr "确认删除拉取请求"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:32
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:53
+msgid "Nothing here yet"
+msgstr "无条目"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:36
+msgid "I participate in"
+msgstr "我参与的"
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:44
+#: rhodecode/templates/pullrequests/pullrequest_data.html:8
+#, python-format
+msgid "Pull request #%s opened by %s on %s"
+msgstr "拉取请求#%s由%s创建于%s"
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:1
+msgid "Repositories you are owner of"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:59
+#: rhodecode/templates/admin/my_account/my_account_watched.html:59
+#: rhodecode/templates/base/root.html:71
+#: rhodecode/templates/bookmarks/bookmarks.html:83
+#: rhodecode/templates/branches/branches.html:82
+#: rhodecode/templates/journal/journal.html:210
+#: rhodecode/templates/journal/journal.html:301
+#: rhodecode/templates/tags/tags.html:83
+msgid "No records found."
+msgstr "没有找到记录"
+
+#: rhodecode/templates/admin/my_account/my_account_watched.html:1
+msgid "Repositories you are watching"
+msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:5
-#: rhodecode/templates/admin/notifications/notifications.html:9
+#: rhodecode/templates/admin/notifications/notifications.html:12
 msgid "My Notifications"
 msgstr "我的通知"
 
-#: rhodecode/templates/admin/notifications/notifications.html:29
+#: rhodecode/templates/admin/notifications/notifications.html:32
 msgid "All"
 msgstr "全部"
 
-#: rhodecode/templates/admin/notifications/notifications.html:30
+#: rhodecode/templates/admin/notifications/notifications.html:33
 msgid "Comments"
 msgstr "评论"
 
-#: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
-msgid "Pull requests"
-msgstr "拉取请求"
-
-#: rhodecode/templates/admin/notifications/notifications.html:35
+#: rhodecode/templates/admin/notifications/notifications.html:34
+#: rhodecode/templates/base/base.html:193
+msgid "Pull Requests"
+msgstr ""
+
+#: rhodecode/templates/admin/notifications/notifications.html:38
 msgid "Mark all read"
 msgstr "全部标记为已读"
 
-#: rhodecode/templates/admin/notifications/notifications_data.html:39
+#: rhodecode/templates/admin/notifications/notifications_data.html:40
 msgid "No notifications here yet"
 msgstr "无通知"
 
 #: rhodecode/templates/admin/notifications/show_notification.html:5
-#: rhodecode/templates/admin/notifications/show_notification.html:11
+#: rhodecode/templates/admin/notifications/show_notification.html:14
 msgid "Show notification"
 msgstr "显示通知"
 
-#: rhodecode/templates/admin/notifications/show_notification.html:9
-#: rhodecode/templates/base/base.html:253
+#: rhodecode/templates/admin/notifications/show_notification.html:12
+#: rhodecode/templates/base/base.html:281
 msgid "Notifications"
 msgstr "通知"
 
@@ -2239,1440 +2895,1789 @@
 msgid "Permissions administration"
 msgstr "权限管理"
 
-#: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:151
-#: rhodecode/templates/admin/repos/repo_edit.html:158
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88
-#: rhodecode/templates/admin/users/user_edit.html:150
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:129
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/base/base.html:78
+#: rhodecode/templates/admin/permissions/permissions.html:14
+#: rhodecode/templates/admin/permissions/permissions.html:37
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:55
+#: rhodecode/templates/admin/repos/repo_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:45
+#: rhodecode/templates/base/base.html:74
 msgid "Permissions"
 msgstr "权限"
 
-#: rhodecode/templates/admin/permissions/permissions.html:24
-msgid "Default permissions"
-msgstr "默认权限"
-
-#: rhodecode/templates/admin/permissions/permissions.html:31
+#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/settings/settings.html:42
+msgid "Global"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:42
+msgid "IP whitelist"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:43
+msgid "Overview"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:7
 msgid "Anonymous access"
 msgstr "匿名访问"
 
-#: rhodecode/templates/admin/permissions/permissions.html:49
+#: rhodecode/templates/admin/permissions/permissions_globals.html:13
+#, python-format
+msgid ""
+"Allow access to RhodeCode without need to log in. Anonymous users use %s "
+"user permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:26
 msgid ""
 "All default permissions on each repository will be reset to chosen "
 "permission, note that all custom default permission on repositories will be "
 "lost"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:50
-#: rhodecode/templates/admin/permissions/permissions.html:63
-#: rhodecode/templates/admin/permissions/permissions.html:77
+#: rhodecode/templates/admin/permissions/permissions_globals.html:27
+#: rhodecode/templates/admin/permissions/permissions_globals.html:40
+#: rhodecode/templates/admin/permissions/permissions_globals.html:54
 msgid "Overwrite existing settings"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:62
+#: rhodecode/templates/admin/permissions/permissions_globals.html:32
+#: rhodecode/templates/admin/repos/repo_add_base.html:41
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:42
+#: rhodecode/templates/data_table/_dt_elements.html:204
+#: rhodecode/templates/forks/fork.html:51
+msgid "Repository group"
+msgstr "版本库组"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:39
 msgid ""
 "All default permissions on each repository group will be reset to chosen "
 "permission, note that all custom default permission on repository groups "
 "will be lost"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:69
+#: rhodecode/templates/admin/permissions/permissions_globals.html:46
+#: rhodecode/templates/data_table/_dt_elements.html:211
 msgid "User group"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:76
+#: rhodecode/templates/admin/permissions/permissions_globals.html:53
 msgid ""
 "All default permissions on each user group will be reset to chosen "
 "permission, note that all custom default permission on repository groups "
 "will be lost"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:83
+#: rhodecode/templates/admin/permissions/permissions_globals.html:60
 msgid "Repository creation"
 msgstr "建立版本库"
 
-#: rhodecode/templates/admin/permissions/permissions.html:91
+#: rhodecode/templates/admin/permissions/permissions_globals.html:68
+msgid "Repository creation with group write access"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:72
+msgid ""
+"Write permission to repository groups allows creating repositories inside "
+"that group"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:77
 msgid "User group creation"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:99
+#: rhodecode/templates/admin/permissions/permissions_globals.html:85
 msgid "Repository forking"
 msgstr "版本库复刻"
 
-#: rhodecode/templates/admin/permissions/permissions.html:107
+#: rhodecode/templates/admin/permissions/permissions_globals.html:93
 msgid "Registration"
 msgstr "注册"
 
-#: rhodecode/templates/admin/permissions/permissions.html:115
+#: rhodecode/templates/admin/permissions/permissions_globals.html:101
 msgid "External auth account activation"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:133
-msgid "Default User Permissions"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:144
-#: rhodecode/templates/admin/users/user_edit.html:207
-msgid "Allowed IP addresses"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:158
-#: rhodecode/templates/admin/repos/repo_edit.html:340
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
-#: rhodecode/templates/admin/users/user_edit.html:175
-#: rhodecode/templates/admin/users/user_edit.html:220
-#: rhodecode/templates/admin/users_groups/users_groups.html:54
-#: rhodecode/templates/data_table/_dt_elements.html:122
-#: rhodecode/templates/data_table/_dt_elements.html:136
-msgid "delete"
-msgstr "删除"
-
-#: rhodecode/templates/admin/permissions/permissions.html:159
-#: rhodecode/templates/admin/users/user_edit.html:221
+#: rhodecode/templates/admin/permissions/permissions_ips.html:1
+msgid "Default ip whitelist for all users"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_ips.html:15
+#: rhodecode/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:165
-#: rhodecode/templates/admin/users/user_edit.html:227
+#: rhodecode/templates/admin/permissions/permissions_ips.html:21
+#: rhodecode/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:176
-#: rhodecode/templates/admin/users/user_edit.html:238
+#: rhodecode/templates/admin/permissions/permissions_ips.html:32
+#: rhodecode/templates/admin/users/user_edit_ips.html:42
 msgid "New ip address"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:184
-#: rhodecode/templates/admin/repos/repo_add_base.html:73
-#: rhodecode/templates/admin/repos/repo_edit.html:380
-#: rhodecode/templates/admin/users/user_edit.html:197
-#: rhodecode/templates/admin/users/user_edit.html:245
-msgid "Add"
-msgstr "增加"
-
-#: rhodecode/templates/admin/repos/repo_add.html:12
-#: rhodecode/templates/admin/repos/repo_add.html:16
-#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88
-#: rhodecode/templates/base/base.html:116
-#: rhodecode/templates/base/base.html:275
-msgid "Repositories"
-msgstr "版本库"
-
-#: rhodecode/templates/admin/repos/repo_add.html:19
-msgid "Add new"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:96
-#: rhodecode/templates/summary/summary.html:97
-msgid "Clone from"
-msgstr "克隆自"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:24
-#: rhodecode/templates/admin/repos/repo_edit.html:45
-msgid "Optional http[s] url from which repository should be cloned."
-msgstr "可选的，指定版本库应该从哪个http[s]地址克隆。"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:33
-#: rhodecode/templates/forks/fork.html:51
-msgid "Optionaly select a group to put this repository into."
-msgstr "可选的，选择一个组将版本库放到其中"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:42
-msgid "Type of repository to create."
-msgstr "要创建的版本库类型"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:47
-#: rhodecode/templates/admin/repos/repo_edit.html:59
-#: rhodecode/templates/forks/fork.html:38
-msgid "Landing revision"
-msgstr "默认修订"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:51
-#: rhodecode/templates/admin/repos/repo_edit.html:63
-#: rhodecode/templates/forks/fork.html:42
-msgid "Default revision for files page, downloads, whoosh and readme"
-msgstr "文件浏览、下载、whoosh和README的默认修订版本"
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:60
-#: rhodecode/templates/admin/repos/repo_edit.html:72
-#: rhodecode/templates/forks/fork.html:60
-msgid ""
-"Keep it short and to the point. Use a README file for longer descriptions."
-msgstr "保持简短。用README文件来写更长的描述。"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:8
-msgid "Edit repository"
-msgstr "编辑版本库"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:12
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:11
-#: rhodecode/templates/base/base.html:81
-#: rhodecode/templates/base/base.html:134
-#: rhodecode/templates/summary/summary.html:212
+#: rhodecode/templates/admin/permissions/permissions_perms.html:1
+msgid "Default user permissions overview"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:5
+msgid "Add repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:14
+#: rhodecode/templates/base/base.html:71 rhodecode/templates/base/base.html:90
+msgid "Repository groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:36
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:8
+#: rhodecode/templates/admin/user_groups/user_group_add.html:35
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:7
+msgid "Group name"
+msgstr "组名"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:54
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:26
+msgid "Group parent"
+msgstr "上级组"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:63
+#: rhodecode/templates/admin/repos/repo_add_base.html:50
+msgid "Copy parent group permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:67
+#: rhodecode/templates/admin/repos/repo_add_base.html:54
+msgid "Copy permission set from parent repository group."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:5
+#, python-format
+msgid "%s Repository group settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:105
+msgid "Repository Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:24
+msgid "Add Child Group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:53
+#: rhodecode/templates/admin/repos/repo_edit.html:15
+#: rhodecode/templates/admin/repos/repo_edit.html:43
+#: rhodecode/templates/admin/settings/settings.html:14
+#: rhodecode/templates/admin/settings/settings.html:36
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:42
+#: rhodecode/templates/base/base.html:77
+#: rhodecode/templates/base/base.html:159
 msgid "Settings"
 msgstr "设置"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:36
-msgid "Non-changeable id"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:41
-msgid "Clone uri"
-msgstr "克隆地址"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:54
-msgid "Optional select a group to put this repository into."
-msgstr "可选的，选择一个组将版本库放到其中"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:119
-msgid "Change owner of this repository."
-msgstr "修改这个版本库的所有者"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:177
-msgid "Advanced settings"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:180
-msgid "Statistics"
-msgstr "统计"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Reset current statistics"
-msgstr "重置统计"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Confirm to remove current statistics"
-msgstr "确认移除当前统计"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:187
-msgid "Fetched to rev"
-msgstr "获取到修订"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:188
-msgid "Stats gathered"
-msgstr "已收集的统计"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:196
-msgid "Remote"
-msgstr "远程"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:200
-msgid "Pull changes from remote location"
-msgstr "从远程路径拉取修订集"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:200
-msgid "Confirm to pull changes from remote side"
-msgstr "确认从远程拉取修订集"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:211
-msgid "Cache"
-msgstr "缓存"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:215
-msgid "Invalidate repository cache"
-msgstr "清除版本库缓存"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:215
-msgid "Confirm to invalidate repository cache"
-msgstr "确认清除版本库缓存"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:218
-msgid ""
-"Manually invalidate cache for this repository. On first access repository "
-"will be cached again"
-msgstr "手动清除版本库缓存。之后第一次访问的时候将重建缓存"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:223
-msgid "List of cached values"
-msgstr "缓存值列表"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:226
-msgid "Prefix"
-msgstr "前缀"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:227
-msgid "Key"
-msgstr "键"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:228
-#: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:124
-#: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/admin/users_groups/users_group_add.html:41
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-#: rhodecode/templates/admin/users_groups/users_groups.html:39
-msgid "Active"
-msgstr "启用"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:243
-#: rhodecode/templates/base/base.html:292
-#: rhodecode/templates/base/base.html:293
-msgid "Public journal"
-msgstr "公共日志"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:249
-msgid "Remove from public journal"
-msgstr "从公共日志删除"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:251
-msgid "Add to public journal"
-msgstr "添加到公共日志"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:256
-msgid ""
-"All actions made on this repository will be accessible to everyone in public"
-" journal"
-msgstr "任何人都可以在公共日志上看到这个版本库上的所有动作"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:263
-msgid "Locking"
-msgstr "锁定"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
-msgid "Unlock locked repo"
-msgstr "解锁版本库"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
-msgid "Confirm to unlock repository"
-msgstr "确认解锁版本库"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:271
-msgid "Lock repo"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:271
-msgid "Confirm to lock repository"
-msgstr "确认锁定版本库"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:272
-msgid "Repository is not locked"
-msgstr "版本库未锁定"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:277
-msgid ""
-"Force locking on repository. Works only when anonymous access is disabled"
-msgstr "强制锁定版本库。只有在禁止匿名访问时候才有效"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:284
-msgid "Set as fork of"
-msgstr "设置复刻自"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:289
-msgid "Set"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:293
-msgid "Manually set this repository as a fork of another from the list"
-msgstr "从列表中手动设置这个版本库复刻自另一版本库"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:308
-msgid "Remove this repository"
-msgstr "删除版本库"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:308
-msgid "Confirm to delete this repository"
-msgstr "确认删除版本库"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:310
-#, python-format
-msgid "this repository has %s fork"
-msgid_plural "this repository has %s forks"
-msgstr[0] ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:311
-msgid "Detach forks"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:312
-msgid "Delete forks"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:315
-msgid ""
-"This repository will be renamed in a special way in order to be unaccesible "
-"for RhodeCode and VCS systems. If you need to fully delete it from file "
-"system please do it manually"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:329
-msgid "Extra fields"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:341
-#, python-format
-msgid "Confirm to delete this field: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:355
-msgid "New field key"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:363
-msgid "New field label"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:366
-msgid "Enter short label"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:372
-msgid "New field description"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:375
-msgid "Enter description of a field"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:3
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3
-msgid "none"
-msgstr "无"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:4
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4
-msgid "read"
-msgstr "读"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:5
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5
-msgid "write"
-msgstr "写"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:6
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6
-msgid "admin"
-msgstr "管理"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:7
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7
-msgid "member"
-msgstr "成员"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-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:20
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35
-msgid "default"
-msgstr "默认"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:33
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:58
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:55
-msgid "revoke"
-msgstr "移除"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:83
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81
-msgid "Add another member"
-msgstr "添加成员"
-
-#: rhodecode/templates/admin/repos/repos.html:5
-msgid "Repositories administration"
-msgstr "版本库管理员"
-
-#: rhodecode/templates/admin/repos/repos.html:88
-#: rhodecode/templates/admin/users/user_edit_my_account.html:185
-#: rhodecode/templates/admin/users/users.html:109
-#: rhodecode/templates/bookmarks/bookmarks.html:76
-#: rhodecode/templates/branches/branches.html:75
-#: rhodecode/templates/journal/journal.html:206
-#: rhodecode/templates/journal/journal.html:296
-#: rhodecode/templates/tags/tags.html:76
-msgid "No records found."
-msgstr "没有找到记录"
-
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
-msgid "apply to children"
-msgstr "应用到成员"
-
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88
-msgid ""
-"Set or revoke permission to all children of that group, including non-"
-"private repositories and other groups"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
-#, python-format
-msgid "%s Group Dashboard"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:9
-msgid "Home"
-msgstr "首页"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:13
-msgid "with"
-msgstr "有"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
-msgid "Add repository group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16
-#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91
-msgid "Repository groups"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13
-msgid "Add new repository group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56
-msgid "Group parent"
-msgstr "上级组"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59
-msgid "save"
-msgstr "保存"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
-msgid "Edit repository group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13
-#, python-format
-msgid "Edit repository group %s"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27
-msgid "Add child group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68
-msgid ""
-"Enable lock-by-pulling on group. This option will be applied to all other "
-"groups and repositories inside"
-msgstr "启用组的拉取锁定。这个选项将应用到组内的其他组和版本库"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
-msgid "Repository groups administration"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45
-msgid "Number of toplevel repositories"
-msgstr "顶层版本库数量"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64
-#: rhodecode/templates/admin/users_groups/users_groups.html:48
-#: rhodecode/templates/changeset/changeset_file_comment.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:171
-msgid "Edit"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65
-#: rhodecode/templates/admin/users_groups/users_groups.html:49
-#: rhodecode/templates/base/perms_summary.html:29
-#: rhodecode/templates/base/perms_summary.html:60
-#: rhodecode/templates/base/perms_summary.html:62
-#: rhodecode/templates/data_table/_dt_elements.html:116
-#: rhodecode/templates/data_table/_dt_elements.html:117
-#: rhodecode/templates/data_table/_dt_elements.html:130
-#: rhodecode/templates/data_table/_dt_elements.html:131
-msgid "edit"
-msgstr "编辑"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:54
+#: rhodecode/templates/admin/repos/repo_edit.html:49
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:43
+#: rhodecode/templates/admin/users/user_edit.html:44
+msgid "Advanced"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:1
+#, python-format
+msgid "Repository Group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:6
+msgid "Top level repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:7
+msgid "Total repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:8
+msgid "Children groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_advanced.html:8
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+msgid "Created on"
+msgstr "创建于"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:192
 #, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
 msgstr[0] "确认删除这个版本库组：%s包含%s个版本库"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78
-msgid "There are no repository groups yet"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/hooks.html:5
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:25
+msgid "Delete this repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:7
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:8
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:7
+#: rhodecode/templates/base/perms_summary.html:14
+msgid "none"
+msgstr "无"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:8
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:8
+#: rhodecode/templates/base/perms_summary.html:15
+msgid "read"
+msgstr "读"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:9
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:10
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:9
+#: rhodecode/templates/base/perms_summary.html:16
+msgid "write"
+msgstr "写"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:10
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:10
+#: rhodecode/templates/base/perms_summary.html:17
+msgid "admin"
+msgstr "管理"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:11
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:12
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:11
+msgid "user/user group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:28
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:45
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:24
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:37
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:28
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:45
+msgid "default"
+msgstr "默认"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:34
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:71
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:43
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:68
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:34
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:71
+msgid "revoke"
+msgstr "移除"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:47
+msgid "delegated admin"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:97
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:94
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:97
+msgid "Add new"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:103
+msgid "apply to children"
+msgstr "应用到成员"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:107
+msgid "Both"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:108
+msgid ""
+"Set or revoke permission to all children of that group, including non-"
+"private repositories and other groups if selected."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:38
+msgid ""
+"Enable lock-by-pulling on group. This option will be applied to all other "
+"groups and repositories inside"
+msgstr "启用组的拉取锁定。这个选项将应用到组内的其他组和版本库"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:4
+#, python-format
+msgid "%s Repository group dashboard"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:12
+msgid "Home"
+msgstr "首页"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:16
+msgid "with"
+msgstr "有"
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:5
+msgid "Repository groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+msgid "repository groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:52
+msgid "Number of toplevel repositories"
+msgstr "顶层版本库数量"
+
+#: rhodecode/templates/admin/repos/repo_add.html:5
+msgid "Add repository"
+msgstr "添加版本库"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:14
+msgid "Import existing repository ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:23
+#: rhodecode/templates/summary/summary.html:32
+msgid "Clone from"
+msgstr "克隆自"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:27
+msgid "Optional http[s] url from which repository should be cloned."
+msgstr "可选的，指定版本库应该从哪个http[s]地址克隆。"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:36
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:76
+#: rhodecode/templates/forks/fork.html:45
+msgid ""
+"Keep it short and to the point. Use a README file for longer descriptions."
+msgstr "保持简短。用README文件来写更长的描述。"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:45
+#: rhodecode/templates/forks/fork.html:55
+msgid "Optionaly select a group to put this repository into."
+msgstr "可选的，选择一个组将版本库放到其中"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:63
+msgid "Type of repository to create."
+msgstr "要创建的版本库类型"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:51
+#: rhodecode/templates/forks/fork.html:61
+msgid "Landing revision"
+msgstr "默认修订"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:72
+msgid ""
+"Default revision for files page, downloads, full text search index and "
+"readme generation"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:9
+#, python-format
+msgid "%s Creating repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:16
+msgid "Creating repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:30
+#, python-format
+msgid ""
+"Repository \"%(repo_name)s\" is beeing created, you will be redirected when "
+"this process is finished.repo_name"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:42
+msgid ""
+"We're sorry but error occured during this operation. Please check your "
+"RhodeCode server logs, or contact administrator."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:8
+#, python-format
+msgid "%s repository settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:52
+msgid "Extra fields"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:55
+msgid "Caches"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:58
+msgid "Remote"
+msgstr "远程"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:61
+#: rhodecode/templates/summary/statistics.html:11
+#: rhodecode/templates/summary/summary.html:178
+#: rhodecode/templates/summary/summary.html:179
+msgid "Statistics"
+msgstr "统计"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:1
+#: rhodecode/templates/summary/summary.html:25
+msgid "Fork of"
+msgstr "复刻自"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:6
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:5
+msgid "Set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:10
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:9
+msgid "Manually set this repository as a fork of another from the list"
+msgstr "从列表中手动设置这个版本库复刻自另一版本库"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:24
+msgid "Public journal visibility"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:32
+msgid "Remove from public journal"
+msgstr "从公共日志删除"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:37
+msgid "Add to public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:43
+msgid ""
+"All actions made on this repository will be accessible to everyone in public"
+" journal"
+msgstr "任何人都可以在公共日志上看到这个版本库上的所有动作"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:49
+msgid "Change locking"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:56
+msgid "Confirm to unlock repository"
+msgstr "确认解锁版本库"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:58
+msgid "Unlock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:64
+msgid "Confirm to lock repository"
+msgstr "确认锁定版本库"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:66
+msgid "Lock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:68
+msgid "Repository is not locked"
+msgstr "版本库未锁定"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:73
+msgid ""
+"Force locking on repository. Works only when anonymous access is disabled. "
+"Trigering a pull locks repository by user who pulled, only the same user can"
+" unlock by doing a push"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:83
+#: rhodecode/templates/data_table/_dt_elements.html:132
+#, python-format
+msgid "Confirm to delete this repository: %s"
+msgstr "确认删除版本库：%s"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:85
+msgid "Delete this repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:88
+#, python-format
+msgid "this repository has %s fork"
+msgid_plural "this repository has %s forks"
+msgstr[0] ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:89
+msgid "Detach forks"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:90
+msgid "Delete forks"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:94
+msgid ""
+"This repository will be renamed in a special way in order to be unaccesible "
+"for RhodeCode and VCS systems. If you need to fully delete it from file "
+"system please do it manually"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Invalidate repository cache"
+msgstr "清除版本库缓存"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Confirm to invalidate repository cache"
+msgstr "确认清除版本库缓存"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:7
+msgid ""
+"Manually invalidate cache for this repository. On first access repository "
+"will be cached again"
+msgstr "手动清除版本库缓存。之后第一次访问的时候将重建缓存"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:12
+msgid "List of cached values"
+msgstr "缓存值列表"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:15
+msgid "Prefix"
+msgstr "前缀"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:16
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:6
+msgid "Key"
+msgstr "键"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:17
+#: rhodecode/templates/admin/user_groups/user_group_add.html:52
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:24
+#: rhodecode/templates/admin/user_groups/user_groups.html:53
+#: rhodecode/templates/admin/users/user_add.html:91
+#: rhodecode/templates/admin/users/user_edit_profile.html:105
+#: rhodecode/templates/admin/users/users.html:57
+msgid "Active"
+msgstr "启用"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:5
+msgid "Label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:19
+#, python-format
+msgid "Confirm to delete this field: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:33
+msgid "New field key"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:41
+msgid "New field label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:44
+msgid "Enter short label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:50
+msgid "New field description"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:53
+msgid "Enter description of a field"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:66
+msgid "Extra fields are disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:21
+msgid "private repository"
+msgstr "私有版本库"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:3
+msgid "Remote url"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+msgid "Pull changes from remote location"
+msgstr "从远程路径拉取修订集"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+msgid "Confirm to pull changes from remote side"
+msgstr "确认从远程拉取修订集"
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:14
+msgid "This repository does not have any remote url set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "Non-changeable id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "what is that ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:13
+msgid "URL by id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:14
+msgid ""
+"In case this repository is renamed or moved into another group the repository url changes.\n"
+"                               Using above url guarantees that this repository will allways be accessible under such url.\n"
+"                               Usefull for CI systems, or any other cases that you need to hardcode the url into 3rd party service."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:21
+msgid "Clone uri"
+msgstr "克隆地址"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:27
+#: rhodecode/templates/base/perms_summary.html:43
+#: rhodecode/templates/base/perms_summary.html:79
+#: rhodecode/templates/base/perms_summary.html:81
+#: rhodecode/templates/data_table/_dt_elements.html:124
+#: rhodecode/templates/data_table/_dt_elements.html:125
+#: rhodecode/templates/data_table/_dt_elements.html:152
+#: rhodecode/templates/data_table/_dt_elements.html:153
+#: rhodecode/templates/data_table/_dt_elements.html:169
+#: rhodecode/templates/data_table/_dt_elements.html:185
+msgid "edit"
+msgstr "编辑"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:30
+msgid "new value"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:37
+msgid "http[s] url used for doing remote pulls."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:46
+msgid "Optional select a group to put this repository into."
+msgstr "可选的，选择一个组将版本库放到其中"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:55
+#: rhodecode/templates/forks/fork.html:65
+msgid "Default revision for files page, downloads, whoosh and readme"
+msgstr "文件浏览、下载、whoosh和README的默认修订版本"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:65
+msgid "Change owner of this repository."
+msgstr "修改这个版本库的所有者"
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:6
+msgid "Processed commits"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:7
+msgid "Processed progress"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Reset statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Confirm to remove current statistics"
+msgstr "确认移除当前统计"
+
+#: rhodecode/templates/admin/repos/repos.html:5
+msgid "Repositories administration"
+msgstr "版本库管理员"
+
+#: rhodecode/templates/admin/repos/repos.html:54
+msgid "State"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings.html:5
 msgid "Settings administration"
 msgstr "系统设置"
 
-#: rhodecode/templates/admin/settings/hooks.html:24
-msgid "Built in hooks - read only"
-msgstr "内建钩子 - 只读"
-
-#: rhodecode/templates/admin/settings/hooks.html:40
-msgid "Custom hooks"
-msgstr "自定义钩子"
-
-#: rhodecode/templates/admin/settings/hooks.html:56
-msgid "remove"
-msgstr "删除"
-
-#: rhodecode/templates/admin/settings/hooks.html:88
-msgid "Failed to remove hook"
-msgstr "移除钩子失败"
-
-#: rhodecode/templates/admin/settings/settings.html:26
-msgid "Remap and rescan repositories"
-msgstr "重新扫描并映射版本库"
-
-#: rhodecode/templates/admin/settings/settings.html:34
-msgid "Rescan option"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:40
-msgid ""
-"In case a repository was deleted from filesystem and there are leftovers in "
-"the database check this option to scan obsolete data in database and remove "
-"it."
-msgstr "如果版本库已经从文件系统删除，但数据库仍然有遗留信息，请勾选该项进行清理"
+msgid "VCS"
+msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:41
-msgid "Destroy old data"
+msgid "Remap and rescan"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:43
-msgid ""
-"Rescan repositories location for new repositories. Also deletes obsolete if "
-"`destroy` flag is checked "
-msgstr "重新扫描版本库路径以发现新版本库。 同时删除过时的，如果设置有 `destroy` 标志"
+msgid "Visual"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:45
+#: rhodecode/templates/admin/settings/settings_vcs.html:19
+msgid "Hooks"
+msgstr "钩子"
+
+#: rhodecode/templates/admin/settings/settings.html:46
+msgid "Full text search"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:47
+msgid "System Info"
+msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:48
-msgid "Rescan repositories"
-msgstr "重新扫描版本库"
-
-#: rhodecode/templates/admin/settings/settings.html:54
-msgid "Whoosh indexing"
-msgstr "Whoosh索引"
-
-#: rhodecode/templates/admin/settings/settings.html:62
-msgid "Index build option"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:67
-msgid "Build from scratch"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:73
-msgid "Reindex"
-msgstr "重新索引"
-
-#: rhodecode/templates/admin/settings/settings.html:79
-msgid "Global application settings"
-msgstr "全局设置"
-
-#: rhodecode/templates/admin/settings/settings.html:88
+msgid "License"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:4
+msgid "Email prefix"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:5
+msgid "RhodeCode email from"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:6
+msgid "Error email from"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:7
+msgid "Error email recipients"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:9
+msgid "SMTP server"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:10
+msgid "SMTP username"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:11
+msgid "SMTP password"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:12
+msgid "SMTP port"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:14
+msgid "SMTP use TLS"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:15
+msgid "SMTP use SSL"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:16
+msgid "SMTP auth"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:31
+msgid "Send test email to"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:39
+msgid "Send"
+msgstr "发送"
+
+#: rhodecode/templates/admin/settings/settings_global.html:8
 msgid "Site branding"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:97
+#: rhodecode/templates/admin/settings/settings_global.html:12
+msgid "Set a custom title for your RhodeCode Service."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:18
 msgid "HTTP authentication realm"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:106
+#: rhodecode/templates/admin/settings/settings_global.html:27
 msgid "Google Analytics code"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:114
-#: rhodecode/templates/admin/settings/settings.html:195
-#: rhodecode/templates/admin/settings/settings.html:287
+#: rhodecode/templates/admin/settings/settings_global.html:36
+msgid "ReCaptcha public key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:40
+msgid "Public key for reCaptcha system."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:46
+msgid "ReCaptcha private key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:50
+msgid ""
+"Private key for reCaptcha system. Setting this value will enable captcha on "
+"registration"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:55
+#: rhodecode/templates/admin/settings/settings_license.html:42
+#: rhodecode/templates/admin/settings/settings_vcs.html:80
+#: rhodecode/templates/admin/settings/settings_visual.html:115
 msgid "Save settings"
 msgstr "保存设置"
 
-#: rhodecode/templates/admin/settings/settings.html:121
-msgid "Visualisation settings"
-msgstr "可视化设置"
-
-#: rhodecode/templates/admin/settings/settings.html:129
-msgid "General"
-msgstr "通用"
-
-#: rhodecode/templates/admin/settings/settings.html:134
-msgid "Use repository extra fields"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:136
-msgid "Allows storing additional customized fields per repository."
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:139
-msgid "Show RhodeCode version"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:141
-msgid "Shows or hides displayed version of RhodeCode in the footer"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:146
-msgid "Dashboard items"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:150
+#: rhodecode/templates/admin/settings/settings_hooks.html:1
+msgid "Built in Mercurial hooks - read only"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:15
+msgid ""
+"Hooks can be used to trigger actions on certain events such as push / pull. "
+"They can trigger Python functions or external applications."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:19
+msgid "Custom hooks"
+msgstr "自定义钩子"
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:69
+msgid "Failed to remove hook"
+msgstr "移除钩子失败"
+
+#: rhodecode/templates/admin/settings/settings_license.html:2
+msgid "Currently you're using a free license, which is limited to 20 users."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:9
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "RhodeCode version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "License token"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "No license token"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:13
+msgid "License issued to"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:14
+msgid "License issued on"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "License users limit"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "unlimited"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:16
+msgid "License expires on"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:33
+msgid "License key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:37
+msgid "Paste your RhodeCode license key into that textarea."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:52
+msgid ""
+"Please enter following lines (if yet not present) into [app:main] section of"
+" your .ini file. The token below is autogenerated."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:6
+msgid "Rescan option"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:11
+msgid "Destroy old data"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:13
 msgid ""
-"Number of items displayed in lightweight dashboard before pagination is "
-"shown."
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:155
-msgid "Icons"
-msgstr "图标"
-
-#: rhodecode/templates/admin/settings/settings.html:160
-msgid "Show public repo icon on repositories"
-msgstr "显示公共版本库图标"
-
-#: rhodecode/templates/admin/settings/settings.html:164
-msgid "Show private repo icon on repositories"
-msgstr "显示私有版本库图标"
-
-#: rhodecode/templates/admin/settings/settings.html:166
-msgid "Show public/private icons next to repositories names"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:172
-msgid "Meta-Tagging"
-msgstr "元标记"
-
-#: rhodecode/templates/admin/settings/settings.html:177
-msgid "Stylify recognised metatags:"
-msgstr "样式化识别的元标记"
-
-#: rhodecode/templates/admin/settings/settings.html:204
-msgid "VCS settings"
-msgstr "版本控制系统设置"
-
-#: rhodecode/templates/admin/settings/settings.html:213
+"In case a repository was deleted from filesystem and it still exists in the "
+"database check this option to scan obsolete data in database and remove it."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:17
+msgid "Invalidate cache for all repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:19
+msgid ""
+"Each cache data for repositories will be cleaned with this option selected. "
+"Use this to reload data and clear cache keys."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:23
+msgid "Install GIT hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:25
+msgid ""
+"Verify if RhodeCodes GIT hooks are installed for each repository. Current "
+"hooks will be updated to latest version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:32
+msgid "Rescan Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:7
+msgid "Index build option"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:12
+msgid "Build from scratch"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:15
+msgid ""
+"This option completely reindex all the files within RhodeCode for proper "
+"fulltext search capabilities."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:21
+msgid "Reindex"
+msgstr "重新索引"
+
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "check for updates"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:5
+msgid "Python version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:6
+msgid "Platform"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:7
+msgid "GIT version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:8
+msgid "GIT path"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Upgrade info endpoint"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Note: please make sure this server can access this url"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:14
+msgid "Checking for updates..."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:22
+msgid "Python packages"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr "网络"
 
-#: rhodecode/templates/admin/settings/settings.html:218
+#: rhodecode/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:220
+#: rhodecode/templates/admin/settings/settings_vcs.html:13
 msgid ""
-"RhodeCode will require SSL for pushing or pulling. If SSL is missing it will"
-" return HTTP Error 406: Not Acceptable"
-msgstr "勾选后RhodeCode将要求使用SSL进行推送和拉取。如果没有使用SSL将返回HTTP 406错误：Not Acceptable"
-
-#: rhodecode/templates/admin/settings/settings.html:226
-msgid "Hooks"
-msgstr "钩子"
-
-#: rhodecode/templates/admin/settings/settings.html:231
-msgid "Update repository after push (hg update)"
-msgstr "推送后更新版本库（hg update）"
-
-#: rhodecode/templates/admin/settings/settings.html:235
+"Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
+"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:24
 msgid "Show repository size after push"
 msgstr "推送后显示版本库大小"
 
-#: rhodecode/templates/admin/settings/settings.html:239
+#: rhodecode/templates/admin/settings/settings_vcs.html:28
 msgid "Log user push commands"
 msgstr "记录用户推送命令"
 
-#: rhodecode/templates/admin/settings/settings.html:243
+#: rhodecode/templates/admin/settings/settings_vcs.html:32
 msgid "Log user pull commands"
 msgstr "记录用户拉取命令"
 
-#: rhodecode/templates/admin/settings/settings.html:247
-msgid "Advanced setup"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:252
+#: rhodecode/templates/admin/settings/settings_vcs.html:36
+msgid "Update repository after push (hg update)"
+msgstr "推送后更新版本库（hg update）"
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:42
 msgid "Mercurial Extensions"
 msgstr "Mercurial扩展"
 
-#: rhodecode/templates/admin/settings/settings.html:257
+#: rhodecode/templates/admin/settings/settings_vcs.html:47
 msgid "Enable largefiles extension"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:261
+#: rhodecode/templates/admin/settings/settings_vcs.html:51
 msgid "Enable hgsubversion extension"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:263
+#: rhodecode/templates/admin/settings/settings_vcs.html:53
 msgid ""
-"Requires hgsubversion library installed. Allows cloning from svn remote "
-"locations"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:274
+"Requires hgsubversion library to be installed. Allows cloning remote SVN "
+"repositories and migrates them to Mercurial type."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:64
 msgid "Repositories location"
 msgstr "版本库路径"
 
-#: rhodecode/templates/admin/settings/settings.html:279
+#: rhodecode/templates/admin/settings/settings_vcs.html:69
 msgid ""
 "Click to unlock. You must restart RhodeCode in order to make this setting "
 "take effect."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:280
-#: rhodecode/templates/base/base.html:143
-msgid "Unlock"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:282
+#: rhodecode/templates/admin/settings/settings_vcs.html:72
+msgid ""
+"Filesystem location where repositories should be stored. After changing this"
+" value a restart and rescan of the repository folder are required."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:8
+msgid "General"
+msgstr "通用"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:13
+msgid "Use repository extra fields"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:15
+msgid "Allows storing additional customized fields per repository."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:18
+msgid "Show RhodeCode version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:20
+msgid "Shows or hides a version number of RhodeCode displayed in the footer."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:24
+msgid "Use Gravatars in RhodeCode"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:30
+msgid ""
+"Gravatar url allows you to use other avatar server application.\n"
+"                                                        Following variables of the URL will be replaced accordingly.\n"
+"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {email}     user email,\n"
+"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
+"                                                        {size}      size of the image that is expected from the server application,\n"
+"                                                        {netloc}    network location/server host of running RhodeCode server"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:42
+msgid ""
+"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
+"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {user}   current user username,\n"
+"                                                        {netloc} network location/server host of running RhodeCode server,\n"
+"                                                        {repo}   full repository name,\n"
+"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:54
+msgid "Dashboard items"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:58
+msgid ""
+"Number of items displayed in the main page dashboard before pagination is "
+"shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:64
+msgid "Admin pages items"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:68
 msgid ""
-"Location where repositories are stored. After changing this value a restart,"
-" and rescan is required"
-msgstr "版本库存储路径。 修改后需要重启和重新扫描"
-
-#: rhodecode/templates/admin/settings/settings.html:303
-msgid "Test Email"
-msgstr "测试邮件"
-
-#: rhodecode/templates/admin/settings/settings.html:311
-msgid "Email to"
-msgstr "发送到"
-
-#: rhodecode/templates/admin/settings/settings.html:319
-msgid "Send"
-msgstr "发送"
-
-#: rhodecode/templates/admin/settings/settings.html:325
-msgid "System Info and Packages"
-msgstr "系统和软件包信息"
-
-#: rhodecode/templates/admin/settings/settings.html:328
-#: rhodecode/templates/changelog/changelog.html:51
-msgid "Show"
-msgstr "显示"
+"Number of items displayed in the admin pages grids before pagination is "
+"shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:74
+msgid "Icons"
+msgstr "图标"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:79
+msgid "Show public repo icon on repositories"
+msgstr "显示公共版本库图标"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:83
+msgid "Show private repo icon on repositories"
+msgstr "显示私有版本库图标"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:85
+msgid "Show public/private icons next to repositories names."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:91
+msgid "Meta-Tagging"
+msgstr "元标记"
+
+#: rhodecode/templates/admin/settings/settings_visual.html:96
+msgid "Stylify recognised meta tags:"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:110
+msgid ""
+"Parses meta tags from repository description field and turns them into "
+"colored tags."
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:5
+msgid "Add user group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:13
+#: rhodecode/templates/base/base.html:73 rhodecode/templates/base/base.html:93
+msgid "User groups"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:28
+msgid "Add User Group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:19
+msgid "Short, optional description for this user group."
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:5
+#, python-format
+msgid "%s user group settings"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:14
+msgid "User Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:44
+#: rhodecode/templates/admin/users/user_edit.html:45
+msgid "Default permissions"
+msgstr "默认权限"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:6
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:32
+#: rhodecode/templates/admin/user_groups/user_groups.html:52
+msgid "Members"
+msgstr "成员"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:1
+#, python-format
+msgid "User Group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:19
+#: rhodecode/templates/data_table/_dt_elements.html:176
+#, python-format
+msgid "Confirm to delete this user group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:21
+msgid "Delete this user group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_members.html:15
+msgid "No members yet"
+msgstr "还没有成员"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:40
+msgid "Chosen group members"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:43
+msgid "Remove all elements"
+msgstr "移除全部项目"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:53
+msgid "Available members"
+msgstr "启用成员"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:56
+msgid "Add all elements"
+msgstr "添加全部项目"
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:5
+msgid "User groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+msgid "user groups"
+msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr "添加用户"
 
-#: rhodecode/templates/admin/users/user_add.html:10
-#: rhodecode/templates/admin/users/user_edit.html:11
-#: rhodecode/templates/base/base.html:76
+#: rhodecode/templates/admin/users/user_add.html:13
+#: rhodecode/templates/admin/users/user_edit.html:14
+#: rhodecode/templates/base/base.html:72
 msgid "Users"
 msgstr "用户"
 
-#: rhodecode/templates/admin/users/user_add.html:12
-#: rhodecode/templates/admin/users/users.html:23
-msgid "Add new user"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_add.html:50
+#: rhodecode/templates/admin/users/user_add.html:15
+#: rhodecode/templates/admin/users/users.html:27
+msgid "Add User"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_add.html:53
 msgid "Password confirmation"
 msgstr "确认密码"
 
 #: rhodecode/templates/admin/users/user_edit.html:5
-msgid "Edit user"
-msgstr "编辑用户"
-
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#, python-format
-msgid "Edit %s"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:34
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:10
-msgid "Change your avatar at"
-msgstr "修改你的头像"
-
-#: rhodecode/templates/admin/users/user_edit.html:35
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:11
-msgid "Using"
-msgstr "使用中"
-
-#: rhodecode/templates/admin/users/user_edit.html:43
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:20
-msgid "API key"
-msgstr "API密钥"
-
-#: rhodecode/templates/admin/users/user_edit.html:50
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25
-msgid "Current IP"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:70
-msgid "LDAP DN"
-msgstr "LDAP DN"
-
-#: rhodecode/templates/admin/users/user_edit.html:79
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
-msgid "New password"
-msgstr "新密码"
-
-#: rhodecode/templates/admin/users/user_edit.html:88
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
+#, python-format
+msgid "%s user settings"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:46
+msgid "Emails"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:47
+msgid "Ip whitelist"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:1
+#, python-format
+msgid "User: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_profile.html:51
+msgid "Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:9
+msgid "Last Login"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:10
+msgid "Member of User groups"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:160
+#, python-format
+msgid "Confirm to delete this user: %s"
+msgstr "确认删除用户：%s"
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:23
+msgid "Delete this user"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_ips.html:8
+#, python-format
+msgid "Inherited from %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:8
+msgid "Change avatar at"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:12
+msgid "Missing email, please update this user email address."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:27
+#, python-format
+msgid ""
+"This user is in an external Source of Record (%s); some details cannot be "
+"managed here."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:60
+msgid "Name in Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr "确认新密码"
 
-#: rhodecode/templates/admin/users/user_edit.html:163
-msgid "Email addresses"
-msgstr "邮件地址"
-
-#: rhodecode/templates/admin/users/user_edit.html:176
-#, python-format
-msgid "Confirm to delete this email: %s"
-msgstr "确认删除邮箱：%s"
-
-#: rhodecode/templates/admin/users/user_edit.html:190
-msgid "New email address"
-msgstr "增加邮箱"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:254
-msgid "My account"
-msgstr "我的账户"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:9
-msgid "My Account"
-msgstr "我的账户"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:35
-msgid "My permissions"
-msgstr "我的权限"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:54
-msgid "My repos"
-msgstr "我的版本库"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:41
-msgid "My pull requests"
-msgstr "我的拉取请求"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4
-msgid "Show closed pull requests"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6
-msgid "Opened by me"
-msgstr "我创建的"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
-#, python-format
-msgid "Pull request #%s opened on %s"
-msgstr "拉取请求#%s创建于%s"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45
-#: rhodecode/templates/pullrequests/pullrequest_data.html:11
-#: rhodecode/templates/pullrequests/pullrequest_show.html:27
-#: rhodecode/templates/pullrequests/pullrequest_show.html:42
-msgid "Closed"
-msgstr "已关闭"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23
-msgid "Confirm to delete this pull request"
-msgstr "确认删除拉取请求"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51
-msgid "Nothing here yet"
-msgstr "无条目"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34
-msgid "I participate in"
-msgstr "我参与的"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42
-#: rhodecode/templates/pullrequests/pullrequest_data.html:8
-#, python-format
-msgid "Pull request #%s opened by %s on %s"
-msgstr "拉取请求#%s由%s创建于%s"
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "用户管理员"
 
-#: rhodecode/templates/admin/users/users.html:9
+#: rhodecode/templates/admin/users/users.html:13
 msgid "users"
 msgstr "用户"
 
-#: rhodecode/templates/admin/users/users.html:80
+#: rhodecode/templates/admin/users/users.html:54
 msgid "Firstname"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:81
+#: rhodecode/templates/admin/users/users.html:55
 msgid "Lastname"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:82
+#: rhodecode/templates/admin/users/users.html:56
 msgid "Last login"
 msgstr ""
 
-#: rhodecode/templates/admin/users_groups/users_group_add.html:5
-msgid "Add user group"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_add.html:10
-#: rhodecode/templates/admin/users_groups/users_groups.html:11
-#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94
-msgid "User groups"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_add.html:12
-#: rhodecode/templates/admin/users_groups/users_groups.html:26
-msgid "Add new user group"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:5
-msgid "Edit user group"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:11
-msgid "UserGroups"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:50
-#: rhodecode/templates/admin/users_groups/users_groups.html:38
-msgid "Members"
-msgstr "成员"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:58
-msgid "Chosen group members"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:61
-msgid "Remove all elements"
-msgstr "移除全部项目"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:75
-msgid "Available members"
-msgstr "启用成员"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:79
-msgid "Add all elements"
-msgstr "添加全部项目"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:109
-msgid "No members yet"
-msgstr "还没有成员"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:117
-msgid "Global Permissions"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:5
-msgid "User groups administration"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:55
-#, python-format
-msgid "Confirm to delete this user group: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:62
-msgid "There are no user groups yet"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:42
+#: rhodecode/templates/admin/users/users.html:59
+msgid "Auth type"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:37
 #, python-format
 msgid "Server instance: %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:52
-msgid "Report a bug"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:121
-#: rhodecode/templates/data_table/_dt_elements.html:9
+#: rhodecode/templates/base/base.html:46
+msgid "Support"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:131
+msgid "Create fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:142
 #: rhodecode/templates/data_table/_dt_elements.html:11
-#: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/summary/summary.html:8
+#: rhodecode/templates/data_table/_dt_elements.html:15
+#: rhodecode/templates/summary/summary.html:11
 msgid "Summary"
 msgstr "概况"
 
-#: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/changelog/changelog.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:17
+#: rhodecode/templates/base/base.html:143
+#: rhodecode/templates/changelog/changelog.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
-#: rhodecode/templates/data_table/_dt_elements.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:23
 msgid "Changelog"
 msgstr "修订记录"
 
-#: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/data_table/_dt_elements.html:25
+#: rhodecode/templates/base/base.html:144
 #: rhodecode/templates/data_table/_dt_elements.html:27
-#: rhodecode/templates/data_table/_dt_elements.html:29
-#: rhodecode/templates/files/files.html:12
+#: rhodecode/templates/data_table/_dt_elements.html:31
+#: rhodecode/templates/files/files.html:15
 msgid "Files"
 msgstr "浏览"
 
-#: rhodecode/templates/base/base.html:125
+#: rhodecode/templates/base/base.html:146
 msgid "Switch To"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:127
-#: rhodecode/templates/base/base.html:279
-msgid "loading..."
-msgstr "载入中..."
-
-#: rhodecode/templates/base/base.html:131
-msgid "Options"
-msgstr "选项"
-
-#: rhodecode/templates/base/base.html:137
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
-msgstr "比较复刻"
-
-#: rhodecode/templates/base/base.html:139
-#: rhodecode/templates/base/base.html:312
-#: rhodecode/templates/search/search.html:14
-#: rhodecode/templates/search/search.html:54
-msgid "Search"
-msgstr "搜索"
-
-#: rhodecode/templates/base/base.html:145
-msgid "Lock"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:153
-msgid "Follow"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:154
-msgid "Unfollow"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:157
-#: rhodecode/templates/data_table/_dt_elements.html:33
-#: rhodecode/templates/data_table/_dt_elements.html:35
-#: rhodecode/templates/data_table/_dt_elements.html:37
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/forks/fork.html:9
-msgid "Fork"
-msgstr "复刻"
-
-#: rhodecode/templates/base/base.html:159
-msgid "Create Pull Request"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:165
-msgid "Show Pull Requests"
-msgstr ""
+#: rhodecode/templates/base/base.html:155
+msgid "Options"
+msgstr "选项"
+
+#: rhodecode/templates/base/base.html:163
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
+msgstr "比较复刻"
 
 #: rhodecode/templates/base/base.html:165
-msgid "Pull Requests"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:202
+#: rhodecode/templates/bookmarks/bookmarks.html:58
+#: rhodecode/templates/bookmarks/bookmarks_data.html:13
+#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/branches/branches_data.html:13
+#: rhodecode/templates/tags/tags.html:58
+#: rhodecode/templates/tags/tags_data.html:13
+msgid "Compare"
+msgstr "比较显示"
+
+#: rhodecode/templates/base/base.html:167
+#: rhodecode/templates/base/base.html:334
+#: rhodecode/templates/search/search.html:17
+#: rhodecode/templates/search/search.html:57
+msgid "Search"
+msgstr "搜索"
+
+#: rhodecode/templates/base/base.html:171
+msgid "Unlock"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:173
+msgid "Lock"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:181
+msgid "Follow"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:182
+msgid "Unfollow"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:185
+#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/data_table/_dt_elements.html:39
+#: rhodecode/templates/forks/fork.html:12
+msgid "Fork"
+msgstr "复刻"
+
+#: rhodecode/templates/base/base.html:187
+msgid "Create Pull Request"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:193
+#, python-format
+msgid "Show Pull Requests for %s"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:230
 msgid "Not logged in"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:209
+#: rhodecode/templates/base/base.html:237
 msgid "Login to your account"
 msgstr "登录"
 
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/templates/base/base.html:260
 msgid "Forgot password ?"
 msgstr "忘记密码？"
 
-#: rhodecode/templates/base/base.html:255
+#: rhodecode/templates/base/base.html:283
 msgid "Log Out"
 msgstr "退出"
 
-#: rhodecode/templates/base/base.html:274
-msgid "Switch repository"
-msgstr "切换版本库"
-
-#: rhodecode/templates/base/base.html:286
+#: rhodecode/templates/base/base.html:308
 msgid "Show recent activity"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:287
+#: rhodecode/templates/base/base.html:309
 #: rhodecode/templates/journal/journal.html:4
 msgid "Journal"
 msgstr "日志"
 
-#: rhodecode/templates/base/base.html:298
+#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:315
+msgid "Public journal"
+msgstr "公共日志"
+
+#: rhodecode/templates/base/base.html:320
 msgid "Show public gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:303
+#: rhodecode/templates/base/base.html:321
+msgid "Gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:324
+msgid "Create new gist"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:325
 msgid "All public gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:305
+#: rhodecode/templates/base/base.html:327
 msgid "My public gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/base/base.html:328
 msgid "My private gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:311
+#: rhodecode/templates/base/base.html:333
 msgid "Search in repositories"
 msgstr ""
 
+#: rhodecode/templates/base/base.html:394
+msgid "No matches found"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:522
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:531
+msgid "Site-wide shortcuts"
+msgstr ""
+
 #: rhodecode/templates/base/default_perms_box.html:14
-msgid "Inherit default permissions"
-msgstr "继承默认权限"
-
-#: rhodecode/templates/base/default_perms_box.html:18
+msgid "Inherit from defaults"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:19
 #, python-format
 msgid ""
-"Select to inherit permissions from %s settings. With this selected below "
-"options does not apply."
-msgstr ""
-
-#: rhodecode/templates/base/default_perms_box.html:26
+"Select to inherit permissions from %s permissions settings, and default IP "
+"address whitelist."
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:28
 msgid "Create repositories"
 msgstr "创建版本库"
 
-#: rhodecode/templates/base/default_perms_box.html:30
+#: rhodecode/templates/base/default_perms_box.html:33
 msgid "Select this option to allow repository creation for this user"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.html:35
+#: rhodecode/templates/base/default_perms_box.html:40
 msgid "Create user groups"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.html:39
+#: rhodecode/templates/base/default_perms_box.html:45
 msgid "Select this option to allow user group creation for this user"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.html:44
+#: rhodecode/templates/base/default_perms_box.html:52
 msgid "Fork repositories"
 msgstr "复刻版本库"
 
-#: rhodecode/templates/base/default_perms_box.html:48
+#: rhodecode/templates/base/default_perms_box.html:57
 msgid "Select this option to allow repository forking for this user"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:11
+#: rhodecode/templates/base/perms_summary.html:13
+msgid "show"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:22
 msgid "No permissions defined yet"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:19
-#: rhodecode/templates/base/perms_summary.html:38
+#: rhodecode/templates/base/perms_summary.html:30
+#: rhodecode/templates/base/perms_summary.html:54
 msgid "Permission"
 msgstr "权限"
 
-#: rhodecode/templates/base/perms_summary.html:20
-#: rhodecode/templates/base/perms_summary.html:39
+#: rhodecode/templates/base/perms_summary.html:32
+#: rhodecode/templates/base/perms_summary.html:56
 msgid "Edit Permission"
 msgstr "编辑权限"
 
-#: rhodecode/templates/base/root.html:44
+#: rhodecode/templates/base/perms_summary.html:90
+msgid "No permission defined"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:47
 msgid "Add another comment"
 msgstr ""
 
-#: rhodecode/templates/base/root.html:45
-#: rhodecode/templates/data_table/_dt_elements.html:147
+#: rhodecode/templates/base/root.html:48
+#: rhodecode/templates/data_table/_dt_elements.html:216
 msgid "Stop following this repository"
 msgstr "停止关注该版本库"
 
-#: rhodecode/templates/base/root.html:46
-msgid "Start following this repository"
-msgstr "开始关注该版本库"
-
-#: rhodecode/templates/base/root.html:47
-msgid "Group"
-msgstr "组"
-
-#: rhodecode/templates/base/root.html:48
-msgid "members"
-msgstr "成员"
-
 #: rhodecode/templates/base/root.html:49
-#: rhodecode/templates/pullrequests/pullrequest.html:203
-msgid "Loading ..."
-msgstr ""
+msgid "Start following this repository"
+msgstr "开始关注该版本库"
 
 #: rhodecode/templates/base/root.html:50
-msgid "Search truncated"
-msgstr ""
+msgid "Group"
+msgstr "组"
 
 #: rhodecode/templates/base/root.html:51
-msgid "No matching files"
-msgstr ""
+msgid "members"
+msgstr "成员"
 
 #: rhodecode/templates/base/root.html:52
-#: rhodecode/templates/changelog/changelog.html:45
-msgid "Open new pull request"
-msgstr "新建拉取请求"
+#: rhodecode/templates/pullrequests/pullrequest.html:202
+msgid "Loading ..."
+msgstr ""
 
 #: rhodecode/templates/base/root.html:53
-msgid "Open new pull request for selected changesets"
-msgstr "为选择的变更集创建新的拉取请求"
+msgid "loading ..."
+msgstr ""
 
 #: rhodecode/templates/base/root.html:54
-msgid "Show selected changesets __S -> __E"
+msgid "Search truncated"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:55
-msgid "Show selected changeset __S"
+msgid "No matching files"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:56
-msgid "Selection link"
-msgstr "选择链接"
+#: rhodecode/templates/changelog/changelog.html:51
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
+msgid "Open new pull request"
+msgstr "新建拉取请求"
 
 #: rhodecode/templates/base/root.html:57
-#: rhodecode/templates/changeset/diff_block.html:8
-msgid "Collapse diff"
-msgstr ""
+msgid "Open new pull request for selected changesets"
+msgstr "为选择的变更集创建新的拉取请求"
 
 #: rhodecode/templates/base/root.html:58
-msgid "Expand diff"
+msgid "Show selected changesets __S -> __E"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:59
+msgid "Show selected changeset __S"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:60
+msgid "Selection link"
+msgstr "选择链接"
+
+#: rhodecode/templates/base/root.html:61
+#: rhodecode/templates/changeset/diff_block.html:8
+msgid "Collapse diff"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:62
+msgid "Expand diff"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:63
 msgid "Failed to revoke permission"
 msgstr ""
 
+#: rhodecode/templates/base/root.html:64
+msgid "confirm to revoke permission for {0}: {1} ?"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:68
+msgid "specify changeset"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr "%s书签"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:26
-msgid "Compare bookmarks"
-msgstr ""
-
-#: rhodecode/templates/bookmarks/bookmarks.html:51
-#: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:50
-#: rhodecode/templates/branches/branches_data.html:8
+#: rhodecode/templates/bookmarks/bookmarks.html:29
+msgid "Compare Bookmarks"
+msgstr ""
+
+#: rhodecode/templates/bookmarks/bookmarks.html:55
+#: rhodecode/templates/bookmarks/bookmarks_data.html:10
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:10
 #: rhodecode/templates/changelog/changelog_summary_data.html:8
-#: rhodecode/templates/tags/tags.html:51
-#: rhodecode/templates/tags/tags_data.html:8
+#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/tags/tags_data.html:10
 msgid "Author"
 msgstr "作者"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:52
-#: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:51
-#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/bookmarks/bookmarks.html:56
+#: rhodecode/templates/bookmarks/bookmarks_data.html:12
+#: rhodecode/templates/branches/branches.html:55
+#: rhodecode/templates/branches/branches_data.html:12
 #: rhodecode/templates/changelog/changelog_summary_data.html:5
-#: rhodecode/templates/tags/tags.html:52
-#: rhodecode/templates/tags/tags_data.html:9
+#: rhodecode/templates/tags/tags.html:56
+#: rhodecode/templates/tags/tags_data.html:12
 msgid "Revision"
 msgstr "修订"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:54
-#: rhodecode/templates/bookmarks/bookmarks_data.html:10
-#: rhodecode/templates/branches/branches.html:53
-#: rhodecode/templates/branches/branches_data.html:10
-#: rhodecode/templates/tags/tags.html:54
-#: rhodecode/templates/tags/tags_data.html:10
-msgid "Compare"
-msgstr "比较显示"
-
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
 msgstr "%s分支"
 
-#: rhodecode/templates/branches/branches.html:26
-msgid "Compare branches"
-msgstr "比较分支"
+#: rhodecode/templates/branches/branches.html:29
+msgid "Compare Branches"
+msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr "%s修订记录"
 
-#: rhodecode/templates/changelog/changelog.html:19
+#: rhodecode/templates/changelog/changelog.html:21
 #, python-format
 msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
 msgstr[0] "显示%d/%d个版本"
 
-#: rhodecode/templates/changelog/changelog.html:39
+#: rhodecode/templates/changelog/changelog.html:43
 msgid "Clear selection"
 msgstr "清除选择"
 
-#: rhodecode/templates/changelog/changelog.html:42
+#: rhodecode/templates/changelog/changelog.html:47
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:42
-msgid "Compare fork with parent"
-msgstr "比较复刻和源版本库"
-
-#: rhodecode/templates/changelog/changelog.html:78
-#: rhodecode/templates/changelog/changelog_summary_data.html:28
-#, python-format
-msgid "Click to open associated pull request #%s"
-msgstr "点击建立相关的拉取请求 #%s"
-
-#: rhodecode/templates/changelog/changelog.html:102
-#: rhodecode/templates/summary/summary.html:403
-msgid "Show more"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changelog/changelog.html:49
+#, python-format
+msgid "Compare fork with Parent(%s)"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:56
+msgid "Show"
+msgstr "显示"
+
+#: rhodecode/templates/changelog/changelog.html:82
+#: rhodecode/templates/changelog/changelog_summary_data.html:19
+#, python-format
+msgid ""
+"Changeset status: %s\n"
+"Click to open associated pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:86
+#: rhodecode/templates/compare/compare_cs.html:18
+#, python-format
+msgid "Changeset status: %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:105
+#: rhodecode/templates/compare/compare_cs.html:36
+msgid "Expand commit message"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:114
+msgid "Changeset has comments"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:124
 #: rhodecode/templates/changelog/changelog_summary_data.html:50
-#: rhodecode/templates/changeset/changeset.html:107
-#: rhodecode/templates/changeset/changeset_range.html:86
+#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset_range.html:93
 #, python-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:121
+#: rhodecode/templates/changelog/changelog.html:130
 #: rhodecode/templates/changelog/changelog_summary_data.html:56
-#: rhodecode/templates/changeset/changeset.html:113
-#: rhodecode/templates/changeset/changeset_range.html:92
+#: rhodecode/templates/changeset/changeset.html:100
+#: rhodecode/templates/changeset/changeset_range.html:99
 #, python-format
 msgid "Tag %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:135
 #: rhodecode/templates/changelog/changelog_summary_data.html:61
-#: rhodecode/templates/changeset/changeset.html:117
-#: rhodecode/templates/changeset/changeset_range.html:96
+#: rhodecode/templates/changeset/changeset.html:105
+#: rhodecode/templates/changeset/changeset_range.html:103
 #, python-format
 msgid "Branch %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:286
+#: rhodecode/templates/changelog/changelog.html:299
 msgid "There are no changes yet"
 msgstr "没有任何变更"
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:91
+#: rhodecode/templates/changeset/changeset.html:76
 msgid "Removed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:92
+#: rhodecode/templates/changeset/changeset.html:77
 msgid "Changed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset.html:78
 msgid "Added"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:8
 #: rhodecode/templates/changelog/changelog_details.html:9
 #: rhodecode/templates/changelog/changelog_details.html:10
-#: rhodecode/templates/changeset/changeset.html:95
-#: rhodecode/templates/changeset/changeset.html:96
-#: rhodecode/templates/changeset/changeset.html:97
+#: rhodecode/templates/changeset/changeset.html:80
+#: rhodecode/templates/changeset/changeset.html:81
+#: rhodecode/templates/changeset/changeset.html:82
 #, python-format
 msgid "Affected %s files"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:6
-#: rhodecode/templates/files/files_add.html:75
-#: rhodecode/templates/files/files_edit.html:61
+#: rhodecode/templates/files/files_add.html:65
+#: rhodecode/templates/files/files_delete.html:53
 msgid "Commit message"
 msgstr ""
 
@@ -3689,10 +4694,9 @@
 msgstr "通过RhodeCode直接添加或者上传文件"
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:89
-#: rhodecode/templates/files/files_add.html:38
-#: rhodecode/templates/files/files_browser.html:31
-msgid "Add new file"
-msgstr "新建文件"
+#: rhodecode/templates/files/files_ypjax.html:9
+msgid "Add New File"
+msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:95
 msgid "Push new repo"
@@ -3707,178 +4711,200 @@
 msgid "%s Changeset"
 msgstr "%s修订集"
 
-#: rhodecode/templates/changeset/changeset.html:39
-msgid "No parents"
-msgstr "无父版本"
-
-#: rhodecode/templates/changeset/changeset.html:49
-msgid "No children"
-msgstr "无子对象"
-
-#: rhodecode/templates/changeset/changeset.html:62
-#: rhodecode/templates/changeset/changeset_file_comment.html:20
-#: rhodecode/templates/changeset/changeset_range.html:44
+#: rhodecode/templates/changeset/changeset.html:37
+msgid "parent rev."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:43
+msgid "child rev."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:51
+#: rhodecode/templates/changeset/changeset_file_comment.html:41
+#: rhodecode/templates/changeset/changeset_range.html:51
 msgid "Changeset status"
 msgstr "修订集状态"
 
+#: rhodecode/templates/changeset/changeset.html:55
+#: rhodecode/templates/changeset/diff_block.html:27
+#: rhodecode/templates/files/diff_2way.html:52
+msgid "Raw diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:58
+msgid "Patch diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:61
+#: rhodecode/templates/changeset/diff_block.html:30
+#: rhodecode/templates/files/diff_2way.html:55
+msgid "Download diff"
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset.html:67
-#: rhodecode/templates/changeset/diff_block.html:22
-msgid "Raw diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:68
-msgid "Patch diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:69
-#: rhodecode/templates/changeset/diff_block.html:23
-msgid "Download diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:103
+#: rhodecode/templates/changeset/changeset_file_comment.html:111
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d条评论"
 
-#: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:103
+#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:111
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
 msgstr[0] "(%d内嵌)"
 
-#: rhodecode/templates/changeset/changeset.html:103
-#: rhodecode/templates/changeset/changeset_range.html:82
+#: rhodecode/templates/changeset/changeset.html:88
+#: rhodecode/templates/changeset/changeset_range.html:89
 msgid "merge"
 msgstr "合并"
 
-#: rhodecode/templates/changeset/changeset.html:126
-#: rhodecode/templates/compare/compare_diff.html:40
-#: rhodecode/templates/pullrequests/pullrequest_show.html:113
+#: rhodecode/templates/changeset/changeset.html:124
+#: rhodecode/templates/compare/compare_diff.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:160
 #, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
 msgstr[0] "修改%s个文件"
 
-#: rhodecode/templates/changeset/changeset.html:128
-#: rhodecode/templates/compare/compare_diff.html:42
-#: rhodecode/templates/pullrequests/pullrequest_show.html:115
+#: rhodecode/templates/changeset/changeset.html:126
+#: rhodecode/templates/compare/compare_diff.html:59
+#: rhodecode/templates/pullrequests/pullrequest_show.html:162
 #, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
 msgstr[0] "修改%s个文件包括%s行插入和%s行删除"
 
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Showing a huge diff might take some time and resources"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Show full diff"
 msgstr ""
 
+#: rhodecode/templates/changeset/changeset.html:214
+#: rhodecode/templates/changeset/changeset.html:251
+msgid "no revisions"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:23
+#, python-format
+msgid "Vote on pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:25
+#, python-format
+msgid "Comment on pull request #%s"
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset_file_comment.html:30
-#, python-format
-msgid "Status change on pull request #%s"
+msgid "Status change on changeset"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:32
-#, python-format
-msgid "Comment on pull request #%s"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:55
+msgid "Comment on changeset"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:63
 msgid "Submitting..."
 msgstr "提交中……"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:58
+#: rhodecode/templates/changeset/changeset_file_comment.html:66
 msgid "Commenting on line {1}."
 msgstr "在{1}行上评论"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:59
-#: rhodecode/templates/changeset/changeset_file_comment.html:145
+#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:153
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
 msgstr "评论使用%s语法并支持%s"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:61
-#: rhodecode/templates/changeset/changeset_file_comment.html:147
+#: rhodecode/templates/changeset/changeset_file_comment.html:69
+#: rhodecode/templates/changeset/changeset_file_comment.html:155
 msgid ""
 "Use @username inside this text to send notification to this RhodeCode user"
 msgstr "在文本中使用 @用户名 以发送通知到该RhodeCode用户"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:65
-#: rhodecode/templates/changeset/changeset_file_comment.html:152
+#: rhodecode/templates/changeset/changeset_file_comment.html:73
+#: rhodecode/templates/changeset/changeset_file_comment.html:166
 msgid "Preview"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:72
-#: rhodecode/templates/changeset/changeset_file_comment.html:170
-msgid "Comment preview"
-msgstr ""
-
 #: rhodecode/templates/changeset/changeset_file_comment.html:80
-#: rhodecode/templates/changeset/changeset_file_comment.html:177
-#: rhodecode/templates/email_templates/changeset_comment.html:16
+#: rhodecode/templates/changeset/changeset_file_comment.html:189
+msgid "Comment preview"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:196
+#: rhodecode/templates/email_templates/changeset_comment.html:11
 #: rhodecode/templates/email_templates/pull_request_comment.html:16
 msgid "Comment"
 msgstr "评论"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:81
-msgid "Cancel"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:96
 msgid "You need to be logged in to comment."
 msgstr "必须登录才能评论"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:96
 msgid "Login now"
 msgstr "现在登陆"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:92
+#: rhodecode/templates/changeset/changeset_file_comment.html:100
 msgid "Hide"
 msgstr "隐藏"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:149
-msgid "Change status"
+#: rhodecode/templates/changeset/changeset_file_comment.html:159
+msgid "Vote for pull request status"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:161
+msgid "Change changeset status"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:179
-msgid "Comment and close"
-msgstr "评论并关闭"
+msgid "Close (when approved or rejected)"
+msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.html:5
 #, python-format
 msgid "%s Changesets"
 msgstr "%s修订集"
 
-#: rhodecode/templates/changeset/changeset_range.html:52
+#: rhodecode/templates/changeset/changeset_range.html:59
 msgid "Files affected"
 msgstr "影响文件"
 
 #: rhodecode/templates/changeset/diff_block.html:21
+#: rhodecode/templates/files/diff_2way.html:46
 msgid "Show full diff for this file"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:29
+#: rhodecode/templates/changeset/diff_block.html:24
+#: rhodecode/templates/changeset/diff_block.html:68
+#: rhodecode/templates/files/diff_2way.html:49
+msgid "Show full side-by-side diff for this file"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:38
 msgid "Show inline comments"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:53
+#: rhodecode/templates/changeset/diff_block.html:62
 msgid "Show file at latest version in this repo"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:54
+#: rhodecode/templates/changeset/diff_block.html:64
 msgid "Show file at initial version in this repo"
 msgstr ""
 
@@ -3886,81 +4912,78 @@
 msgid "No changesets"
 msgstr "无修订"
 
-#: rhodecode/templates/compare/compare_cs.html:32
+#: rhodecode/templates/compare/compare_cs.html:8
 msgid "Ancestor"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:5
+#: rhodecode/templates/compare/compare_diff.html:6
+#: rhodecode/templates/compare/compare_diff.html:8
 #, python-format
 msgid "%s Compare"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:9
+#: rhodecode/templates/compare/compare_diff.html:16
 msgid "Compare revisions"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:33
-#: rhodecode/templates/pullrequests/pullrequest_show.html:106
+#: rhodecode/templates/compare/compare_diff.html:36
+msgid "Swap"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:38
+msgid "Compare Revisions"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:45
+msgid "Compare revisions, branches, bookmarks or tags."
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:50
+#: rhodecode/templates/pullrequests/pullrequest_show.html:153
 #, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
 msgstr[0] "显示%s个提交"
 
-#: rhodecode/templates/compare/compare_diff.html:48
-#: rhodecode/templates/pullrequests/pullrequest_show.html:121
+#: rhodecode/templates/compare/compare_diff.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:168
 msgid "No files"
 msgstr "无文件"
 
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-msgid "confirm to show potentially huge diff"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.html:54
-#: rhodecode/templates/summary/summary.html:69
+#: rhodecode/templates/data_table/_dt_elements.html:63
 msgid "Mercurial repository"
 msgstr "Mercurial版本库"
 
-#: rhodecode/templates/data_table/_dt_elements.html:56
-#: rhodecode/templates/summary/summary.html:72
+#: rhodecode/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr "Git版本库"
 
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#, python-format
-msgid "Fork of %s"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.html:88
+#: rhodecode/templates/data_table/_dt_elements.html:72
+msgid "Public repository"
+msgstr "公共版本库"
+
+#: rhodecode/templates/data_table/_dt_elements.html:82
+msgid "Repository creating in progress..."
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr "无修订"
 
-#: rhodecode/templates/data_table/_dt_elements.html:95
-#: rhodecode/templates/data_table/_dt_elements.html:97
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "订阅%s的RSS"
 
-#: rhodecode/templates/data_table/_dt_elements.html:103
-#: rhodecode/templates/data_table/_dt_elements.html:105
+#: rhodecode/templates/data_table/_dt_elements.html:111
+#: rhodecode/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "订阅%s的Atom"
 
-#: rhodecode/templates/data_table/_dt_elements.html:122
-#, python-format
-msgid "Confirm to delete this repository: %s"
-msgstr "确认删除版本库：%s"
-
-#: rhodecode/templates/data_table/_dt_elements.html:137
-#, python-format
-msgid "Confirm to delete this user: %s"
-msgstr "确认删除用户：%s"
-
-#: rhodecode/templates/email_templates/changeset_comment.html:4
-#: rhodecode/templates/email_templates/pull_request.html:4
-#: rhodecode/templates/email_templates/pull_request_comment.html:4
-msgid "URL"
+#: rhodecode/templates/data_table/_dt_elements.html:141
+msgid "Creating"
 msgstr ""
 
 #: rhodecode/templates/email_templates/changeset_comment.html:6
@@ -3968,7 +4991,7 @@
 msgid "%s commented on a %s changeset."
 msgstr ""
 
-#: rhodecode/templates/email_templates/changeset_comment.html:14
+#: rhodecode/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
 msgstr ""
 
@@ -4000,9 +5023,9 @@
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:8
-#: rhodecode/templates/pullrequests/pullrequest.html:34
+#: rhodecode/templates/pullrequests/pullrequest.html:31
 #: rhodecode/templates/pullrequests/pullrequest_data.html:14
-#: rhodecode/templates/pullrequests/pullrequest_show.html:25
+#: rhodecode/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr "标题"
 
@@ -4023,76 +5046,84 @@
 msgid "View this user here"
 msgstr "查看用户"
 
-#: rhodecode/templates/errors/error_document.html:55
+#: rhodecode/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr "重定向到%s，于%s秒后"
 
+#: rhodecode/templates/files/diff_2way.html:15
+#, python-format
+msgid "%s File side-by-side diff"
+msgstr ""
+
+#: rhodecode/templates/files/diff_2way.html:22
+#: rhodecode/templates/files/file_diff.html:11
+msgid "File diff"
+msgstr "文件差异"
+
+#: rhodecode/templates/files/diff_2way.html:58
+msgid "ignore white space"
+msgstr ""
+
+#: rhodecode/templates/files/diff_2way.html:59
+msgid "turn on edit mode"
+msgstr ""
+
 #: rhodecode/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr ""
 
-#: rhodecode/templates/files/file_diff.html:8
-msgid "File diff"
-msgstr "文件差异"
-
 #: rhodecode/templates/files/files.html:4
-#: rhodecode/templates/files/files.html:76
+#: rhodecode/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr ""
 
-#: rhodecode/templates/files/files.html:30
-#: rhodecode/templates/files/files_add.html:31
-#: rhodecode/templates/files/files_edit.html:31
-msgid "Branch"
-msgstr ""
-
 #: rhodecode/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:19
-msgid "Add file"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.html:43
-msgid "File Name"
-msgstr "文件名"
-
-#: rhodecode/templates/files/files_add.html:47
-#: rhodecode/templates/files/files_add.html:56
-msgid "or"
-msgstr "或者"
-
-#: rhodecode/templates/files/files_add.html:47
-#: rhodecode/templates/files/files_add.html:52
-msgid "Upload file"
-msgstr "上传文件"
-
-#: rhodecode/templates/files/files_add.html:56
-msgid "Create new file"
-msgstr "创建新文件"
-
-#: rhodecode/templates/files/files_add.html:61
-#: rhodecode/templates/files/files_edit.html:37
+#: rhodecode/templates/files/files_add.html:25
+msgid "Add new file"
+msgstr "新建文件"
+
+#: rhodecode/templates/files/files_add.html:45
+#: rhodecode/templates/files/files_edit.html:43
 #: rhodecode/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "位置"
 
-#: rhodecode/templates/files/files_add.html:65
-msgid "use / to separate directories"
-msgstr "使用 / 目录分隔符"
-
-#: rhodecode/templates/files/files_add.html:79
-#: rhodecode/templates/files/files_edit.html:65
+#: rhodecode/templates/files/files_add.html:47
+msgid "Enter filename..."
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:49
+#: rhodecode/templates/files/files_add.html:53
+msgid "or"
+msgstr "或者"
+
+#: rhodecode/templates/files/files_add.html:49
+msgid "Upload File"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:53
+msgid "Create New File"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:58
+msgid "New file mode"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:69
+#: rhodecode/templates/files/files_delete.html:57
+#: rhodecode/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr "提交修改"
 
 #: rhodecode/templates/files/files_browser.html:13
-msgid "View"
+msgid "revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:14
@@ -4103,114 +5134,128 @@
 msgid "Next revision"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:23
+#: rhodecode/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:27
-msgid "Search file list"
-msgstr ""
-
-#: rhodecode/templates/files/files_browser.html:35
+#: rhodecode/templates/files/files_browser.html:25
+msgid "Search File List"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr "加载文件列表..."
 
-#: rhodecode/templates/files/files_browser.html:48
+#: rhodecode/templates/files/files_browser.html:42
 msgid "Size"
 msgstr "大小"
 
-#: rhodecode/templates/files/files_browser.html:49
+#: rhodecode/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr "MIME类型"
 
-#: rhodecode/templates/files/files_browser.html:50
+#: rhodecode/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr "最后修订号"
 
-#: rhodecode/templates/files/files_browser.html:51
+#: rhodecode/templates/files/files_browser.html:45
 msgid "Last modified"
 msgstr "最后修改于"
 
-#: rhodecode/templates/files/files_browser.html:52
+#: rhodecode/templates/files/files_browser.html:46
 msgid "Last committer"
 msgstr "最后提交者"
 
+#: rhodecode/templates/files/files_delete.html:4
+#, python-format
+msgid "%s Files Delete"
+msgstr ""
+
+#: rhodecode/templates/files/files_delete.html:25
+#: rhodecode/templates/files/files_delete.html:45
+msgid "Delete file"
+msgstr ""
+
 #: rhodecode/templates/files/files_edit.html:4
 #, python-format
-msgid "%s Files Edit"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:19
+msgid "%s File Edit"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:25
 msgid "Edit file"
 msgstr ""
 
-#: rhodecode/templates/files/files_edit.html:47
-#: rhodecode/templates/files/files_source.html:23
-msgid "Show annotation"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:26
-msgid "Download as raw"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:52
+#: rhodecode/templates/files/files_edit.html:53
+#: rhodecode/templates/files/files_source.html:32
+msgid "Show Annotation"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:55
+#: rhodecode/templates/files/files_source.html:35
+msgid "Download as Raw"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:58
 msgid "Source"
 msgstr ""
 
-#: rhodecode/templates/files/files_edit.html:57
+#: rhodecode/templates/files/files_edit.html:63
 msgid "Editing file"
 msgstr "编辑文件"
 
+#: rhodecode/templates/files/files_edit.html:68
+msgid "Commit Message"
+msgstr ""
+
 #: rhodecode/templates/files/files_history_box.html:2
-msgid "History"
-msgstr "历史"
-
-#: rhodecode/templates/files/files_history_box.html:9
-msgid "Diff to revision"
-msgstr ""
-
-#: rhodecode/templates/files/files_history_box.html:10
-msgid "Show at revision"
-msgstr ""
-
-#: rhodecode/templates/files/files_history_box.html:11
-msgid "Show full history"
-msgstr ""
-
-#: rhodecode/templates/files/files_history_box.html:16
 #, python-format
 msgid "%s author"
 msgid_plural "%s authors"
 msgstr[0] "%s个作者"
 
-#: rhodecode/templates/files/files_source.html:6
-msgid "Load file history"
-msgstr "加载文件历史记录..."
-
-#: rhodecode/templates/files/files_source.html:21
-msgid "Show source"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.html:29
-#, python-format
-msgid "Edit on branch:%s"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.html:31
-msgid "Edit on branch:?"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.html:31
+#: rhodecode/templates/files/files_source.html:7
+msgid "Diff to Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:8
+msgid "Show at Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:10
+msgid "Show Full History"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:11
+msgid "Show Authors"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:30
+msgid "Show Source"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:38
+#, python-format
+msgid "Edit on Branch:%s"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:41
+msgid "Editing binary files not allowed"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:44
 msgid "Editing files allowed only when on branch head revision"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:46
+#: rhodecode/templates/files/files_source.html:45
+msgid "Deleting files allowed only when on branch head revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:61
 #, python-format
 msgid "Binary file (%s)"
 msgstr "二进制文件（%s）"
 
-#: rhodecode/templates/files/files_source.html:55
+#: rhodecode/templates/files/files_source.html:71
 msgid "File is too big to display"
 msgstr "文件过大，不能显示"
 
@@ -4218,11 +5263,11 @@
 msgid "annotation"
 msgstr "显示注释"
 
-#: rhodecode/templates/files/files_ypjax.html:15
-msgid "Go back"
-msgstr "返回"
-
-#: rhodecode/templates/files/files_ypjax.html:16
+#: rhodecode/templates/files/files_ypjax.html:23
+msgid "Go Back"
+msgstr ""
+
+#: rhodecode/templates/files/files_ypjax.html:24
 msgid "No files at given path"
 msgstr "指定的路径中没有文件"
 
@@ -4231,9 +5276,9 @@
 msgid "%s Followers"
 msgstr "%s个关注者"
 
-#: rhodecode/templates/followers/followers.html:9
-#: rhodecode/templates/summary/summary.html:183
-#: rhodecode/templates/summary/summary.html:184
+#: rhodecode/templates/followers/followers.html:12
+#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/templates/summary/summary.html:150
 msgid "Followers"
 msgstr "关注者"
 
@@ -4243,35 +5288,35 @@
 
 #: rhodecode/templates/forks/fork.html:5
 #, python-format
-msgid "%s Fork"
-msgstr "%s的复刻"
-
-#: rhodecode/templates/forks/fork.html:28
+msgid "Fork repository %s"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:30
 msgid "Fork name"
 msgstr "复刻名称"
 
-#: rhodecode/templates/forks/fork.html:65
+#: rhodecode/templates/forks/fork.html:71
 msgid "Private"
 msgstr "私有"
 
-#: rhodecode/templates/forks/fork.html:74
+#: rhodecode/templates/forks/fork.html:80
 msgid "Copy permissions"
 msgstr "拷贝权限"
 
-#: rhodecode/templates/forks/fork.html:78
+#: rhodecode/templates/forks/fork.html:84
 msgid "Copy permissions from forked repository"
 msgstr "从被复刻版本库拷贝权限"
 
-#: rhodecode/templates/forks/fork.html:84
+#: rhodecode/templates/forks/fork.html:90
 msgid "Update after clone"
 msgstr "克隆后更新"
 
-#: rhodecode/templates/forks/fork.html:88
+#: rhodecode/templates/forks/fork.html:94
 msgid "Checkout source after making a clone"
 msgstr "完成克隆后检出源代码"
 
-#: rhodecode/templates/forks/fork.html:93
-msgid "Fork this repository"
+#: rhodecode/templates/forks/fork.html:99
+msgid "Fork this Repository"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.html:5
@@ -4279,9 +5324,9 @@
 msgid "%s Forks"
 msgstr "%s个复刻"
 
-#: rhodecode/templates/forks/forks.html:9
-#: rhodecode/templates/summary/summary.html:189
-#: rhodecode/templates/summary/summary.html:190
+#: rhodecode/templates/forks/forks.html:12
+#: rhodecode/templates/summary/summary.html:155
+#: rhodecode/templates/summary/summary.html:156
 msgid "Forks"
 msgstr "复刻"
 
@@ -4293,41 +5338,32 @@
 msgid "There are no forks yet"
 msgstr "无复刻"
 
-#: rhodecode/templates/journal/journal.html:21
+#: rhodecode/templates/journal/journal.html:24
 msgid "ATOM journal feed"
 msgstr "订阅日志ATOM"
 
-#: rhodecode/templates/journal/journal.html:22
+#: rhodecode/templates/journal/journal.html:25
 msgid "RSS journal feed"
 msgstr "订阅日志RSS"
 
-#: rhodecode/templates/journal/journal.html:32
-msgid "Refresh"
-msgstr "刷新"
-
-#: rhodecode/templates/journal/journal.html:35
-#: rhodecode/templates/journal/public_journal.html:24
-msgid "ATOM feed"
-msgstr "订阅ATOM"
-
-#: rhodecode/templates/journal/journal.html:51
-msgid "Watched"
-msgstr "关注的"
+#: rhodecode/templates/journal/journal.html:57
+msgid "My repos"
+msgstr "我的版本库"
 
 #: rhodecode/templates/journal/journal_data.html:55
 msgid "No entries yet"
 msgstr "没有条目"
 
 #: rhodecode/templates/journal/public_journal.html:4
-#: rhodecode/templates/journal/public_journal.html:21
+#: rhodecode/templates/journal/public_journal.html:24
 msgid "Public Journal"
 msgstr "公共日志"
 
-#: rhodecode/templates/journal/public_journal.html:13
+#: rhodecode/templates/journal/public_journal.html:16
 msgid "ATOM public journal feed"
 msgstr "订阅公共日志ATOM"
 
-#: rhodecode/templates/journal/public_journal.html:14
+#: rhodecode/templates/journal/public_journal.html:17
 msgid "RSS public journal feed"
 msgstr "订阅公共日志RSS"
 
@@ -4336,46 +5372,42 @@
 msgid "New pull request"
 msgstr "新建拉取请求"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:25
-msgid "Create new pull request"
-msgstr "创建新的拉取请求"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:47
+#: rhodecode/templates/pullrequests/pullrequest.html:44
 msgid "Write a short description on this pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:53
+#: rhodecode/templates/pullrequests/pullrequest.html:50
 msgid "Changeset flow"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:60
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+#: rhodecode/templates/pullrequests/pullrequest.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:68
 msgid "Origin repository"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:85
-msgid "Send pull request"
-msgstr "发送拉取请求"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:94
-#: rhodecode/templates/pullrequests/pullrequest_show.html:137
+#: rhodecode/templates/pullrequests/pullrequest.html:82
+msgid "Send Pull Request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:91
+#: rhodecode/templates/pullrequests/pullrequest_show.html:104
 msgid "Pull request reviewers"
 msgstr "拉取请求检视人员"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:103
-#: rhodecode/templates/pullrequests/pullrequest_show.html:149
+#: rhodecode/templates/pullrequests/pullrequest.html:100
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
 msgid "owner"
 msgstr "所有者"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:115
+#: rhodecode/templates/pullrequests/pullrequest.html:114
 msgid "Add reviewer to this pull request."
 msgstr "为这个拉取请求增加检视人员"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:129
+#: rhodecode/templates/pullrequests/pullrequest.html:128
 msgid "Detailed compare view"
 msgstr "详细比较显示"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:150
+#: rhodecode/templates/pullrequests/pullrequest.html:149
 msgid "Destination repository"
 msgstr ""
 
@@ -4384,79 +5416,110 @@
 msgid "%s Pull Request #%s"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:35
+#: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Review status"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:40
-msgid "Pull request status"
-msgstr "拉取请求状态"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:53
+#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:43
+msgid "Pull request status calculated from votes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:56
 msgid "Still not reviewed by"
 msgstr "还未检视的检视人员"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:60
 #, python-format
 msgid "%d reviewer"
 msgid_plural "%d reviewers"
 msgstr[0] "%d个检视者"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:59
+#: rhodecode/templates/pullrequests/pullrequest_show.html:62
 msgid "Pull request was reviewed by all reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:89
-msgid "Created on"
-msgstr "创建于"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:102
+#: rhodecode/templates/pullrequests/pullrequest_show.html:77
+#: rhodecode/templates/pullrequests/pullrequest_show.html:79
+msgid "Pull changes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
+msgid "reviewer"
+msgstr "检视者"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:133
+msgid "Add or remove reviewer to this pull request."
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:137
+msgid "Save Changes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "Compare view"
 msgstr "比较显示"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:149
-msgid "reviewer"
-msgstr "检视者"
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:164
-msgid "Add or remove reviewer to this pull request."
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:168
-msgid "Save changes"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
 #, python-format
 msgid "%s Pull Requests"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
+#, python-format
+msgid "Pull requests from %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:14
+#, python-format
+msgid "Pull requests to %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:38
+#, python-format
+msgid "Show pull requests to %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:40
+#, python-format
+msgid "Show pull requests from %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:50
+msgid "Hide closed pull requests"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:52
+msgid "Show closed pull requests too"
+msgstr ""
+
 #: rhodecode/templates/search/search.html:6
-msgid "Search repository"
+#, python-format
+msgid "%s Search"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:8
-#: rhodecode/templates/search/search.html:16
+#: rhodecode/templates/search/search.html:19
 msgid "Search in all repositories"
 msgstr "在所有的版本库中搜索"
 
-#: rhodecode/templates/search/search.html:50
+#: rhodecode/templates/search/search.html:53
 msgid "Search term"
 msgstr "搜索短语"
 
-#: rhodecode/templates/search/search.html:62
+#: rhodecode/templates/search/search.html:65
 msgid "Search in"
 msgstr "搜索范围"
 
-#: rhodecode/templates/search/search.html:65
+#: rhodecode/templates/search/search.html:68
 msgid "File contents"
 msgstr "文件内容"
 
-#: rhodecode/templates/search/search.html:66
+#: rhodecode/templates/search/search.html:69
 msgid "Commit messages"
 msgstr "提交信息"
 
-#: rhodecode/templates/search/search.html:67
+#: rhodecode/templates/search/search.html:70
 msgid "File names"
 msgstr "文件名"
 
@@ -4466,6 +5529,75 @@
 msgid "Permission denied"
 msgstr "权限不足"
 
+#: rhodecode/templates/summary/statistics.html:4
+#, python-format
+msgid "%s Statistics"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:19
+#: rhodecode/templates/summary/summary.html:42
+#, python-format
+msgid "%s ATOM feed"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:20
+#: rhodecode/templates/summary/summary.html:43
+#, python-format
+msgid "%s RSS feed"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:39
+#: rhodecode/templates/summary/summary.html:107
+#: rhodecode/templates/summary/summary.html:123
+msgid "Enable"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:42
+msgid "Stats gathered: "
+msgstr "已收集的统计："
+
+#: rhodecode/templates/summary/statistics.html:91
+#: rhodecode/templates/summary/summary.html:354
+msgid "files"
+msgstr "文件"
+
+#: rhodecode/templates/summary/statistics.html:115
+#: rhodecode/templates/summary/summary.html:378
+msgid "Show more"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:392
+msgid "commits"
+msgstr "提交"
+
+#: rhodecode/templates/summary/statistics.html:393
+msgid "files added"
+msgstr "文件已添加"
+
+#: rhodecode/templates/summary/statistics.html:394
+msgid "files changed"
+msgstr "文件已更改"
+
+#: rhodecode/templates/summary/statistics.html:395
+msgid "files removed"
+msgstr "文件已删除"
+
+#: rhodecode/templates/summary/statistics.html:397
+msgid "commit"
+msgstr "提交"
+
+#: rhodecode/templates/summary/statistics.html:398
+msgid "file added"
+msgstr "文件已添加"
+
+#: rhodecode/templates/summary/statistics.html:399
+msgid "file changed"
+msgstr "文件已更改"
+
+#: rhodecode/templates/summary/statistics.html:400
+msgid "file removed"
+msgstr "文件已删除"
+
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
 msgid "%s Summary"
@@ -4473,170 +5605,85 @@
 
 #: rhodecode/templates/summary/summary.html:16
 #, python-format
-msgid "%s ATOM feed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:17
-#, python-format
-msgid "%s RSS feed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:62
-#, python-format
 msgid "Repository locked by %s"
 msgstr "版本库由%s锁定"
 
-#: rhodecode/templates/summary/summary.html:64
+#: rhodecode/templates/summary/summary.html:18
 msgid "Repository unlocked"
 msgstr "版本库未锁定"
 
-#: rhodecode/templates/summary/summary.html:83
-#, python-format
-msgid "Non changable ID %s"
-msgstr "不可变ID %s"
-
-#: rhodecode/templates/summary/summary.html:88
-msgid "Public"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:88
-#: rhodecode/templates/summary/summary.html:89
-msgid "Fork of"
-msgstr "复刻自"
-
-#: rhodecode/templates/summary/summary.html:97
-msgid "Remote clone"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:117
-msgid "Contact"
-msgstr "联系方式"
-
-#: rhodecode/templates/summary/summary.html:131
+#: rhodecode/templates/summary/summary.html:76
 msgid "Clone url"
 msgstr "克隆地址"
 
-#: rhodecode/templates/summary/summary.html:136
+#: rhodecode/templates/summary/summary.html:81
 msgid "Show by Name"
 msgstr "以名字显示"
 
-#: rhodecode/templates/summary/summary.html:137
+#: rhodecode/templates/summary/summary.html:82
 msgid "Show by ID"
 msgstr "按ID显示"
 
-#: rhodecode/templates/summary/summary.html:143
+#: rhodecode/templates/summary/summary.html:99
 msgid "Trending files"
 msgstr "文件趋势图"
 
-#: rhodecode/templates/summary/summary.html:151
-#: rhodecode/templates/summary/summary.html:167
-msgid "Enable"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:159
+#: rhodecode/templates/summary/summary.html:115
 msgid "Download"
 msgstr "下载"
 
-#: rhodecode/templates/summary/summary.html:163
+#: rhodecode/templates/summary/summary.html:119
 msgid "There are no downloads yet"
 msgstr "无下载"
 
-#: rhodecode/templates/summary/summary.html:165
+#: rhodecode/templates/summary/summary.html:121
 msgid "Downloads are disabled for this repository"
 msgstr "这个版本库的下载已经禁用"
 
-#: rhodecode/templates/summary/summary.html:170
+#: rhodecode/templates/summary/summary.html:127
 msgid "Download as zip"
 msgstr "zip打包下载"
 
-#: rhodecode/templates/summary/summary.html:174
+#: rhodecode/templates/summary/summary.html:132
 msgid "Check this to download archive with subrepos"
 msgstr "勾选以下载包含子版本库的压缩包"
 
-#: rhodecode/templates/summary/summary.html:174
+#: rhodecode/templates/summary/summary.html:132
 msgid "with subrepos"
 msgstr "包括子版本库"
 
-#: rhodecode/templates/summary/summary.html:197
+#: rhodecode/templates/summary/summary.html:163
 msgid "Repository Size"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:204
-#: rhodecode/templates/summary/summary.html:206
+#: rhodecode/templates/summary/summary.html:170
+#: rhodecode/templates/summary/summary.html:172
 msgid "Feed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:224
-msgid "Commit activity by day / author"
-msgstr "按日期或作者的提交活动"
-
-#: rhodecode/templates/summary/summary.html:232
-msgid "enable"
-msgstr "启用"
-
-#: rhodecode/templates/summary/summary.html:235
-msgid "Stats gathered: "
-msgstr "已收集的统计："
-
-#: rhodecode/templates/summary/summary.html:256
+#: rhodecode/templates/summary/summary.html:193
 msgid "Latest changes"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:258
+#: rhodecode/templates/summary/summary.html:195
 msgid "Quick start"
 msgstr "快速入门"
 
-#: rhodecode/templates/summary/summary.html:272
-#, python-format
-msgid "Readme file from revision %s"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:332
+#: rhodecode/templates/summary/summary.html:209
+#, python-format
+msgid "Readme file from revision %s:%s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:299
 #, python-format
 msgid "Download %s as %s"
 msgstr "下载%s为%s包"
 
-#: rhodecode/templates/summary/summary.html:379
-msgid "files"
-msgstr "文件"
-
-#: rhodecode/templates/summary/summary.html:689
-msgid "commits"
-msgstr "提交"
-
-#: rhodecode/templates/summary/summary.html:690
-msgid "files added"
-msgstr "文件已添加"
-
-#: rhodecode/templates/summary/summary.html:691
-msgid "files changed"
-msgstr "文件已更改"
-
-#: rhodecode/templates/summary/summary.html:692
-msgid "files removed"
-msgstr "文件已删除"
-
-#: rhodecode/templates/summary/summary.html:694
-msgid "commit"
-msgstr "提交"
-
-#: rhodecode/templates/summary/summary.html:695
-msgid "file added"
-msgstr "文件已添加"
-
-#: rhodecode/templates/summary/summary.html:696
-msgid "file changed"
-msgstr "文件已更改"
-
-#: rhodecode/templates/summary/summary.html:697
-msgid "file removed"
-msgstr "文件已删除"
-
 #: rhodecode/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr "%s标签"
 
-#: rhodecode/templates/tags/tags.html:26
+#: rhodecode/templates/tags/tags.html:29
 msgid "Compare tags"
 msgstr "比较标签"
--- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po	Wed Jul 02 19:03:19 2014 -0400
+++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po	Wed Jul 02 19:03:20 2014 -0400
@@ -1,14 +1,14 @@
 # Translations template for RhodeCode.
-# Copyright (C) 2013 Marcin Kuzminski RhodeCode
+# Copyright (C) 2014 RhodeCode GmbH
 # This file is distributed under the same license as the RhodeCode project.
 # Translators:
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: RhodeCode\n"
-"Report-Msgid-Bugs-To: marcin@maq.io\n"
-"POT-Creation-Date: 2013-06-05 19:55+0200\n"
-"PO-Revision-Date: 2013-06-02 13:23+0000\n"
+"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
+"POT-Creation-Date: 2014-02-13 15:30+0100\n"
+"PO-Revision-Date: 2014-02-13 14:34+0000\n"
 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/RhodeCode/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -18,1291 +18,1638 @@
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: rhodecode/controllers/changelog.py:149
+#: rhodecode/controllers/changelog.py:88 rhodecode/controllers/compare.py:88
+#: rhodecode/controllers/pullrequests.py:263
+msgid "There are no changesets yet"
+msgstr ""
+
+#: rhodecode/controllers/changelog.py:184
 msgid "All Branches"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:84
+#: rhodecode/controllers/changelog.py:187
+msgid "(closed)"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:85
 msgid "Show white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
+#: rhodecode/controllers/changeset.py:92 rhodecode/controllers/changeset.py:99
 msgid "Ignore white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:164
-#, python-format
-msgid "%s line context"
-msgstr ""
-
-#: rhodecode/controllers/changeset.py:345
-#: rhodecode/controllers/pullrequests.py:478
+#: rhodecode/controllers/changeset.py:165
+#, python-format
+msgid "increase diff context to %(num)s lines"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:207 rhodecode/controllers/files.py:96
+#: rhodecode/controllers/files.py:119
+msgid "Such revision does not exist for this repository"
+msgstr ""
+
+#: rhodecode/controllers/changeset.py:353
+#: rhodecode/controllers/pullrequests.py:480
 #, python-format
 msgid "Status change -> %s"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:376
+#: rhodecode/controllers/changeset.py:384
 msgid ""
 "Changing status on a changeset associated with a closed pull request is not "
 "allowed"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:74
-#: rhodecode/controllers/pullrequests.py:256
-msgid "There are no changesets yet"
-msgstr ""
-
-#: rhodecode/controllers/error.py:69
+#: rhodecode/controllers/compare.py:192 rhodecode/templates/base/root.html:67
+msgid "Select changeset"
+msgstr ""
+
+#: rhodecode/controllers/error.py:70
 msgid "Home page"
 msgstr "首頁"
 
-#: rhodecode/controllers/error.py:98
+#: rhodecode/controllers/error.py:99
 msgid ""
 "The request could not be understood by the server due to malformed syntax."
 msgstr ""
 
-#: rhodecode/controllers/error.py:101
+#: rhodecode/controllers/error.py:102
 msgid "Unauthorized access to resource"
 msgstr ""
 
-#: rhodecode/controllers/error.py:103
+#: rhodecode/controllers/error.py:104
 msgid "You don't have permission to view this page"
 msgstr "您沒有權限瀏覽這個頁面"
 
-#: rhodecode/controllers/error.py:105
+#: rhodecode/controllers/error.py:106
 msgid "The resource could not be found"
 msgstr "找不到這個資源"
 
-#: rhodecode/controllers/error.py:107
+#: rhodecode/controllers/error.py:108
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr ""
 
-#: rhodecode/controllers/feed.py:52
+#: rhodecode/controllers/feed.py:53
 #, python-format
 msgid "Changes on %s repository"
 msgstr "修改於版本庫 %s"
 
-#: rhodecode/controllers/feed.py:53
+#: rhodecode/controllers/feed.py:54
 #, python-format
 msgid "%s %s feed"
 msgstr ""
 
-#: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/controllers/feed.py:87
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Changeset was too big and was cut off..."
 msgstr ""
 
-#: rhodecode/controllers/feed.py:90
+#: rhodecode/controllers/feed.py:91
 #, python-format
 msgid "%s committed on %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:89
-msgid "Click here to add new file"
-msgstr ""
-
 #: rhodecode/controllers/files.py:90
-#, python-format
-msgid "There are no files yet %s"
-msgstr ""
-
-#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339
+msgid "Click here to add new file"
+msgstr ""
+
+#: rhodecode/controllers/files.py:91
+#, python-format
+msgid "There are no files yet. %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:299 rhodecode/controllers/files.py:359
+#: rhodecode/controllers/files.py:426
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:283
+#: rhodecode/controllers/files.py:311
+msgid "You can only delete files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:322
+#, python-format
+msgid "Deleted file %s via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:344
+#, python-format
+msgid "Successfully deleted file %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:348 rhodecode/controllers/files.py:414
+#: rhodecode/controllers/files.py:496
+msgid "Error occurred during commit"
+msgstr ""
+
+#: rhodecode/controllers/files.py:371
 msgid "You can only edit files with revision being a valid branch "
 msgstr ""
 
-#: rhodecode/controllers/files.py:297
+#: rhodecode/controllers/files.py:385
 #, python-format
 msgid "Edited file %s via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:313
+#: rhodecode/controllers/files.py:401
 msgid "No changes"
 msgstr "沒有修改"
 
-#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394
+#: rhodecode/controllers/files.py:410 rhodecode/controllers/files.py:485
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "成功遞交至 %s"
 
-#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405
-msgid "Error occurred during commit"
-msgstr ""
-
-#: rhodecode/controllers/files.py:351
+#: rhodecode/controllers/files.py:438
 msgid "Added file via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:368
+#: rhodecode/controllers/files.py:459
 msgid "No content"
 msgstr ""
 
-#: rhodecode/controllers/files.py:372
+#: rhodecode/controllers/files.py:463
 msgid "No filename"
 msgstr ""
 
-#: rhodecode/controllers/files.py:397
+#: rhodecode/controllers/files.py:488
 msgid "Location must be relative path and must not contain .. in path"
 msgstr ""
 
-#: rhodecode/controllers/files.py:431
+#: rhodecode/controllers/files.py:522
 msgid "Downloads disabled"
 msgstr ""
 
-#: rhodecode/controllers/files.py:442
+#: rhodecode/controllers/files.py:533
 #, python-format
 msgid "Unknown revision %s"
 msgstr "未知修訂 %s"
 
-#: rhodecode/controllers/files.py:444
+#: rhodecode/controllers/files.py:535
 msgid "Empty repository"
 msgstr "空的版本庫"
 
-#: rhodecode/controllers/files.py:446
+#: rhodecode/controllers/files.py:537
 msgid "Unknown archive type"
 msgstr "未知的存檔類型"
 
-#: rhodecode/controllers/files.py:631
-#: rhodecode/templates/changeset/changeset_range.html:9
+#: rhodecode/controllers/files.py:773
+#: rhodecode/templates/changeset/changeset_range.html:12
 #: rhodecode/templates/email_templates/pull_request.html:12
-#: rhodecode/templates/pullrequests/pullrequest.html:124
+#: rhodecode/templates/pullrequests/pullrequest.html:123
 msgid "Changesets"
 msgstr "變更"
 
-#: rhodecode/controllers/files.py:632
-#: rhodecode/controllers/pullrequests.py:149
-#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682
+#: rhodecode/controllers/files.py:774
+#: rhodecode/controllers/pullrequests.py:158
+#: rhodecode/controllers/summary.py:74 rhodecode/model/scm.py:816
 #: rhodecode/templates/switch_to_list.html:3
-#: rhodecode/templates/branches/branches.html:10
+#: rhodecode/templates/branches/branches.html:13
 msgid "Branches"
 msgstr "分支"
 
-#: rhodecode/controllers/files.py:633
-#: rhodecode/controllers/pullrequests.py:150
-#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693
-#: rhodecode/templates/switch_to_list.html:15
-#: rhodecode/templates/tags/tags.html:10
+#: rhodecode/controllers/files.py:775
+#: rhodecode/controllers/pullrequests.py:159
+#: rhodecode/controllers/summary.py:75 rhodecode/model/scm.py:827
+#: rhodecode/templates/switch_to_list.html:25
+#: rhodecode/templates/tags/tags.html:13
 msgid "Tags"
 msgstr "標籤"
 
-#: rhodecode/controllers/forks.py:176
-#, python-format
-msgid "Forked repository %s as %s"
-msgstr ""
-
-#: rhodecode/controllers/forks.py:190
+#: rhodecode/controllers/forks.py:189
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153
+#: rhodecode/controllers/home.py:81
+msgid "Groups"
+msgstr ""
+
+#: rhodecode/controllers/home.py:86
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:106
+#: rhodecode/templates/admin/repos/repo_add.html:15
+#: rhodecode/templates/admin/repos/repo_add.html:19
+#: rhodecode/templates/admin/users/user_edit_advanced.html:6
+#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:87
+#: rhodecode/templates/base/base.html:136
+#: rhodecode/templates/base/base.html:389
+#: rhodecode/templates/base/base.html:560
+msgid "Repositories"
+msgstr "版本庫"
+
+#: rhodecode/controllers/home.py:127 rhodecode/templates/files/files.html:33
+#: rhodecode/templates/files/files_add.html:37
+#: rhodecode/templates/files/files_delete.html:37
+#: rhodecode/templates/files/files_edit.html:37
+msgid "Branch"
+msgstr ""
+
+#: rhodecode/controllers/home.py:133
+msgid "Tag"
+msgstr ""
+
+#: rhodecode/controllers/home.py:139
+msgid "Bookmark"
+msgstr ""
+
+#: rhodecode/controllers/journal.py:112 rhodecode/controllers/journal.py:155
 msgid "public journal"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157
-#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/controllers/journal.py:116 rhodecode/controllers/journal.py:159
+#: rhodecode/templates/journal/journal.html:15
 msgid "journal"
 msgstr "日誌"
 
-#: rhodecode/controllers/login.py:138
+#: rhodecode/controllers/login.py:185 rhodecode/controllers/login.py:230
+msgid "bad captcha"
+msgstr ""
+
+#: rhodecode/controllers/login.py:191
 msgid "You have successfully registered into RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/login.py:159
+#: rhodecode/controllers/login.py:235
 msgid "Your password reset link was sent"
 msgstr "您的密碼重設連結已寄出"
 
-#: rhodecode/controllers/login.py:179
+#: rhodecode/controllers/login.py:255
 msgid ""
 "Your password reset was successful, new password has been sent to your email"
 msgstr "您的密碼重設動作已完成，新的密碼已寄至您的信箱"
 
-#: rhodecode/controllers/pullrequests.py:136
-#: rhodecode/templates/changeset/changeset.html:10
-#: rhodecode/templates/email_templates/changeset_comment.html:8
+#: rhodecode/controllers/pullrequests.py:138
+#: rhodecode/templates/changeset/changeset.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:15
 msgid "Changeset"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:146
+#: rhodecode/controllers/pullrequests.py:155
 msgid "Special"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:147
+#: rhodecode/controllers/pullrequests.py:156
 msgid "Peer branches"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:148 rhodecode/model/scm.py:688
-#: rhodecode/templates/switch_to_list.html:28
-#: rhodecode/templates/bookmarks/bookmarks.html:10
+#: rhodecode/controllers/pullrequests.py:157 rhodecode/model/scm.py:822
+#: rhodecode/templates/switch_to_list.html:38
+#: rhodecode/templates/bookmarks/bookmarks.html:13
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:321
+#: rhodecode/controllers/pullrequests.py:328
 msgid "Pull request requires a title with min. 3 chars"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:323
-msgid "Error creating pull request"
-msgstr ""
-
-#: rhodecode/controllers/pullrequests.py:343
+#: rhodecode/controllers/pullrequests.py:330
+#, python-format
+msgid "Error creating pull request: %s"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:352
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:346
+#: rhodecode/controllers/pullrequests.py:355
 msgid "Error occurred during sending pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:385
+#: rhodecode/controllers/pullrequests.py:395
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:481
+#: rhodecode/controllers/pullrequests.py:483
 msgid "Closing with"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:518
+#: rhodecode/controllers/pullrequests.py:520
 msgid ""
 "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr ""
 
-#: rhodecode/controllers/search.py:132
+#: rhodecode/controllers/search.py:133
 msgid "Invalid search query. Try quoting it."
 msgstr "無效的查詢。請使用跳脫字元"
 
-#: rhodecode/controllers/search.py:137
+#: rhodecode/controllers/search.py:138
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr "沒有任何索引可以搜尋。請執行 whoosh 建立索引"
 
-#: rhodecode/controllers/search.py:141
+#: rhodecode/controllers/search.py:142
 msgid "An error occurred during this search operation"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:182
+#: rhodecode/controllers/summary.py:201
 msgid "No data loaded yet"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:188
-#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/controllers/summary.py:204
+#: rhodecode/templates/summary/summary.html:105
 msgid "Statistics are disabled for this repository"
 msgstr "這個版本庫的統計功能已停用"
 
-#: rhodecode/controllers/admin/defaults.py:96
+#: rhodecode/controllers/admin/auth_settings.py:125
+msgid "Auth settings updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/auth_settings.py:136
+msgid "error occurred during update of auth settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/defaults.py:95
 msgid "Default settings updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/defaults.py:110
+#: rhodecode/controllers/admin/defaults.py:109
 msgid "Error occurred during update of defaults"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:56
-msgid "forever"
-msgstr ""
-
-#: rhodecode/controllers/admin/gists.py:57
-msgid "5 minutes"
-msgstr ""
-
 #: rhodecode/controllers/admin/gists.py:58
-msgid "1 hour"
+#: rhodecode/controllers/admin/my_account.py:255
+#: rhodecode/controllers/admin/users.py:287
+msgid "forever"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:59
-msgid "1 day"
+#: rhodecode/controllers/admin/my_account.py:256
+#: rhodecode/controllers/admin/users.py:288
+msgid "5 minutes"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:60
-msgid "1 month"
+#: rhodecode/controllers/admin/my_account.py:257
+#: rhodecode/controllers/admin/users.py:289
+msgid "1 hour"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:61
+#: rhodecode/controllers/admin/my_account.py:258
+#: rhodecode/controllers/admin/users.py:290
+msgid "1 day"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/my_account.py:259
+#: rhodecode/controllers/admin/users.py:291
+msgid "1 month"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:66
+#: rhodecode/controllers/admin/my_account.py:261
+#: rhodecode/controllers/admin/users.py:293
 msgid "Lifetime"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:127
+#: rhodecode/controllers/admin/gists.py:145
 msgid "Error occurred during gist creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:165
+#: rhodecode/controllers/admin/gists.py:183
 #, python-format
 msgid "Deleted gist %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/ldap_settings.py:50
-msgid "BASE"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:51
-msgid "ONELEVEL"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:52
-msgid "SUBTREE"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:56
-msgid "NEVER"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:57
-msgid "ALLOW"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:58
-msgid "TRY"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:59
-msgid "DEMAND"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:60
-msgid "HARD"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:64
-msgid "No encryption"
-msgstr "無加密"
-
-#: rhodecode/controllers/admin/ldap_settings.py:65
-msgid "LDAPS connection"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:66
-msgid "START_TLS on LDAP connection"
-msgstr ""
-
-#: rhodecode/controllers/admin/ldap_settings.py:124
-msgid "LDAP settings updated successfully"
-msgstr "LDAP設定更新完成"
-
-#: rhodecode/controllers/admin/ldap_settings.py:128
-msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
-msgstr "無法啟用LDAP。找不到python-ldap函式庫"
-
-#: rhodecode/controllers/admin/ldap_settings.py:145
-msgid "Error occurred during update of ldap settings"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:58
-#: rhodecode/controllers/admin/permissions.py:62
-#: rhodecode/controllers/admin/permissions.py:66
-msgid "None"
-msgstr "無"
-
-#: rhodecode/controllers/admin/permissions.py:59
-#: rhodecode/controllers/admin/permissions.py:63
-#: rhodecode/controllers/admin/permissions.py:67
-msgid "Read"
-msgstr "讀"
+#: rhodecode/controllers/admin/gists.py:232
+msgid "unmodified"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:261
+msgid "Successfully updated gist content"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:266
+msgid "Successfully updated gist data"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:269
+#, python-format
+msgid "Error occurred during update of gist %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:68
+msgid "You can't edit this user since it's crucial for entire application"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:125
+msgid "Your account was updated successfully"
+msgstr "您的帳號已更新完成"
+
+#: rhodecode/controllers/admin/my_account.py:139
+#: rhodecode/controllers/admin/users.py:205
+#, python-format
+msgid "Error occurred during update of user %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:159
+msgid "Successfully updated password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:169
+msgid "Error occurred during update of user password"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:211
+#: rhodecode/controllers/admin/users.py:430
+#, python-format
+msgid "Added email %s to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:217
+#: rhodecode/controllers/admin/users.py:436
+msgid "An error occurred during email saving"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:226
+#: rhodecode/controllers/admin/users.py:447
+msgid "Removed email from user"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:272
+#: rhodecode/controllers/admin/users.py:313
+msgid "Api key successfully created"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:284
+#: rhodecode/controllers/admin/users.py:329
+msgid "Api key successfully reset"
+msgstr ""
+
+#: rhodecode/controllers/admin/my_account.py:288
+#: rhodecode/controllers/admin/users.py:333
+msgid "Api key successfully deleted"
+msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:60
 #: rhodecode/controllers/admin/permissions.py:64
 #: rhodecode/controllers/admin/permissions.py:68
-msgid "Write"
-msgstr "寫"
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:104
+msgid "None"
+msgstr "無"
 
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
 #: rhodecode/controllers/admin/permissions.py:69
-#: rhodecode/templates/admin/defaults/defaults.html:9
-#: rhodecode/templates/admin/ldap/ldap.html:9
-#: rhodecode/templates/admin/permissions/permissions.html:9
-#: rhodecode/templates/admin/repos/repo_add.html:10
-#: rhodecode/templates/admin/repos/repo_add.html:14
-#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:9
-#: rhodecode/templates/admin/users/user_add.html:8
-#: rhodecode/templates/admin/users/user_edit.html:9
-#: rhodecode/templates/admin/users/user_edit.html:133
-#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/admin/users_groups/users_group_add.html:8
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:9
-#: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:317
-#: rhodecode/templates/base/base.html:318
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:325
+msgid "Read"
+msgstr "讀"
+
+#: rhodecode/controllers/admin/permissions.py:62
+#: rhodecode/controllers/admin/permissions.py:66
+#: rhodecode/controllers/admin/permissions.py:70
+msgid "Write"
+msgstr "寫"
+
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
+#: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/templates/admin/auth/auth_settings.html:12
+#: rhodecode/templates/admin/defaults/defaults.html:12
+#: rhodecode/templates/admin/permissions/permissions.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:12
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:13
+#: rhodecode/templates/admin/repos/repo_add.html:17
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/settings/settings.html:12
+#: rhodecode/templates/admin/user_groups/user_group_add.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+#: rhodecode/templates/admin/users/user_add.html:11
+#: rhodecode/templates/admin/users/user_edit.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:114
+#: rhodecode/templates/admin/users/users.html:13
+#: rhodecode/templates/admin/users/users.html:58
+#: rhodecode/templates/base/base.html:339
+#: rhodecode/templates/base/base.html:340
+#: rhodecode/templates/base/base.html:346
+#: rhodecode/templates/base/base.html:347
 msgid "Admin"
 msgstr "管理"
 
-#: rhodecode/controllers/admin/permissions.py:72
-#: rhodecode/controllers/admin/permissions.py:83
-#: rhodecode/controllers/admin/permissions.py:86
-#: rhodecode/controllers/admin/permissions.py:89
-#: rhodecode/controllers/admin/permissions.py:92
+#: rhodecode/controllers/admin/permissions.py:74
+#: rhodecode/controllers/admin/permissions.py:85
+#: rhodecode/controllers/admin/permissions.py:90
+#: rhodecode/controllers/admin/permissions.py:93
+#: rhodecode/controllers/admin/permissions.py:96
+#: rhodecode/controllers/admin/permissions.py:99
 msgid "Disabled"
 msgstr "停用"
 
-#: rhodecode/controllers/admin/permissions.py:74
-msgid "Allowed with manual account activation"
-msgstr ""
-
 #: rhodecode/controllers/admin/permissions.py:76
+msgid "Allowed with manual account activation"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:78
 msgid "Allowed with automatic account activation"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:79
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444
+#: rhodecode/controllers/admin/permissions.py:81
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1485
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1542
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1564
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1603
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1655
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1682 rhodecode/model/db.py:1692
 msgid "Manual activation of external account"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:80
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445
+#: rhodecode/controllers/admin/permissions.py:82
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1486
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1565
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1604
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1656
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1683 rhodecode/model/db.py:1693
 msgid "Automatic activation of external account"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:84
-#: rhodecode/controllers/admin/permissions.py:87
-#: rhodecode/controllers/admin/permissions.py:90
-#: rhodecode/controllers/admin/permissions.py:93
+#: rhodecode/controllers/admin/permissions.py:86
+#: rhodecode/controllers/admin/permissions.py:89
+#: rhodecode/controllers/admin/permissions.py:94
+#: rhodecode/controllers/admin/permissions.py:97
+#: rhodecode/controllers/admin/permissions.py:100
 msgid "Enabled"
 msgstr "啟用"
 
-#: rhodecode/controllers/admin/permissions.py:138
-msgid "Default permissions updated successfully"
-msgstr "預設權限更新完成"
-
-#: rhodecode/controllers/admin/permissions.py:152
+#: rhodecode/controllers/admin/permissions.py:123
+msgid "Global permissions updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:137
 msgid "Error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:128
-msgid "--REMOVE FORK--"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:168
+#: rhodecode/controllers/admin/repo_groups.py:184
+#, python-format
+msgid "Created repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:196
+#, python-format
+msgid "Error occurred during creation of repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:254
+#, python-format
+msgid "Updated repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:269
+#, python-format
+msgid "Error occurred during update of repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:287
+#, python-format
+msgid "This group contains %s repositores and cannot be deleted"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:294
+#, python-format
+msgid "This group contains %s subgroups and cannot be deleted"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:300
+#, python-format
+msgid "Removed repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:305
+#, python-format
+msgid "Error occurred during deletion of repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:417
+#: rhodecode/controllers/admin/repo_groups.py:452
+#: rhodecode/controllers/admin/user_groups.py:335
+msgid "Cannot revoke permission for yourself as admin"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:432
+msgid "Repository Group permissions updated"
+msgstr ""
+
+#: rhodecode/controllers/admin/repo_groups.py:469
+#: rhodecode/controllers/admin/repos.py:424
+#: rhodecode/controllers/admin/user_groups.py:347
+msgid "An error occurred during revoking of permission"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:160
+#, python-format
+msgid "Error creating repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:235
 #, python-format
 msgid "Created repository %s from %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:174
+#: rhodecode/controllers/admin/repos.py:244
+#, python-format
+msgid "Forked repository %s as %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:247
 #, python-format
 msgid "Created repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:197
-#, python-format
-msgid "Error creating repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:270
+#: rhodecode/controllers/admin/repos.py:287
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "版本庫 %s 更新完成"
 
-#: rhodecode/controllers/admin/repos.py:288
+#: rhodecode/controllers/admin/repos.py:305
 #, python-format
 msgid "Error occurred during update of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:315
+#: rhodecode/controllers/admin/repos.py:332
 #, python-format
 msgid "Detached %s forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:318
+#: rhodecode/controllers/admin/repos.py:335
 #, python-format
 msgid "Deleted %s forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:323
+#: rhodecode/controllers/admin/repos.py:340
 #, python-format
 msgid "Deleted repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:326
+#: rhodecode/controllers/admin/repos.py:343
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/admin/repos.py:348
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:345
+#: rhodecode/controllers/admin/repos.py:400
 msgid "Repository permissions updated"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:375
-#: rhodecode/controllers/admin/repos_groups.py:332
-#: rhodecode/controllers/admin/users_groups.py:312
-msgid "An error occurred during revoking of permission"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:392
-msgid "An error occurred during deletion of repository stats"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:409
-msgid "An error occurred during cache invalidation"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:429
 #: rhodecode/controllers/admin/repos.py:456
-msgid "An error occurred during unlocking"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:447
-msgid "Unlocked"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:450
-msgid "Locked"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:452
-#, python-format
-msgid "Repository has been %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:476
+msgid "An error occurred during creation of field"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:470
+msgid "An error occurred during removal of field"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:486
+msgid "-- Not a fork --"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:520
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:480
+#: rhodecode/controllers/admin/repos.py:524
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302
+#: rhodecode/controllers/admin/repos.py:529 rhodecode/model/validators.py:359
 msgid "Token mismatch"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:498
-msgid "Pulled from remote location"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:501
-msgid "An error occurred during pull from remote location"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:517
+#: rhodecode/controllers/admin/repos.py:544
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:519
+#: rhodecode/controllers/admin/repos.py:546
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:523
+#: rhodecode/controllers/admin/repos.py:553
 msgid "An error occurred during this operation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:562
-msgid "An error occurred during creation of field"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:576
-msgid "An error occurred during removal of field"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:147
-#, python-format
-msgid "Created repository group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:159
-#, python-format
-msgid "Error occurred during creation of repository group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:217
-#, python-format
-msgid "Updated repository group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:232
-#, python-format
-msgid "Error occurred during update of repository group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:250
-#, python-format
-msgid "This group contains %s repositores and cannot be deleted"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:257
-#, python-format
-msgid "This group contains %s subgroups and cannot be deleted"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:263
-#, python-format
-msgid "Removed repository group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:268
-#, python-format
-msgid "Error occurred during deletion of repository group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:279
-#: rhodecode/controllers/admin/repos_groups.py:314
-#: rhodecode/controllers/admin/users_groups.py:300
-msgid "Cannot revoke permission for yourself as admin"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:294
-msgid "Repository Group permissions updated"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:123
+#: rhodecode/controllers/admin/repos.py:569
+msgid "Locked repository"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:572
+msgid "Unlocked repository"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:575
+#: rhodecode/controllers/admin/repos.py:602
+msgid "An error occurred during unlocking"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:593
+msgid "Unlocked"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:596
+msgid "Locked"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:598
+#, python-format
+msgid "Repository has been %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:616
+msgid "Cache invalidation successful"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:620
+msgid "An error occurred during cache invalidation"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:635
+msgid "Pulled from remote location"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:638
+msgid "An error occurred during pull from remote location"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:671
+msgid "An error occurred during deletion of repository stats"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:171
+msgid "Updated VCS settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:175
+msgid ""
+"Unable to activate hgsubversion support. The \"hgsubversion\" library is "
+"missing"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:181
+#: rhodecode/controllers/admin/settings.py:273
+msgid "Error occurred during updating application settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:214
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:132
-msgid "Whoosh reindex task scheduled"
-msgstr "Whoosh 重新索引工作排程"
-
-#: rhodecode/controllers/admin/settings.py:163
+#: rhodecode/controllers/admin/settings.py:269
 msgid "Updated application settings"
 msgstr "更新應用設定"
 
-#: rhodecode/controllers/admin/settings.py:167
-#: rhodecode/controllers/admin/settings.py:304
-msgid "Error occurred during updating application settings"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:219
+#: rhodecode/controllers/admin/settings.py:326
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:224
+#: rhodecode/controllers/admin/settings.py:331
 msgid "Error occurred during updating visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:300
-msgid "Updated VCS settings"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:314
+#: rhodecode/controllers/admin/settings.py:357
+msgid "Please enter email address"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:369
+msgid "Send email task created"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:399
 msgid "Added new hook"
 msgstr "新增hook"
 
-#: rhodecode/controllers/admin/settings.py:326
-msgid "Updated hooks"
-msgstr "更新hook"
-
-#: rhodecode/controllers/admin/settings.py:330
-msgid "Error occurred during hook creation"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:349
-msgid "Email task created"
-msgstr ""
-
 #: rhodecode/controllers/admin/settings.py:413
-msgid "You can't edit this user since it's crucial for entire application"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:455
-msgid "Your account was updated successfully"
-msgstr "您的帳號已更新完成"
-
-#: rhodecode/controllers/admin/settings.py:470
-#: rhodecode/controllers/admin/users.py:198
-#, python-format
-msgid "Error occurred during update of user %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:130
-#, python-format
-msgid "Created user %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:142
-#, python-format
-msgid "Error occurred during creation of user %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:176
-msgid "User updated successfully"
-msgstr "使用者更新完成"
-
-#: rhodecode/controllers/admin/users.py:214
-msgid "Successfully deleted user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:219
-msgid "An error occurred during deletion of user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:234
-msgid "You can't edit this user"
-msgstr "您無法編輯這位使用者"
-
-#: rhodecode/controllers/admin/users.py:293
-#: rhodecode/controllers/admin/users_groups.py:372
-msgid "Updated permissions"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:297
-#: rhodecode/controllers/admin/users_groups.py:376
-msgid "An error occurred during permissions saving"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:311
-#, python-format
-msgid "Added email %s to user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:317
-msgid "An error occurred during email saving"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:327
-msgid "Removed email from user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:340
-#, python-format
-msgid "Added ip %s to user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:346
-msgid "An error occurred during ip saving"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:358
-msgid "Removed ip from user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:162
+msgid "Updated hooks"
+msgstr "更新hook"
+
+#: rhodecode/controllers/admin/settings.py:417
+msgid "Error occurred during hook creation"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:443
+msgid "Whoosh reindex task scheduled"
+msgstr "Whoosh 重新索引工作排程"
+
+#: rhodecode/controllers/admin/settings.py:535
+msgid "Updated license information"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:540
+msgid "Error occurred during updating license info"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:563
+#, python-format
+msgid ""
+"Your license will expire on %s, please contact support to extend your "
+"license."
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:566
+#, python-format
+msgid ""
+"Your license has expired on %s, please contact support to extend your "
+"license."
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:571
+msgid ""
+"Unexpected error while reading license key. Please make sure your license "
+"token and key are correct"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:148
 #, python-format
 msgid "Created user group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:173
+#: rhodecode/controllers/admin/user_groups.py:159
 #, python-format
 msgid "Error occurred during creation of user group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:210
+#: rhodecode/controllers/admin/user_groups.py:197
 #, python-format
 msgid "Updated user group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:232
+#: rhodecode/controllers/admin/user_groups.py:219
 #, python-format
 msgid "Error occurred during update of user group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:250
+#: rhodecode/controllers/admin/user_groups.py:237
 msgid "Successfully deleted user group"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:255
+#: rhodecode/controllers/admin/user_groups.py:242
 msgid "An error occurred during deletion of user group"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:274
+#: rhodecode/controllers/admin/user_groups.py:309
 msgid "Target group cannot be the same"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:280
+#: rhodecode/controllers/admin/user_groups.py:315
 msgid "User Group permissions updated"
 msgstr ""
 
-#: rhodecode/lib/auth.py:544
+#: rhodecode/controllers/admin/user_groups.py:435
+#: rhodecode/controllers/admin/users.py:395
+msgid "Updated permissions"
+msgstr ""
+
+#: rhodecode/controllers/admin/user_groups.py:439
+#: rhodecode/controllers/admin/users.py:399
+msgid "An error occurred during permissions saving"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:133
+#, python-format
+msgid "Created user %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:147
+#, python-format
+msgid "Error occurred during creation of user %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:186
+msgid "User updated successfully"
+msgstr "使用者更新完成"
+
+#: rhodecode/controllers/admin/users.py:221
+msgid "Successfully deleted user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:226
+msgid "An error occurred during deletion of user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:240
+#: rhodecode/controllers/admin/users.py:258
+#: rhodecode/controllers/admin/users.py:281
+#: rhodecode/controllers/admin/users.py:306
+#: rhodecode/controllers/admin/users.py:319
+#: rhodecode/controllers/admin/users.py:343
+#: rhodecode/controllers/admin/users.py:406
+#: rhodecode/controllers/admin/users.py:453
+msgid "You can't edit this user"
+msgstr "您無法編輯這位使用者"
+
+#: rhodecode/controllers/admin/users.py:481
+#, python-format
+msgid "Added ip %s to user whitelist"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:487
+msgid "An error occurred during ip saving"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:501
+msgid "Removed ip address from user whitelist"
+msgstr ""
+
+#: rhodecode/lib/auth.py:746
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 
-#: rhodecode/lib/auth.py:593
+#: rhodecode/lib/auth.py:807
 msgid "You need to be a registered user to perform this action"
 msgstr "您必須是註冊使用者才能執行這個動作"
 
-#: rhodecode/lib/auth.py:634
+#: rhodecode/lib/auth.py:844
 msgid "You need to be a signed in to view this page"
 msgstr "您必須登入後才能瀏覽這個頁面"
 
-#: rhodecode/lib/diffs.py:66
+#: rhodecode/lib/diffs.py:64
 msgid "Binary file"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:82
+#: rhodecode/lib/diffs.py:80
 msgid ""
 "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:92
+#: rhodecode/lib/diffs.py:90
 msgid "No changes detected"
 msgstr "尚未有任何變更"
 
-#: rhodecode/lib/helpers.py:539
-msgid "True"
-msgstr "真"
-
-#: rhodecode/lib/helpers.py:542
-msgid "False"
-msgstr "假"
-
-#: rhodecode/lib/helpers.py:580
+#: rhodecode/lib/helpers.py:598
 #, python-format
 msgid "Deleted branch: %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:583
+#: rhodecode/lib/helpers.py:601
 #, python-format
 msgid "Created tag: %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:596
+#: rhodecode/lib/helpers.py:614
 msgid "Changeset not found"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:646
+#: rhodecode/lib/helpers.py:664
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:652
+#: rhodecode/lib/helpers.py:670
 msgid "compare view"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:672
+#: rhodecode/lib/helpers.py:690
 msgid "and"
 msgstr "和"
 
-#: rhodecode/lib/helpers.py:673
+#: rhodecode/lib/helpers.py:691
 #, python-format
 msgid "%s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:674
-#: rhodecode/templates/changelog/changelog.html:53
+#: rhodecode/lib/helpers.py:692
+#: rhodecode/templates/changelog/changelog.html:58
 msgid "revisions"
 msgstr "修訂"
 
-#: rhodecode/lib/helpers.py:698
+#: rhodecode/lib/helpers.py:716
 #, python-format
 msgid "fork name %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:715
-#: rhodecode/templates/pullrequests/pullrequest_show.html:8
+#: rhodecode/lib/helpers.py:733
+#: rhodecode/templates/pullrequests/pullrequest_show.html:11
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:725
+#: rhodecode/lib/helpers.py:743
 msgid "[deleted] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739
+#: rhodecode/lib/helpers.py:745 rhodecode/lib/helpers.py:757
 msgid "[created] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:729
-msgid "[created] repository as fork"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741
-msgid "[forked] repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743
-msgid "[updated] repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:735
-msgid "[downloaded] archive from repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:737
-msgid "[delete] repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:745
-msgid "[created] user"
-msgstr ""
-
 #: rhodecode/lib/helpers.py:747
-msgid "[updated] user"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:749
-msgid "[created] user group"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:751
-msgid "[updated] user group"
+msgid "[created] repository as fork"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:749 rhodecode/lib/helpers.py:759
+msgid "[forked] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:751 rhodecode/lib/helpers.py:761
+msgid "[updated] repository"
 msgstr ""
 
 #: rhodecode/lib/helpers.py:753
-msgid "[commented] on revision in repository"
+msgid "[downloaded] archive from repository"
 msgstr ""
 
 #: rhodecode/lib/helpers.py:755
-msgid "[commented] on pull request for"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:757
-msgid "[closed] pull request for"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:759
-msgid "[pushed] into"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:761
-msgid "[committed via RhodeCode] into repository"
+msgid "[delete] repository"
 msgstr ""
 
 #: rhodecode/lib/helpers.py:763
-msgid "[pulled from remote] into repository"
+msgid "[created] user"
 msgstr ""
 
 #: rhodecode/lib/helpers.py:765
-msgid "[pulled] from"
+msgid "[updated] user"
 msgstr ""
 
 #: rhodecode/lib/helpers.py:767
-msgid "[started following] repository"
+msgid "[created] user group"
 msgstr ""
 
 #: rhodecode/lib/helpers.py:769
+msgid "[updated] user group"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:771
+msgid "[commented] on revision in repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:773
+msgid "[commented] on pull request for"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:775
+msgid "[closed] pull request for"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:777
+msgid "[pushed] into"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:779
+msgid "[committed via RhodeCode] into repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:781
+msgid "[pulled from remote] into repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:783
+msgid "[pulled] from"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:785
+msgid "[started following] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:787
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1088
+#: rhodecode/lib/helpers.py:1102
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1092
+#: rhodecode/lib/helpers.py:1106
 msgid "No Files"
 msgstr "沒有檔案"
 
-#: rhodecode/lib/helpers.py:1158
+#: rhodecode/lib/helpers.py:1172
 msgid "new file"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1161
+#: rhodecode/lib/helpers.py:1175
 msgid "mod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1164
+#: rhodecode/lib/helpers.py:1178
 msgid "del"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1167
+#: rhodecode/lib/helpers.py:1181
 msgid "rename"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1172
+#: rhodecode/lib/helpers.py:1186
 msgid "chmod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1404
+#: rhodecode/lib/helpers.py:1418
 #, 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/lib/unionrepo.py:193
-msgid "cannot create new union repository"
-msgstr ""
-
-#: rhodecode/lib/utils2.py:410
+#: rhodecode/lib/utils2.py:413
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 
-#: rhodecode/lib/utils2.py:411
+#: rhodecode/lib/utils2.py:414
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
 
-#: rhodecode/lib/utils2.py:412
+#: rhodecode/lib/utils2.py:415
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: rhodecode/lib/utils2.py:413
+#: rhodecode/lib/utils2.py:416
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: rhodecode/lib/utils2.py:414
+#: rhodecode/lib/utils2.py:417
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: rhodecode/lib/utils2.py:415
+#: rhodecode/lib/utils2.py:418
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: rhodecode/lib/utils2.py:431
+#: rhodecode/lib/utils2.py:434
 #, python-format
 msgid "in %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:433
+#: rhodecode/lib/utils2.py:436
 #, python-format
 msgid "%s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:435
-#, python-format
-msgid "in %s and %s"
-msgstr ""
-
 #: rhodecode/lib/utils2.py:438
 #, python-format
-msgid "%s and %s ago"
+msgid "in %s and %s"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:441
+#, python-format
+msgid "%s and %s ago"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:444
 msgid "just now"
 msgstr "現在"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1454
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1511
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1572
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1622
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1649 rhodecode/model/db.py:1659
 msgid "Repository no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304
-#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414
-msgid "Repository read access"
-msgstr ""
-
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305
-#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415
-msgid "Repository write access"
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1455
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1512
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1573
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1623
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1650 rhodecode/model/db.py:1660
+msgid "Repository read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1456
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1513
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1574
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1651 rhodecode/model/db.py:1661
+msgid "Repository write access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1167
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1457
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1514
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1515
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1575
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1652 rhodecode/model/db.py:1662
 msgid "Repository admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308
 msgid "Repositories Group no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309
 msgid "Repositories Group read access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310
-msgid "Repositories Group write access"
-msgstr ""
-
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310
+msgid "Repositories Group write access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1172
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311
 msgid "Repositories Group admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1452
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1509
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1510
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1570
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1620
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1647 rhodecode/model/db.py:1657
 msgid "RhodeCode Administrator"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1475
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1532
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1554
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1593
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1670 rhodecode/model/db.py:1680
 msgid "Repository creation disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315
-#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435
-msgid "Repository creation enabled"
-msgstr ""
-
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316
-#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437
-msgid "Repository forking disabled"
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1476
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1533
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1534
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1555
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1594
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1671 rhodecode/model/db.py:1681
+msgid "Repository creation enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1478
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1535
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1557
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1596
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1648
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1675 rhodecode/model/db.py:1685
+msgid "Repository forking disabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1479
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1536
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1537
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1558
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1597
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1649
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1676 rhodecode/model/db.py:1686
 msgid "Repository forking enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1403
 msgid "Register disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1180
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1404
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1183
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1407
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1651
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1980
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2040
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2062
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2101
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2154
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2200 rhodecode/model/db.py:2210
 msgid "Not Reviewed"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764
-#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940
-msgid "Approved"
-msgstr ""
-
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765
-#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941
-msgid "Rejected"
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1652
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1981
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2041
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2063
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2102
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2155
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2201 rhodecode/model/db.py:2211
+msgid "Approved"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1653
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1982
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2042
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2064
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2103
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2156
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2202 rhodecode/model/db.py:2212
+msgid "Rejected"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1654
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1983
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:2043
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:2044
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:2065
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:2104
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:2157
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:2203 rhodecode/model/db.py:2213
 msgid "Under Review"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1300
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1357
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1358
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1379
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1471
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1498 rhodecode/model/db.py:1508
 msgid "top level"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1459
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1516
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1577
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1627
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1654 rhodecode/model/db.py:1664
 msgid "Repository group no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1460
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1517
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1578
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1628
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1655 rhodecode/model/db.py:1665
 msgid "Repository group read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1461
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1518
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1579
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1629
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1656 rhodecode/model/db.py:1666
 msgid "Repository group write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1462
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1519
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1520
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1580
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1630
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1657 rhodecode/model/db.py:1667
 msgid "Repository group admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1464
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1521
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1543
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1582
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1632
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1659 rhodecode/model/db.py:1669
 msgid "User group no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1465
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1522
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1544
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1583
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1633
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1660 rhodecode/model/db.py:1670
 msgid "User group read access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1466
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1523
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1545
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1584
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1634
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1661 rhodecode/model/db.py:1671
 msgid "User group write access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1467
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1524
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1525
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1546
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1585
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1635
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1662 rhodecode/model/db.py:1672
 msgid "User group admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1469
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1526
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1548
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1587
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1637
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1664 rhodecode/model/db.py:1674
 msgid "Repository Group creation disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1470
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1527
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1528
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1549
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1588
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1638
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1665 rhodecode/model/db.py:1675
 msgid "Repository Group creation enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1472
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1529
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1551
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1590
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1640
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1667 rhodecode/model/db.py:1677
 msgid "User Group creation disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1473
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1530
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1531
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1552
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1591
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1641
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1668 rhodecode/model/db.py:1678
 msgid "User Group creation enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1481
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1538
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1560
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1599
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1651
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1678 rhodecode/model/db.py:1688
 msgid "Registration disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1482
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1539
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1561
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1600
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1652
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1679 rhodecode/model/db.py:1689
 msgid "User Registration with manual account activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1483
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1540
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1541
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1562
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1601
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1653
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1680 rhodecode/model/db.py:1690
 msgid "User Registration with automatic account activation"
 msgstr ""
 
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1672 rhodecode/model/db.py:1682
+msgid ""
+"Repository creation enabled with write permission to a repository group"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1673 rhodecode/model/db.py:1683
+msgid ""
+"Repository creation disabled with write permission to a repository group"
+msgstr ""
+
 #: rhodecode/model/comment.py:75
 #, python-format
 msgid "on line %s"
@@ -1312,470 +1659,487 @@
 msgid "[Mention]"
 msgstr ""
 
-#: rhodecode/model/forms.py:43
+#: rhodecode/model/forms.py:57
 msgid "Please enter a login"
 msgstr "請登入"
 
-#: rhodecode/model/forms.py:44
+#: rhodecode/model/forms.py:58
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr ""
 
-#: rhodecode/model/forms.py:52
+#: rhodecode/model/forms.py:66
 msgid "Please enter a password"
 msgstr "請輸入密碼"
 
-#: rhodecode/model/forms.py:53
+#: rhodecode/model/forms.py:67
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
-#: rhodecode/model/notification.py:228
-#, python-format
-msgid "%(user)s commented on changeset at %(when)s"
+#: rhodecode/model/forms.py:156
+msgid "Name must not contain only digits"
 msgstr ""
 
 #: rhodecode/model/notification.py:229
 #, python-format
-msgid "%(user)s sent message at %(when)s"
+msgid "%(user)s commented on changeset at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:230
 #, python-format
-msgid "%(user)s mentioned you at %(when)s"
+msgid "%(user)s sent message at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:231
 #, python-format
-msgid "%(user)s registered in RhodeCode at %(when)s"
+msgid "%(user)s mentioned you at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:232
 #, python-format
-msgid "%(user)s opened new pull request at %(when)s"
+msgid "%(user)s registered in RhodeCode at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:233
 #, python-format
+msgid "%(user)s opened new pull request at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:234
+#, python-format
 msgid "%(user)s commented on pull request at %(when)s"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:98
+#: rhodecode/model/pull_request.py:105
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr ""
 
-#: rhodecode/model/scm.py:674
+#: rhodecode/model/scm.py:808
 msgid "latest tip"
 msgstr ""
 
-#: rhodecode/model/user.py:232
+#: rhodecode/model/user.py:196
 msgid "New user registration"
 msgstr ""
 
-#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
+#: rhodecode/model/user.py:220 rhodecode/model/user.py:245
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr "您無法編輯這個使用者，因為他是系統帳號"
 
-#: rhodecode/model/user.py:303
+#: rhodecode/model/user.py:268
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr "您無法移除這個使用者，因為他是系統帳號"
 
-#: rhodecode/model/user.py:309
+#: rhodecode/model/user.py:274
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch owners "
 "or remove those repositories. %s"
 msgstr ""
 
-#: rhodecode/model/user.py:334
+#: rhodecode/model/user.py:302
 msgid "Password reset link"
 msgstr ""
 
-#: rhodecode/model/user.py:366
+#: rhodecode/model/user.py:331
 msgid "Your new password"
 msgstr ""
 
-#: rhodecode/model/user.py:367
+#: rhodecode/model/user.py:332
 #, python-format
 msgid "Your new RhodeCode password:%s"
 msgstr ""
 
-#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39
+#: rhodecode/model/validators.py:82 rhodecode/model/validators.py:83
 msgid "Value cannot be an empty list"
 msgstr ""
 
-#: rhodecode/model/validators.py:85
+#: rhodecode/model/validators.py:120
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:87
+#: rhodecode/model/validators.py:122
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr ""
 
-#: rhodecode/model/validators.py:89
+#: rhodecode/model/validators.py:124
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or "
 "dashes and must begin with alphanumeric character or underscore"
 msgstr ""
 
-#: rhodecode/model/validators.py:117
+#: rhodecode/model/validators.py:151
+msgid "The input is not valid"
+msgstr ""
+
+#: rhodecode/model/validators.py:158
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:136
-msgid "Invalid user group name"
-msgstr ""
-
-#: rhodecode/model/validators.py:137
-#, python-format
-msgid "User group \"%(usergroup)s\" already exists"
-msgstr ""
-
-#: rhodecode/model/validators.py:139
-msgid ""
-"user group name may only contain alphanumeric characters underscores, "
-"periods or dashes and must begin with alphanumeric character"
-msgstr ""
-
 #: rhodecode/model/validators.py:177
-msgid "Cannot assign this group as parent"
+msgid "Invalid user group name"
 msgstr ""
 
 #: rhodecode/model/validators.py:178
 #, python-format
-msgid "Group \"%(group_name)s\" already exists"
+msgid "User group \"%(usergroup)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:180
+msgid ""
+"user group name may only contain alphanumeric characters underscores, "
+"periods or dashes and must begin with alphanumeric character"
+msgstr ""
+
+#: rhodecode/model/validators.py:218
+msgid "Cannot assign this group as parent"
+msgstr ""
+
+#: rhodecode/model/validators.py:219
+#, python-format
+msgid "Group \"%(group_name)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:221
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:238
+#: rhodecode/model/validators.py:279
 msgid "Invalid characters (non-ascii) in password"
 msgstr ""
 
-#: rhodecode/model/validators.py:253
+#: rhodecode/model/validators.py:294
+msgid "Invalid old password"
+msgstr ""
+
+#: rhodecode/model/validators.py:310
 msgid "Passwords do not match"
 msgstr "密碼不相符"
 
-#: rhodecode/model/validators.py:270
+#: rhodecode/model/validators.py:327
 msgid "invalid password"
 msgstr "無效的密碼"
 
-#: rhodecode/model/validators.py:271
+#: rhodecode/model/validators.py:328
 msgid "invalid user name"
 msgstr "無效的使用者名稱"
 
-#: rhodecode/model/validators.py:272
+#: rhodecode/model/validators.py:329
 msgid "Your account is disabled"
 msgstr "您的帳號已被停用"
 
-#: rhodecode/model/validators.py:316
+#: rhodecode/model/validators.py:373
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr ""
 
-#: rhodecode/model/validators.py:318
+#: rhodecode/model/validators.py:375
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:319
+#: rhodecode/model/validators.py:376
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:321
+#: rhodecode/model/validators.py:378
 #, python-format
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:438
+#: rhodecode/model/validators.py:493
 msgid "invalid clone url"
 msgstr "無效的複製URL"
 
-#: rhodecode/model/validators.py:439
+#: rhodecode/model/validators.py:494
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 
-#: rhodecode/model/validators.py:464
+#: rhodecode/model/validators.py:519
 msgid "Fork have to be the same type as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:479
+#: rhodecode/model/validators.py:534
 msgid "You don't have permissions to create repository in this group"
 msgstr ""
 
-#: rhodecode/model/validators.py:481
+#: rhodecode/model/validators.py:536
 msgid "no permission to create repository in root location"
 msgstr ""
 
-#: rhodecode/model/validators.py:518
+#: rhodecode/model/validators.py:585
 msgid "You don't have permissions to create a group in this location"
 msgstr ""
 
-#: rhodecode/model/validators.py:559
+#: rhodecode/model/validators.py:626
 msgid "This username or user group name is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:652
+#: rhodecode/model/validators.py:719
 msgid "This is not a valid path"
 msgstr "不是一個有效的路徑"
 
-#: rhodecode/model/validators.py:667
+#: rhodecode/model/validators.py:734
 msgid "This e-mail address is already taken"
 msgstr "這個郵件位址已經使用了"
 
-#: rhodecode/model/validators.py:687
+#: rhodecode/model/validators.py:754
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr ""
 
-#: rhodecode/model/validators.py:724
+#: rhodecode/model/validators.py:791
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name of "
 "the attribute that is equivalent to \"username\""
 msgstr ""
 
-#: rhodecode/model/validators.py:737
+#: rhodecode/model/validators.py:804
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
-#: rhodecode/model/validators.py:769
+#: rhodecode/model/validators.py:836
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
-#: rhodecode/model/validators.py:770
+#: rhodecode/model/validators.py:837
 #, python-format
 msgid ""
 "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
 
-#: rhodecode/model/validators.py:803
+#: rhodecode/model/validators.py:870
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 
-#: rhodecode/model/validators.py:817
+#: rhodecode/model/validators.py:884
 msgid "Filename cannot be inside a directory"
 msgstr ""
 
+#: rhodecode/model/validators.py:900
+#, python-format
+msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
+msgstr ""
+
 #: rhodecode/templates/index.html:5
 msgid "Dashboard"
 msgstr "儀表板"
 
 #: rhodecode/templates/index_base.html:6
-#: rhodecode/templates/repo_switcher_list.html:4
-#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/users/user_edit_my_account.html:31
-#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/bookmarks/bookmarks.html:9
-#: rhodecode/templates/branches/branches.html:9
-#: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:46
-#: rhodecode/templates/journal/journal.html:47
-#: rhodecode/templates/tags/tags.html:9
+#: rhodecode/templates/admin/my_account/my_account_repos.html:3
+#: rhodecode/templates/admin/my_account/my_account_watched.html:3
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:12
+#: rhodecode/templates/admin/repos/repos.html:12
+#: rhodecode/templates/admin/user_groups/user_groups.html:12
+#: rhodecode/templates/admin/users/users.html:12
+#: rhodecode/templates/bookmarks/bookmarks.html:12
+#: rhodecode/templates/branches/branches.html:12
+#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:50
+#: rhodecode/templates/tags/tags.html:12
 msgid "quick filter..."
 msgstr "快速過濾..."
 
 #: rhodecode/templates/index_base.html:6
-#: rhodecode/templates/admin/repos/repos.html:9
+#: rhodecode/templates/admin/repos/repos.html:12
 msgid "repositories"
 msgstr "個版本庫"
 
-#: rhodecode/templates/index_base.html:13
-#: rhodecode/templates/index_base.html:18
-#: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repos.html:22
-msgid "Add repository"
-msgstr "新增版本庫"
-
-#: rhodecode/templates/index_base.html:15
 #: rhodecode/templates/index_base.html:20
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31
-msgid "Add group"
-msgstr ""
-
+#: rhodecode/templates/index_base.html:25
+#: rhodecode/templates/admin/repos/repo_add.html:22
+#: rhodecode/templates/admin/repos/repos.html:25
+msgid "Add Repository"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:22
 #: rhodecode/templates/index_base.html:27
-msgid "Edit group"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:27
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:16
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:29
+msgid "Add Repository Group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:32
 msgid "You have admin right to this group, and can edit it"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:40
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43
-#: rhodecode/templates/admin/users_groups/users_group_add.html:32
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:33
-#: rhodecode/templates/admin/users_groups/users_groups.html:37
-msgid "Group name"
-msgstr "群組名稱"
-
-#: rhodecode/templates/index_base.html:41
-#: rhodecode/templates/index_base.html:123
-#: rhodecode/templates/admin/repos/repo_add_base.html:56
-#: rhodecode/templates/admin/repos/repo_edit.html:68
-#: rhodecode/templates/admin/repos/repos.html:75
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44
-#: rhodecode/templates/email_templates/changeset_comment.html:9
+#: rhodecode/templates/index_base.html:32
+msgid "Edit Repository Group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:45
+msgid "Group Name"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:46
+#: rhodecode/templates/index_base.html:128
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:64
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:45
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:17
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:32
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:72
+#: rhodecode/templates/admin/repos/repos.html:51
+#: rhodecode/templates/admin/user_groups/user_group_add.html:43
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:51
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:64
+#: rhodecode/templates/email_templates/changeset_comment.html:16
 #: rhodecode/templates/email_templates/pull_request.html:9
-#: rhodecode/templates/forks/fork.html:56
-#: rhodecode/templates/pullrequests/pullrequest.html:43
-#: rhodecode/templates/pullrequests/pullrequest_show.html:81
-#: rhodecode/templates/summary/summary.html:106
+#: rhodecode/templates/forks/fork.html:41
+#: rhodecode/templates/pullrequests/pullrequest.html:40
+#: rhodecode/templates/pullrequests/pullrequest_show.html:86
+#: rhodecode/templates/summary/summary.html:88
 msgid "Description"
 msgstr "描述"
 
-#: rhodecode/templates/index_base.html:51
-#: rhodecode/templates/admin/permissions/permissions.html:55
-#: rhodecode/templates/admin/repos/repo_add_base.html:29
-#: rhodecode/templates/admin/repos/repo_edit.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57
-#: rhodecode/templates/forks/fork.html:47
-msgid "Repository group"
-msgstr "版本庫群組"
-
-#: rhodecode/templates/index_base.html:121
-#: rhodecode/templates/admin/repos/repo_add_base.html:9
-#: rhodecode/templates/admin/repos/repo_edit.html:32
-#: rhodecode/templates/admin/repos/repos.html:73
-#: rhodecode/templates/admin/users/user_edit_my_account.html:172
-#: rhodecode/templates/base/perms_summary.html:37
-#: rhodecode/templates/bookmarks/bookmarks.html:48
-#: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:47
-#: rhodecode/templates/branches/branches_data.html:6
-#: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:193
-#: rhodecode/templates/journal/journal.html:283
-#: rhodecode/templates/summary/summary.html:55
-#: rhodecode/templates/summary/summary.html:124
-#: rhodecode/templates/tags/tags.html:48
-#: rhodecode/templates/tags/tags_data.html:6
-msgid "Name"
-msgstr "名稱"
-
-#: rhodecode/templates/index_base.html:124
-msgid "Last Change"
-msgstr ""
-
 #: rhodecode/templates/index_base.html:126
-#: rhodecode/templates/admin/repos/repos.html:76
-#: rhodecode/templates/admin/users/user_edit_my_account.html:174
-#: rhodecode/templates/journal/journal.html:195
-#: rhodecode/templates/journal/journal.html:285
+#: rhodecode/templates/admin/my_account/my_account_repos.html:46
+#: rhodecode/templates/admin/my_account/my_account_watched.html:46
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:50
+#: rhodecode/templates/admin/repos/repo_add_base.html:9
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:7
+#: rhodecode/templates/admin/repos/repos.html:50
+#: rhodecode/templates/admin/user_groups/user_groups.html:50
+#: rhodecode/templates/base/perms_summary.html:53
+#: rhodecode/templates/bookmarks/bookmarks.html:51
+#: rhodecode/templates/bookmarks/bookmarks_data.html:7
+#: rhodecode/templates/branches/branches.html:50
+#: rhodecode/templates/branches/branches_data.html:7
+#: rhodecode/templates/files/files_browser.html:41
+#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/journal/journal.html:288
+#: rhodecode/templates/tags/tags.html:51
+#: rhodecode/templates/tags/tags_data.html:7
+msgid "Name"
+msgstr "名稱"
+
+#: rhodecode/templates/index_base.html:129
+msgid "Last Change"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:131
+#: rhodecode/templates/admin/my_account/my_account_repos.html:48
+#: rhodecode/templates/admin/my_account/my_account_watched.html:48
+#: rhodecode/templates/admin/repos/repos.html:52
+#: rhodecode/templates/journal/journal.html:199
+#: rhodecode/templates/journal/journal.html:290
 msgid "Tip"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:128
-#: rhodecode/templates/admin/repos/repo_edit.html:114
-#: rhodecode/templates/admin/repos/repos.html:78
+#: rhodecode/templates/index_base.html:133
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:10
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:53
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:60
+#: rhodecode/templates/admin/repos/repos.html:53
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:8
+#: rhodecode/templates/admin/user_groups/user_groups.html:54
+#: rhodecode/templates/summary/summary.html:141
 msgid "Owner"
 msgstr "擁有者"
 
-#: rhodecode/templates/index_base.html:136
-#: rhodecode/templates/admin/repos/repos.html:86
-#: rhodecode/templates/admin/users/user_edit_my_account.html:183
-#: rhodecode/templates/admin/users/users.html:107
-#: rhodecode/templates/bookmarks/bookmarks.html:74
-#: rhodecode/templates/branches/branches.html:73
-#: rhodecode/templates/journal/journal.html:204
-#: rhodecode/templates/journal/journal.html:294
-#: rhodecode/templates/tags/tags.html:74
+#: rhodecode/templates/index_base.html:141
+#: rhodecode/templates/admin/my_account/my_account_repos.html:57
+#: rhodecode/templates/admin/my_account/my_account_watched.html:57
+#: rhodecode/templates/base/root.html:69
+#: rhodecode/templates/bookmarks/bookmarks.html:81
+#: rhodecode/templates/branches/branches.html:80
+#: rhodecode/templates/journal/journal.html:208
+#: rhodecode/templates/journal/journal.html:299
+#: rhodecode/templates/tags/tags.html:81
 msgid "Click to sort ascending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:137
-#: rhodecode/templates/admin/repos/repos.html:87
-#: rhodecode/templates/admin/users/user_edit_my_account.html:184
-#: rhodecode/templates/admin/users/users.html:108
-#: rhodecode/templates/bookmarks/bookmarks.html:75
-#: rhodecode/templates/branches/branches.html:74
-#: rhodecode/templates/journal/journal.html:205
-#: rhodecode/templates/journal/journal.html:295
-#: rhodecode/templates/tags/tags.html:75
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/admin/my_account/my_account_repos.html:58
+#: rhodecode/templates/admin/my_account/my_account_watched.html:58
+#: rhodecode/templates/base/root.html:70
+#: rhodecode/templates/bookmarks/bookmarks.html:82
+#: rhodecode/templates/branches/branches.html:81
+#: rhodecode/templates/journal/journal.html:209
+#: rhodecode/templates/journal/journal.html:300
+#: rhodecode/templates/tags/tags.html:82
 msgid "Click to sort descending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:138
+#: rhodecode/templates/index_base.html:143
 msgid "No repositories found."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:139
-#: rhodecode/templates/admin/repos/repos.html:89
-#: rhodecode/templates/admin/users/user_edit_my_account.html:186
-#: rhodecode/templates/admin/users/users.html:110
-#: rhodecode/templates/bookmarks/bookmarks.html:77
-#: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:207
-#: rhodecode/templates/journal/journal.html:297
-#: rhodecode/templates/tags/tags.html:77
+#: rhodecode/templates/index_base.html:144
+#: rhodecode/templates/admin/my_account/my_account_repos.html:60
+#: rhodecode/templates/admin/my_account/my_account_watched.html:60
+#: rhodecode/templates/base/root.html:72
+#: rhodecode/templates/bookmarks/bookmarks.html:84
+#: rhodecode/templates/branches/branches.html:83
+#: rhodecode/templates/journal/journal.html:211
+#: rhodecode/templates/journal/journal.html:302
+#: rhodecode/templates/tags/tags.html:84
 msgid "Data error."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:140
-#: rhodecode/templates/admin/repos/repos.html:90
-#: rhodecode/templates/admin/users/user_edit_my_account.html:58
-#: rhodecode/templates/admin/users/user_edit_my_account.html:187
-#: rhodecode/templates/admin/users/users.html:111
-#: rhodecode/templates/bookmarks/bookmarks.html:78
-#: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:208
-#: rhodecode/templates/journal/journal.html:298
-#: rhodecode/templates/tags/tags.html:78
+#: rhodecode/templates/index_base.html:145
+#: rhodecode/templates/admin/my_account/my_account_repos.html:61
+#: rhodecode/templates/admin/my_account/my_account_watched.html:61
+#: rhodecode/templates/base/base.html:148
+#: rhodecode/templates/base/root.html:73
+#: rhodecode/templates/bookmarks/bookmarks.html:85
+#: rhodecode/templates/branches/branches.html:84
+#: rhodecode/templates/journal/journal.html:212
+#: rhodecode/templates/journal/journal.html:303
+#: rhodecode/templates/tags/tags.html:85
 msgid "Loading..."
 msgstr ""
 
-#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239
+#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:32
+#: rhodecode/templates/base/base.html:267
 msgid "Log In"
 msgstr ""
 
-#: rhodecode/templates/login.html:21
+#: rhodecode/templates/login.html:30
 #, python-format
 msgid "Log In to %s"
 msgstr ""
 
-#: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
+#: rhodecode/templates/login.html:43 rhodecode/templates/register.html:40
 #: rhodecode/templates/admin/admin_log.html:5
-#: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:57
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31
-#: rhodecode/templates/admin/users/users.html:77
-#: rhodecode/templates/base/base.html:215
-#: rhodecode/templates/summary/summary.html:123
+#: rhodecode/templates/admin/my_account/my_account_profile.html:30
+#: rhodecode/templates/admin/users/user_add.html:35
+#: rhodecode/templates/admin/users/user_edit_profile.html:33
+#: rhodecode/templates/admin/users/users.html:53
+#: rhodecode/templates/base/base.html:243
 msgid "Username"
 msgstr "帳號"
 
-#: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
-#: rhodecode/templates/admin/ldap/ldap.html:46
-#: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:224
+#: rhodecode/templates/login.html:52 rhodecode/templates/register.html:49
+#: rhodecode/templates/admin/my_account/my_account.html:39
+#: rhodecode/templates/admin/users/user_add.html:44
+#: rhodecode/templates/base/base.html:252
 msgid "Password"
 msgstr "密碼"
 
-#: rhodecode/templates/login.html:50
+#: rhodecode/templates/login.html:62
 msgid "Remember me"
 msgstr ""
 
-#: rhodecode/templates/login.html:54
+#: rhodecode/templates/login.html:66
 msgid "Sign In"
 msgstr "登入"
 
-#: rhodecode/templates/login.html:60
+#: rhodecode/templates/login.html:72
 msgid "Forgot your password ?"
 msgstr "忘記您的密碼?"
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235
+#: rhodecode/templates/login.html:75 rhodecode/templates/base/base.html:263
 msgid "Don't have an account ?"
 msgstr "沒有帳號?"
 
@@ -1783,139 +2147,142 @@
 msgid "Password Reset"
 msgstr ""
 
-#: rhodecode/templates/password_reset.html:11
-msgid "Reset your password to"
-msgstr "重設您的密碼"
-
-#: rhodecode/templates/password_reset.html:21
-msgid "Email address"
-msgstr "郵件位址"
-
-#: rhodecode/templates/password_reset.html:30
-msgid "Reset my password"
-msgstr "重設我的密碼"
+#: rhodecode/templates/password_reset.html:29
+#, python-format
+msgid "Reset your Password to %s"
+msgstr ""
 
 #: rhodecode/templates/password_reset.html:31
+msgid "Reset your Password"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:42
+msgid "Email Address"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:52
+#: rhodecode/templates/register.html:95
+msgid "Captcha"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:63
+msgid "Send password reset email"
+msgstr ""
+
+#: rhodecode/templates/password_reset.html:64
 msgid "Password reset link will be send to matching email address"
 msgstr "密碼重設連結已郵寄至您的信箱"
 
-#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74
+#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:30
+#: rhodecode/templates/register.html:106
 msgid "Sign Up"
 msgstr "登入"
 
-#: rhodecode/templates/register.html:11
-msgid "Sign Up to"
-msgstr "登入"
-
-#: rhodecode/templates/register.html:38
+#: rhodecode/templates/register.html:28
+#, python-format
+msgid "Sign Up to %s"
+msgstr ""
+
+#: rhodecode/templates/register.html:58
 msgid "Re-enter password"
 msgstr "確認密碼"
 
-#: rhodecode/templates/register.html:47
-#: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
+#: rhodecode/templates/register.html:67
+#: rhodecode/templates/admin/my_account/my_account_profile.html:41
+#: rhodecode/templates/admin/users/user_add.html:62
+#: rhodecode/templates/admin/users/user_edit_profile.html:87
 msgid "First Name"
 msgstr "名"
 
-#: rhodecode/templates/register.html:56
-#: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:106
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
+#: rhodecode/templates/register.html:76
+#: rhodecode/templates/admin/my_account/my_account_profile.html:50
+#: rhodecode/templates/admin/users/user_add.html:71
+#: rhodecode/templates/admin/users/user_edit_profile.html:96
 msgid "Last Name"
 msgstr "姓"
 
-#: rhodecode/templates/register.html:65
-#: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:115
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/summary/summary.html:125
+#: rhodecode/templates/register.html:85
+#: rhodecode/templates/admin/my_account/my_account_profile.html:59
+#: rhodecode/templates/admin/settings/settings.html:44
+#: rhodecode/templates/admin/users/user_add.html:80
+#: rhodecode/templates/admin/users/user_edit_profile.html:42
 msgid "Email"
 msgstr "電子郵件"
 
-#: rhodecode/templates/register.html:76
+#: rhodecode/templates/register.html:108
 msgid "Your account will be activated right after registration"
 msgstr "您的帳號註冊後將會啟用"
 
-#: rhodecode/templates/register.html:78
+#: rhodecode/templates/register.html:110
 msgid "Your account must wait for activation by administrator"
 msgstr "您的帳號註冊後將等待管理員啟用"
 
-#: rhodecode/templates/repo_switcher_list.html:10
-#: rhodecode/templates/admin/defaults/defaults.html:44
-#: rhodecode/templates/admin/repos/repo_add_base.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:78
-#: rhodecode/templates/data_table/_dt_elements.html:61
-#: rhodecode/templates/summary/summary.html:77
-msgid "Private repository"
-msgstr "私有的版本庫"
-
-#: rhodecode/templates/repo_switcher_list.html:12
-#: rhodecode/templates/data_table/_dt_elements.html:63
-#: rhodecode/templates/summary/summary.html:79
-msgid "Public repository"
-msgstr "公開的版本庫"
-
 #: rhodecode/templates/switch_to_list.html:10
-#: rhodecode/templates/branches/branches_data.html:57
+#: rhodecode/templates/branches/branches_data.html:67
 msgid "There are no branches yet"
 msgstr "沒有任何分支"
 
-#: rhodecode/templates/switch_to_list.html:22
-#: rhodecode/templates/tags/tags_data.html:38
+#: rhodecode/templates/switch_to_list.html:16
+msgid "Closed Branches"
+msgstr ""
+
+#: rhodecode/templates/switch_to_list.html:32
+#: rhodecode/templates/tags/tags_data.html:44
 msgid "There are no tags yet"
 msgstr "沒有任何標籤"
 
-#: rhodecode/templates/switch_to_list.html:35
-#: rhodecode/templates/bookmarks/bookmarks_data.html:37
+#: rhodecode/templates/switch_to_list.html:45
+#: rhodecode/templates/bookmarks/bookmarks_data.html:43
 msgid "There are no bookmarks yet"
 msgstr ""
 
 #: rhodecode/templates/admin/admin.html:5
-#: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/base/base.html:73
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/base/base.html:69
 msgid "Admin journal"
 msgstr "管理員日誌"
 
-#: rhodecode/templates/admin/admin.html:10
+#: rhodecode/templates/admin/admin.html:13
 msgid "journal filter..."
 msgstr ""
 
-#: rhodecode/templates/admin/admin.html:12
-#: rhodecode/templates/journal/journal.html:11
+#: rhodecode/templates/admin/admin.html:15
+#: rhodecode/templates/journal/journal.html:14
 msgid "filter"
 msgstr ""
 
-#: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/journal/journal.html:12
+#: rhodecode/templates/admin/admin.html:16
+#: rhodecode/templates/journal/journal.html:15
 #, python-format
 msgid "%s entry"
 msgid_plural "%s entries"
 msgstr[0] ""
 
 #: rhodecode/templates/admin/admin_log.html:6
-#: rhodecode/templates/admin/repos/repos.html:79
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
-#: rhodecode/templates/admin/users/user_edit_my_account.html:176
-#: rhodecode/templates/admin/users/users.html:87
-#: rhodecode/templates/admin/users_groups/users_groups.html:40
-#: rhodecode/templates/journal/journal.html:197
-#: rhodecode/templates/journal/journal.html:287
+#: rhodecode/templates/admin/my_account/my_account_repos.html:50
+#: rhodecode/templates/admin/my_account/my_account_watched.html:50
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:54
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:8
+#: rhodecode/templates/admin/repos/repos.html:55
+#: rhodecode/templates/admin/user_groups/user_groups.html:55
+#: rhodecode/templates/admin/users/users.html:60
+#: rhodecode/templates/journal/journal.html:201
+#: rhodecode/templates/journal/journal.html:292
 msgid "Action"
 msgstr "動作"
 
 #: rhodecode/templates/admin/admin_log.html:7
-#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/permissions/permissions_globals.html:18
 msgid "Repository"
 msgstr "版本庫"
 
 #: rhodecode/templates/admin/admin_log.html:8
-#: rhodecode/templates/bookmarks/bookmarks.html:49
-#: rhodecode/templates/bookmarks/bookmarks_data.html:7
-#: rhodecode/templates/branches/branches.html:48
-#: rhodecode/templates/branches/branches_data.html:7
-#: rhodecode/templates/tags/tags.html:49
-#: rhodecode/templates/tags/tags_data.html:7
+#: rhodecode/templates/bookmarks/bookmarks.html:53
+#: rhodecode/templates/bookmarks/bookmarks_data.html:9
+#: rhodecode/templates/branches/branches.html:52
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/tags/tags.html:53
+#: rhodecode/templates/tags/tags_data.html:9
 msgid "Date"
 msgstr "時間"
 
@@ -1927,309 +2294,598 @@
 msgid "No actions yet"
 msgstr ""
 
+#: rhodecode/templates/admin/auth/auth_settings.html:5
+msgid "Authentication Settings"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:14
+#: rhodecode/templates/base/base.html:75
+msgid "Authentication"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:31
+msgid "Authentication Plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:34
+msgid "Enabled Plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:36
+msgid ""
+"Comma separated list of plugins. Order of plugins is also order in which "
+"RhodeCode will try to authenticate user"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:37
+msgid "Available built-in plugins"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:65
+msgid "enabled"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:43
+#: rhodecode/templates/base/root.html:66
+msgid "disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/auth/auth_settings.html:51
+#: rhodecode/templates/admin/defaults/defaults.html:87
+#: rhodecode/templates/admin/my_account/my_account_password.html:33
+#: rhodecode/templates/admin/my_account/my_account_profile.html:68
+#: rhodecode/templates/admin/permissions/permissions_globals.html:108
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:72
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:114
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:101
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:134
+#: rhodecode/templates/admin/settings/settings_hooks.html:53
+#: rhodecode/templates/admin/user_groups/user_group_add.html:60
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:104
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:67
+#: rhodecode/templates/admin/users/user_add.html:99
+#: rhodecode/templates/admin/users/user_edit_profile.html:122
+#: rhodecode/templates/base/default_perms_box.html:64
+msgid "Save"
+msgstr "儲存"
+
+#: rhodecode/templates/admin/auth/auth_settings.html:57
+msgid "Plugin"
+msgstr ""
+
 #: rhodecode/templates/admin/defaults/defaults.html:5
-#: rhodecode/templates/admin/defaults/defaults.html:25
+#: rhodecode/templates/admin/defaults/defaults.html:28
 msgid "Repositories defaults"
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:11
-#: rhodecode/templates/base/base.html:80
+#: rhodecode/templates/admin/defaults/defaults.html:14
+#: rhodecode/templates/base/base.html:76
 msgid "Defaults"
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:35
-#: rhodecode/templates/admin/repos/repo_add_base.html:38
+#: rhodecode/templates/admin/defaults/defaults.html:38
+#: rhodecode/templates/admin/repos/repo_add_base.html:59
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:7
 msgid "Type"
 msgstr "類型"
 
-#: rhodecode/templates/admin/defaults/defaults.html:48
-#: rhodecode/templates/admin/repos/repo_add_base.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:82
-#: rhodecode/templates/forks/fork.html:69
+#: rhodecode/templates/admin/defaults/defaults.html:47
+#: rhodecode/templates/admin/repos/repo_add_base.html:77
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:82
+#: rhodecode/templates/data_table/_dt_elements.html:70
+msgid "Private repository"
+msgstr "私有的版本庫"
+
+#: rhodecode/templates/admin/defaults/defaults.html:51
+#: rhodecode/templates/admin/repos/repo_add_base.html:81
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:86
+#: rhodecode/templates/forks/fork.html:75
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:55
-#: rhodecode/templates/admin/repos/repo_edit.html:87
+#: rhodecode/templates/admin/defaults/defaults.html:58
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:91
 msgid "Enable statistics"
 msgstr "啟用統計"
 
-#: rhodecode/templates/admin/defaults/defaults.html:59
-#: rhodecode/templates/admin/repos/repo_edit.html:91
+#: rhodecode/templates/admin/defaults/defaults.html:62
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:95
 msgid "Enable statistics window on summary page."
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:96
+#: rhodecode/templates/admin/defaults/defaults.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:100
 msgid "Enable downloads"
 msgstr "啟用下載"
 
-#: rhodecode/templates/admin/defaults/defaults.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:100
+#: rhodecode/templates/admin/defaults/defaults.html:72
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:104
 msgid "Enable download menu on summary page."
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:75
-#: rhodecode/templates/admin/repos/repo_edit.html:105
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64
+#: rhodecode/templates/admin/defaults/defaults.html:78
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:34
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:109
 msgid "Enable locking"
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:79
-#: rhodecode/templates/admin/repos/repo_edit.html:109
+#: rhodecode/templates/admin/defaults/defaults.html:82
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:113
 msgid "Enable lock-by-pulling on repository."
 msgstr ""
 
-#: rhodecode/templates/admin/defaults/defaults.html:84
-#: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/permissions/permissions.html:122
-#: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos/repo_edit.html:166
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96
-#: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_add.html:94
-#: rhodecode/templates/admin/users/user_edit.html:140
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88
-#: rhodecode/templates/admin/users_groups/users_group_add.html:49
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:143
-#: rhodecode/templates/base/default_perms_box.html:53
-msgid "Save"
-msgstr "儲存"
-
-#: rhodecode/templates/admin/gists/index.html:5
-#: rhodecode/templates/base/base.html:299
-msgid "Gists"
+#: rhodecode/templates/admin/gists/edit.html:5
+#: rhodecode/templates/admin/gists/edit.html:22
+msgid "Edit Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:40
+#, python-format
+msgid ""
+"Gist was update since you started editing. Copy your changes and click "
+"%(here)s to reload new version."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:59
+#: rhodecode/templates/admin/gists/new.html:43
+msgid "Gist description ..."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:61
+#: rhodecode/templates/admin/gists/new.html:45
+msgid "Gist lifetime"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/edit.html:67
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/index.html:62
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/gists/show.html:52
+msgid "Expires"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:65
+#: rhodecode/templates/admin/gists/index.html:60
+#: rhodecode/templates/admin/gists/show.html:50
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+msgid "never"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:80
+#: rhodecode/templates/admin/gists/new.html:52
+#: rhodecode/templates/files/files_add.html:59
+#: rhodecode/templates/files/files_edit.html:64
+msgid "plain"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:147
+msgid "Update Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/edit.html:148
+#: rhodecode/templates/changeset/changeset_file_comment.html:89
+msgid "Cancel"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:6
+#: rhodecode/templates/admin/gists/index.html:19
+#, python-format
+msgid "Private Gists for user %s"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:8
+#: rhodecode/templates/admin/gists/index.html:21
+#, python-format
+msgid "Public Gists for user %s"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:10
-#, python-format
-msgid "Private Gists for user %s"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:12
-#, python-format
-msgid "Public Gists for user %s"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:14
+#: rhodecode/templates/admin/gists/index.html:23
 msgid "Public Gists"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.html:31
-#: rhodecode/templates/admin/gists/show.html:24
-#: rhodecode/templates/base/base.html:302
-msgid "Create new gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:48
+#: rhodecode/templates/admin/gists/index.html:40
+#: rhodecode/templates/admin/gists/show.html:28
+msgid "Create New Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:57
+#: rhodecode/templates/data_table/_dt_elements.html:143
 msgid "Created"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/index.html:51
-#: rhodecode/templates/admin/gists/index.html:53
-#: rhodecode/templates/admin/gists/show.html:43
-#: rhodecode/templates/admin/gists/show.html:45
-msgid "Expires"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:51
-#: rhodecode/templates/admin/gists/show.html:43
-msgid "never"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/index.html:68
+#: rhodecode/templates/admin/gists/index.html:77
 msgid "There are no gists yet"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/new.html:5
-#: rhodecode/templates/admin/gists/new.html:16
-msgid "New gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:37
-msgid "Gist description ..."
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:52
-msgid "Create private gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:53
-msgid "Create public gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/new.html:54
-#: rhodecode/templates/admin/permissions/permissions.html:123
-#: rhodecode/templates/admin/permissions/permissions.html:185
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos/repo_edit.html:167
-#: rhodecode/templates/admin/repos/repo_edit.html:381
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97
-#: rhodecode/templates/admin/settings/settings.html:115
-#: rhodecode/templates/admin/settings/settings.html:196
-#: rhodecode/templates/admin/settings/settings.html:288
-#: rhodecode/templates/admin/users/user_edit.html:141
-#: rhodecode/templates/admin/users/user_edit.html:198
-#: rhodecode/templates/admin/users/user_edit.html:246
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:144
-#: rhodecode/templates/base/default_perms_box.html:54
-#: rhodecode/templates/files/files_add.html:80
-#: rhodecode/templates/files/files_edit.html:66
-#: rhodecode/templates/pullrequests/pullrequest.html:86
+#: rhodecode/templates/admin/gists/new.html:22
+msgid "New Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:51
+msgid "name this file..."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:60
+msgid "Create Private Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:61
+msgid "Create Public Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:62
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:70
+#: rhodecode/templates/admin/my_account/my_account_emails.html:46
+#: rhodecode/templates/admin/my_account/my_account_password.html:34
+#: rhodecode/templates/admin/my_account/my_account_profile.html:69
+#: rhodecode/templates/admin/permissions/permissions_globals.html:109
+#: rhodecode/templates/admin/permissions/permissions_ips.html:41
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:115
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:43
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:59
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:102
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:135
+#: rhodecode/templates/admin/settings/settings_global.html:56
+#: rhodecode/templates/admin/settings/settings_license.html:43
+#: rhodecode/templates/admin/settings/settings_vcs.html:81
+#: rhodecode/templates/admin/settings/settings_visual.html:116
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:105
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:70
+#: rhodecode/templates/admin/users/user_edit_emails.html:46
+#: rhodecode/templates/admin/users/user_edit_ips.html:50
+#: rhodecode/templates/admin/users/user_edit_profile.html:123
+#: rhodecode/templates/base/default_perms_box.html:65
+#: rhodecode/templates/files/files_add.html:70
+#: rhodecode/templates/files/files_delete.html:58
+#: rhodecode/templates/files/files_edit.html:73
+#: rhodecode/templates/pullrequests/pullrequest.html:83
 msgid "Reset"
 msgstr "重設"
 
 #: rhodecode/templates/admin/gists/show.html:5
-msgid "gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:9
+#: rhodecode/templates/admin/gists/show.html:12
 msgid "Gist"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/show.html:36
-msgid "Public gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:38
-msgid "Private gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:54
-#: rhodecode/templates/admin/repos/repo_edit.html:299
-#: rhodecode/templates/changeset/changeset_file_comment.html:40
+#: rhodecode/templates/admin/gists/show.html:13
+#: rhodecode/templates/email_templates/changeset_comment.html:4
+#: rhodecode/templates/email_templates/pull_request.html:4
+#: rhodecode/templates/email_templates/pull_request_comment.html:4
+msgid "URL"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:40
+msgid "Public Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:42
+msgid "Private Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:59
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:80
+#: rhodecode/templates/changeset/changeset_file_comment.html:48
+#: rhodecode/templates/files/files_source.html:39
+#: rhodecode/templates/files/files_source.html:42
+#: rhodecode/templates/files/files_source.html:45
 msgid "Delete"
 msgstr "移除"
 
-#: rhodecode/templates/admin/gists/show.html:54
-msgid "Confirm to delete this gist"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:63
-#: rhodecode/templates/admin/gists/show.html:84
-#: rhodecode/templates/files/files_edit.html:48
-#: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:55
-msgid "Show as raw"
-msgstr ""
-
-#: rhodecode/templates/admin/gists/show.html:71
+#: rhodecode/templates/admin/gists/show.html:59
+msgid "Confirm to delete this Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:66
+#: rhodecode/templates/changeset/changeset_file_comment.html:81
+#: rhodecode/templates/changeset/changeset_file_comment.html:190
+#: rhodecode/templates/data_table/_dt_elements.html:167
+#: rhodecode/templates/data_table/_dt_elements.html:183
+#: rhodecode/templates/files/files_source.html:41
+#: rhodecode/templates/files/files_source.html:44
+msgid "Edit"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:68
+#: rhodecode/templates/files/files_edit.html:54
+#: rhodecode/templates/files/files_source.html:34
+msgid "Show as Raw"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:76
 msgid "created"
 msgstr ""
 
-#: rhodecode/templates/admin/ldap/ldap.html:5
-msgid "LDAP administration"
-msgstr "LDAP管理者"
-
-#: rhodecode/templates/admin/ldap/ldap.html:11
-#: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:79
-msgid "LDAP"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:28
-msgid "Connection settings"
-msgstr "連接設定"
-
-#: rhodecode/templates/admin/ldap/ldap.html:30
-msgid "Enable LDAP"
-msgstr "啟動LDAP"
-
-#: rhodecode/templates/admin/ldap/ldap.html:34
-msgid "Host"
-msgstr "主機"
-
-#: rhodecode/templates/admin/ldap/ldap.html:38
-msgid "Port"
-msgstr "連接埠"
-
-#: rhodecode/templates/admin/ldap/ldap.html:42
-msgid "Account"
-msgstr "帳號"
-
-#: rhodecode/templates/admin/ldap/ldap.html:50
-msgid "Connection security"
-msgstr "連接安全性"
-
-#: rhodecode/templates/admin/ldap/ldap.html:54
-msgid "Certificate Checks"
-msgstr "憑證確認"
-
-#: rhodecode/templates/admin/ldap/ldap.html:57
-msgid "Search settings"
-msgstr "搜尋選項"
-
-#: rhodecode/templates/admin/ldap/ldap.html:59
-msgid "Base DN"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:63
-msgid "LDAP Filter"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:67
-msgid "LDAP Search Scope"
-msgstr ""
-
-#: rhodecode/templates/admin/ldap/ldap.html:70
-msgid "Attribute mappings"
-msgstr "屬性對應"
-
-#: rhodecode/templates/admin/ldap/ldap.html:72
-msgid "Login Attribute"
-msgstr "登入屬性"
-
-#: rhodecode/templates/admin/ldap/ldap.html:76
-msgid "First Name Attribute"
-msgstr "名"
-
-#: rhodecode/templates/admin/ldap/ldap.html:80
-msgid "Last Name Attribute"
-msgstr "姓"
-
-#: rhodecode/templates/admin/ldap/ldap.html:84
-msgid "E-mail Attribute"
-msgstr "電子郵件屬性"
+#: rhodecode/templates/admin/gists/show.html:89
+#: rhodecode/templates/files/files_source.html:71
+msgid "Show as raw"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:5
+#: rhodecode/templates/base/base.html:282
+msgid "My account"
+msgstr "我的帳號"
+
+#: rhodecode/templates/admin/my_account/my_account.html:12
+msgid "My Account"
+msgstr "我的帳號"
+
+#: rhodecode/templates/admin/my_account/my_account.html:38
+#: rhodecode/templates/admin/users/user_edit.html:42
+msgid "Profile"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:40
+#: rhodecode/templates/admin/users/user_edit.html:43
+msgid "API keys"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:41
+msgid "My Emails"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:42
+msgid "My Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:43
+#: rhodecode/templates/journal/journal.html:54
+msgid "Watched"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:44
+msgid "Pull requests"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:45
+msgid "My permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:6
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:6
+msgid "Built-in"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:8
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:27
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:32
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:8
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:27
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:32
+msgid "expires"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:14
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:14
+#, python-format
+msgid "Confirm to reset this api key: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:15
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:15
+msgid "reset"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:30
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:30
+msgid "expired"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:40
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:40
+#, python-format
+msgid "Confirm to remove this api key: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:42
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:42
+msgid "remove"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:49
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:49
+msgid "No additional api keys specified"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:61
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:61
+msgid "New api key"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_api_keys.html:69
+#: rhodecode/templates/admin/my_account/my_account_emails.html:45
+#: rhodecode/templates/admin/permissions/permissions_ips.html:40
+#: rhodecode/templates/admin/repos/repo_add_base.html:85
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:58
+#: rhodecode/templates/admin/users/user_edit_api_keys.html:69
+#: rhodecode/templates/admin/users/user_edit_emails.html:45
+#: rhodecode/templates/admin/users/user_edit_ips.html:49
+msgid "Add"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:7
+#: rhodecode/templates/admin/users/user_edit_emails.html:7
+msgid "Primary"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:19
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:24
+#: rhodecode/templates/admin/permissions/permissions_ips.html:14
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:18
+#: rhodecode/templates/admin/settings/settings_hooks.html:36
+#: rhodecode/templates/admin/users/user_edit_emails.html:19
+#: rhodecode/templates/admin/users/user_edit_ips.html:22
+#: rhodecode/templates/data_table/_dt_elements.html:131
+#: rhodecode/templates/data_table/_dt_elements.html:159
+#: rhodecode/templates/data_table/_dt_elements.html:175
+#: rhodecode/templates/data_table/_dt_elements.html:191
+msgid "delete"
+msgstr "刪除"
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:20
+#: rhodecode/templates/admin/users/user_edit_emails.html:20
+#, python-format
+msgid "Confirm to delete this email: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:26
+#: rhodecode/templates/admin/users/user_edit_emails.html:26
+msgid "No additional emails specified"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_emails.html:38
+#: rhodecode/templates/admin/users/user_edit_emails.html:38
+msgid "New email address"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:1
+msgid "Change your account password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:7
+msgid "Current password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:16
+#: rhodecode/templates/admin/users/user_edit_profile.html:69
+msgid "New password"
+msgstr "新密碼"
+
+#: rhodecode/templates/admin/my_account/my_account_password.html:25
+msgid "Confirm new password"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:9
+msgid "Change your avatar at"
+msgstr "修改您的頭像於"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:10
+#: rhodecode/templates/admin/users/user_edit_profile.html:9
+msgid "Using"
+msgstr "使用中"
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:12
+#: rhodecode/templates/admin/users/user_edit_profile.html:11
+msgid "Avatars are disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:13
+msgid "Missing email, please update your user email address."
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:14
+#: rhodecode/templates/admin/users/user_edit_profile.html:15
+msgid "current IP"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_profile.html:26
+msgid ""
+"Your user is in an external Source of Record; some details cannot be managed"
+" here"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:2
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:4
+msgid "Show closed pull requests"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:6
+msgid "Opened by me"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:15
+#, python-format
+msgid "Pull request #%s opened on %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:17
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:47
+#: rhodecode/templates/pullrequests/pullrequest_data.html:11
+#: rhodecode/templates/pullrequests/pullrequest_show.html:30
+#: rhodecode/templates/pullrequests/pullrequest_show.html:45
+msgid "Closed"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:25
+msgid "Confirm to delete this pull request"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:32
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:53
+msgid "Nothing here yet"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:36
+msgid "I participate in"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:44
+#: rhodecode/templates/pullrequests/pullrequest_data.html:8
+#, python-format
+msgid "Pull request #%s opened by %s on %s"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:1
+msgid "Repositories you are owner of"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_repos.html:59
+#: rhodecode/templates/admin/my_account/my_account_watched.html:59
+#: rhodecode/templates/base/root.html:71
+#: rhodecode/templates/bookmarks/bookmarks.html:83
+#: rhodecode/templates/branches/branches.html:82
+#: rhodecode/templates/journal/journal.html:210
+#: rhodecode/templates/journal/journal.html:301
+#: rhodecode/templates/tags/tags.html:83
+msgid "No records found."
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_watched.html:1
+msgid "Repositories you are watching"
+msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:5
-#: rhodecode/templates/admin/notifications/notifications.html:9
+#: rhodecode/templates/admin/notifications/notifications.html:12
 msgid "My Notifications"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/notifications.html:29
+#: rhodecode/templates/admin/notifications/notifications.html:32
 msgid "All"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/notifications.html:30
+#: rhodecode/templates/admin/notifications/notifications.html:33
 msgid "Comments"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
-msgid "Pull requests"
-msgstr ""
-
-#: rhodecode/templates/admin/notifications/notifications.html:35
+#: rhodecode/templates/admin/notifications/notifications.html:34
+#: rhodecode/templates/base/base.html:193
+msgid "Pull Requests"
+msgstr ""
+
+#: rhodecode/templates/admin/notifications/notifications.html:38
 msgid "Mark all read"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/notifications_data.html:39
+#: rhodecode/templates/admin/notifications/notifications_data.html:40
 msgid "No notifications here yet"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/show_notification.html:5
-#: rhodecode/templates/admin/notifications/show_notification.html:11
+#: rhodecode/templates/admin/notifications/show_notification.html:14
 msgid "Show notification"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/show_notification.html:9
-#: rhodecode/templates/base/base.html:253
+#: rhodecode/templates/admin/notifications/show_notification.html:12
+#: rhodecode/templates/base/base.html:281
 msgid "Notifications"
 msgstr ""
 
@@ -2237,1346 +2893,1678 @@
 msgid "Permissions administration"
 msgstr "權限管理員"
 
-#: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:151
-#: rhodecode/templates/admin/repos/repo_edit.html:158
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88
-#: rhodecode/templates/admin/users/user_edit.html:150
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:129
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/base/base.html:78
+#: rhodecode/templates/admin/permissions/permissions.html:14
+#: rhodecode/templates/admin/permissions/permissions.html:37
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:55
+#: rhodecode/templates/admin/repos/repo_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:45
+#: rhodecode/templates/base/base.html:74
 msgid "Permissions"
 msgstr "權限"
 
-#: rhodecode/templates/admin/permissions/permissions.html:24
-msgid "Default permissions"
-msgstr "預設權限"
-
-#: rhodecode/templates/admin/permissions/permissions.html:31
+#: rhodecode/templates/admin/permissions/permissions.html:41
+#: rhodecode/templates/admin/settings/settings.html:42
+msgid "Global"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:42
+msgid "IP whitelist"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:43
+msgid "Overview"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:7
 msgid "Anonymous access"
 msgstr "訪客權限"
 
-#: rhodecode/templates/admin/permissions/permissions.html:49
+#: rhodecode/templates/admin/permissions/permissions_globals.html:13
+#, python-format
+msgid ""
+"Allow access to RhodeCode without need to log in. Anonymous users use %s "
+"user permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:26
 msgid ""
 "All default permissions on each repository will be reset to chosen "
 "permission, note that all custom default permission on repositories will be "
 "lost"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:50
-#: rhodecode/templates/admin/permissions/permissions.html:63
-#: rhodecode/templates/admin/permissions/permissions.html:77
+#: rhodecode/templates/admin/permissions/permissions_globals.html:27
+#: rhodecode/templates/admin/permissions/permissions_globals.html:40
+#: rhodecode/templates/admin/permissions/permissions_globals.html:54
 msgid "Overwrite existing settings"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:62
+#: rhodecode/templates/admin/permissions/permissions_globals.html:32
+#: rhodecode/templates/admin/repos/repo_add_base.html:41
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:42
+#: rhodecode/templates/data_table/_dt_elements.html:204
+#: rhodecode/templates/forks/fork.html:51
+msgid "Repository group"
+msgstr "版本庫群組"
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:39
 msgid ""
 "All default permissions on each repository group will be reset to chosen "
 "permission, note that all custom default permission on repository groups "
 "will be lost"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:69
+#: rhodecode/templates/admin/permissions/permissions_globals.html:46
+#: rhodecode/templates/data_table/_dt_elements.html:211
 msgid "User group"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:76
+#: rhodecode/templates/admin/permissions/permissions_globals.html:53
 msgid ""
 "All default permissions on each user group will be reset to chosen "
 "permission, note that all custom default permission on repository groups "
 "will be lost"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:83
+#: rhodecode/templates/admin/permissions/permissions_globals.html:60
 msgid "Repository creation"
 msgstr "版本庫建立"
 
-#: rhodecode/templates/admin/permissions/permissions.html:91
+#: rhodecode/templates/admin/permissions/permissions_globals.html:68
+msgid "Repository creation with group write access"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:72
+msgid ""
+"Write permission to repository groups allows creating repositories inside "
+"that group"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_globals.html:77
 msgid "User group creation"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:99
+#: rhodecode/templates/admin/permissions/permissions_globals.html:85
 msgid "Repository forking"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:107
+#: rhodecode/templates/admin/permissions/permissions_globals.html:93
 msgid "Registration"
 msgstr "註冊"
 
-#: rhodecode/templates/admin/permissions/permissions.html:115
+#: rhodecode/templates/admin/permissions/permissions_globals.html:101
 msgid "External auth account activation"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:133
-msgid "Default User Permissions"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:144
-#: rhodecode/templates/admin/users/user_edit.html:207
-msgid "Allowed IP addresses"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:158
-#: rhodecode/templates/admin/repos/repo_edit.html:340
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
-#: rhodecode/templates/admin/users/user_edit.html:175
-#: rhodecode/templates/admin/users/user_edit.html:220
-#: rhodecode/templates/admin/users_groups/users_groups.html:54
-#: rhodecode/templates/data_table/_dt_elements.html:122
-#: rhodecode/templates/data_table/_dt_elements.html:136
-msgid "delete"
-msgstr "刪除"
-
-#: rhodecode/templates/admin/permissions/permissions.html:159
-#: rhodecode/templates/admin/users/user_edit.html:221
+#: rhodecode/templates/admin/permissions/permissions_ips.html:1
+msgid "Default ip whitelist for all users"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions_ips.html:15
+#: rhodecode/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:165
-#: rhodecode/templates/admin/users/user_edit.html:227
+#: rhodecode/templates/admin/permissions/permissions_ips.html:21
+#: rhodecode/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:176
-#: rhodecode/templates/admin/users/user_edit.html:238
+#: rhodecode/templates/admin/permissions/permissions_ips.html:32
+#: rhodecode/templates/admin/users/user_edit_ips.html:42
 msgid "New ip address"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:184
-#: rhodecode/templates/admin/repos/repo_add_base.html:73
-#: rhodecode/templates/admin/repos/repo_edit.html:380
-#: rhodecode/templates/admin/users/user_edit.html:197
-#: rhodecode/templates/admin/users/user_edit.html:245
-msgid "Add"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add.html:12
-#: rhodecode/templates/admin/repos/repo_add.html:16
-#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88
-#: rhodecode/templates/base/base.html:116
-#: rhodecode/templates/base/base.html:275
-msgid "Repositories"
-msgstr "版本庫"
-
-#: rhodecode/templates/admin/repos/repo_add.html:19
+#: rhodecode/templates/admin/permissions/permissions_perms.html:1
+msgid "Default user permissions overview"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:5
+msgid "Add repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:14
+#: rhodecode/templates/base/base.html:71 rhodecode/templates/base/base.html:90
+msgid "Repository groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:36
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:8
+#: rhodecode/templates/admin/user_groups/user_group_add.html:35
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:7
+msgid "Group name"
+msgstr "群組名稱"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:54
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:26
+msgid "Group parent"
+msgstr "父群組"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:63
+#: rhodecode/templates/admin/repos/repo_add_base.html:50
+msgid "Copy parent group permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.html:67
+#: rhodecode/templates/admin/repos/repo_add_base.html:54
+msgid "Copy permission set from parent repository group."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:5
+#, python-format
+msgid "%s Repository group settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:105
+msgid "Repository Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:24
+msgid "Add Child Group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:53
+#: rhodecode/templates/admin/repos/repo_edit.html:15
+#: rhodecode/templates/admin/repos/repo_edit.html:43
+#: rhodecode/templates/admin/settings/settings.html:14
+#: rhodecode/templates/admin/settings/settings.html:36
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:42
+#: rhodecode/templates/base/base.html:77
+#: rhodecode/templates/base/base.html:159
+msgid "Settings"
+msgstr "設定"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:54
+#: rhodecode/templates/admin/repos/repo_edit.html:49
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:43
+#: rhodecode/templates/admin/users/user_edit.html:44
+msgid "Advanced"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:1
+#, python-format
+msgid "Repository Group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:6
+msgid "Top level repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:7
+msgid "Total repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:8
+msgid "Children groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_advanced.html:8
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+msgid "Created on"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:192
+#, python-format
+msgid "Confirm to delete this group: %s with %s repository"
+msgid_plural "Confirm to delete this group: %s with %s repositories"
+msgstr[0] ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:25
+msgid "Delete this repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:7
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:8
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:7
+#: rhodecode/templates/base/perms_summary.html:14
+msgid "none"
+msgstr "無"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:8
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:9
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:8
+#: rhodecode/templates/base/perms_summary.html:15
+msgid "read"
+msgstr "讀"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:9
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:10
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:9
+#: rhodecode/templates/base/perms_summary.html:16
+msgid "write"
+msgstr "寫"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:10
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:11
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:10
+#: rhodecode/templates/base/perms_summary.html:17
+msgid "admin"
+msgstr "管理員"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:11
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:12
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:11
+msgid "user/user group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:28
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:45
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:24
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:37
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:28
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:45
+msgid "default"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:34
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:71
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:43
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:68
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:34
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:71
+msgid "revoke"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:47
+msgid "delegated admin"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:97
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:94
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:97
 msgid "Add new"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:96
-#: rhodecode/templates/summary/summary.html:97
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:103
+msgid "apply to children"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:107
+msgid "Both"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:108
+msgid ""
+"Set or revoke permission to all children of that group, including non-"
+"private repositories and other groups if selected."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:38
+msgid ""
+"Enable lock-by-pulling on group. This option will be applied to all other "
+"groups and repositories inside"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:4
+#, python-format
+msgid "%s Repository group dashboard"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:12
+msgid "Home"
+msgstr "首頁"
+
+#: rhodecode/templates/admin/repo_groups/repo_group_show.html:16
+msgid "with"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:5
+msgid "Repository groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:13
+msgid "repository groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_groups.html:52
+msgid "Number of toplevel repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add.html:5
+msgid "Add repository"
+msgstr "新增版本庫"
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:14
+msgid "Import existing repository ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:23
+#: rhodecode/templates/summary/summary.html:32
 msgid "Clone from"
 msgstr "複製由"
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:24
-#: rhodecode/templates/admin/repos/repo_edit.html:45
+#: rhodecode/templates/admin/repos/repo_add_base.html:27
 msgid "Optional http[s] url from which repository should be cloned."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:33
-#: rhodecode/templates/forks/fork.html:51
-msgid "Optionaly select a group to put this repository into."
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:42
-msgid "Type of repository to create."
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:47
-#: rhodecode/templates/admin/repos/repo_edit.html:59
-#: rhodecode/templates/forks/fork.html:38
-msgid "Landing revision"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:51
-#: rhodecode/templates/admin/repos/repo_edit.html:63
-#: rhodecode/templates/forks/fork.html:42
-msgid "Default revision for files page, downloads, whoosh and readme"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_base.html:60
-#: rhodecode/templates/admin/repos/repo_edit.html:72
-#: rhodecode/templates/forks/fork.html:60
+#: rhodecode/templates/admin/repos/repo_add_base.html:36
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:76
+#: rhodecode/templates/forks/fork.html:45
 msgid ""
 "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_add_base.html:45
+#: rhodecode/templates/forks/fork.html:55
+msgid "Optionaly select a group to put this repository into."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:63
+msgid "Type of repository to create."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:68
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:51
+#: rhodecode/templates/forks/fork.html:61
+msgid "Landing revision"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add_base.html:72
+msgid ""
+"Default revision for files page, downloads, full text search index and "
+"readme generation"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:9
+#, python-format
+msgid "%s Creating repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:16
+msgid "Creating repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:30
+#, python-format
+msgid ""
+"Repository \"%(repo_name)s\" is beeing created, you will be redirected when "
+"this process is finished.repo_name"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_creating.html:42
+msgid ""
+"We're sorry but error occured during this operation. Please check your "
+"RhodeCode server logs, or contact administrator."
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit.html:8
-msgid "Edit repository"
-msgstr "編輯版本庫"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:12
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:11
-#: rhodecode/templates/base/base.html:81
-#: rhodecode/templates/base/base.html:134
-#: rhodecode/templates/summary/summary.html:212
-msgid "Settings"
-msgstr "設定"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:36
-msgid "Non-changeable id"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:41
-msgid "Clone uri"
-msgstr "複製URL"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:54
-msgid "Optional select a group to put this repository into."
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:119
-msgid "Change owner of this repository."
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:177
-msgid "Advanced settings"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:180
-msgid "Statistics"
-msgstr "統計"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Reset current statistics"
-msgstr "重設目前的統計"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Confirm to remove current statistics"
-msgstr "確認移除目前的統計"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:187
-msgid "Fetched to rev"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:188
-msgid "Stats gathered"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:196
+#, python-format
+msgid "%s repository settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:52
+msgid "Extra fields"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:55
+msgid "Caches"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:58
 msgid "Remote"
 msgstr "遠端"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:200
-msgid "Pull changes from remote location"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:200
-msgid "Confirm to pull changes from remote side"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:211
-msgid "Cache"
-msgstr "快取"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:215
-msgid "Invalidate repository cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:215
-msgid "Confirm to invalidate repository cache"
-msgstr "確認廢止版本庫快取"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:218
-msgid ""
-"Manually invalidate cache for this repository. On first access repository "
-"will be cached again"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:223
-msgid "List of cached values"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:226
-msgid "Prefix"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:227
-msgid "Key"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:228
-#: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:124
-#: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/admin/users_groups/users_group_add.html:41
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-#: rhodecode/templates/admin/users_groups/users_groups.html:39
-msgid "Active"
-msgstr "啟用"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:243
-#: rhodecode/templates/base/base.html:292
-#: rhodecode/templates/base/base.html:293
-msgid "Public journal"
-msgstr "公開日誌"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:249
+#: rhodecode/templates/admin/repos/repo_edit.html:61
+#: rhodecode/templates/summary/statistics.html:11
+#: rhodecode/templates/summary/summary.html:178
+#: rhodecode/templates/summary/summary.html:179
+msgid "Statistics"
+msgstr "統計"
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:1
+#: rhodecode/templates/summary/summary.html:25
+msgid "Fork of"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:6
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:5
+msgid "Set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:10
+#: rhodecode/templates/admin/repos/repo_edit_fork.html:9
+msgid "Manually set this repository as a fork of another from the list"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:24
+msgid "Public journal visibility"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:32
 msgid "Remove from public journal"
 msgstr "從公開日誌移除"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:251
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:37
 msgid "Add to public journal"
-msgstr "新增至公開日誌"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:256
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:43
 msgid ""
 "All actions made on this repository will be accessible to everyone in public"
 " journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:263
-msgid "Locking"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
-msgid "Unlock locked repo"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:49
+msgid "Change locking"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:56
 msgid "Confirm to unlock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:271
-msgid "Lock repo"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:271
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:58
+msgid "Unlock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:64
 msgid "Confirm to lock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:272
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:66
+msgid "Lock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:68
 msgid "Repository is not locked"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:277
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:73
 msgid ""
-"Force locking on repository. Works only when anonymous access is disabled"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:284
-msgid "Set as fork of"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:289
-msgid "Set"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:293
-msgid "Manually set this repository as a fork of another from the list"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:308
-msgid "Remove this repository"
-msgstr "移除版本庫"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:308
-msgid "Confirm to delete this repository"
-msgstr "確認移除這個版本庫"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:310
+"Force locking on repository. Works only when anonymous access is disabled. "
+"Trigering a pull locks repository by user who pulled, only the same user can"
+" unlock by doing a push"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:83
+#: rhodecode/templates/data_table/_dt_elements.html:132
+#, python-format
+msgid "Confirm to delete this repository: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:85
+msgid "Delete this repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:88
 #, python-format
 msgid "this repository has %s fork"
 msgid_plural "this repository has %s forks"
 msgstr[0] ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:311
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:89
 msgid "Detach forks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:312
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:90
 msgid "Delete forks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:315
+#: rhodecode/templates/admin/repos/repo_edit_advanced.html:94
 msgid ""
 "This repository will be renamed in a special way in order to be unaccesible "
 "for RhodeCode and VCS systems. If you need to fully delete it from file "
 "system please do it manually"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:329
-msgid "Extra fields"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:341
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:4
+msgid "Confirm to invalidate repository cache"
+msgstr "確認廢止版本庫快取"
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:7
+msgid ""
+"Manually invalidate cache for this repository. On first access repository "
+"will be cached again"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:12
+msgid "List of cached values"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:15
+msgid "Prefix"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:16
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:6
+msgid "Key"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.html:17
+#: rhodecode/templates/admin/user_groups/user_group_add.html:52
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:24
+#: rhodecode/templates/admin/user_groups/user_groups.html:53
+#: rhodecode/templates/admin/users/user_add.html:91
+#: rhodecode/templates/admin/users/user_edit_profile.html:105
+#: rhodecode/templates/admin/users/users.html:57
+msgid "Active"
+msgstr "啟用"
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:5
+msgid "Label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:19
 #, python-format
 msgid "Confirm to delete this field: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:355
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:33
 msgid "New field key"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:363
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:41
 msgid "New field label"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:366
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:44
 msgid "Enter short label"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:372
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:50
 msgid "New field description"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:375
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:53
 msgid "Enter description of a field"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:3
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3
-msgid "none"
-msgstr "無"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:4
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4
-msgid "read"
-msgstr "讀"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:5
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5
-msgid "write"
-msgstr "寫"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:6
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6
-msgid "admin"
-msgstr "管理員"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:7
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7
-msgid "member"
-msgstr "成員"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:16
+#: rhodecode/templates/admin/repos/repo_edit_fields.html:66
+msgid "Extra fields are disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_permissions.html:21
 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:20
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35
-msgid "default"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:33
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:58
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:55
-msgid "revoke"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:83
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
-#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81
-msgid "Add another member"
-msgstr "新增另ㄧ位成員"
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:3
+msgid "Remote url"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+msgid "Pull changes from remote location"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:8
+msgid "Confirm to pull changes from remote side"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.html:14
+msgid "This repository does not have any remote url set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "Non-changeable id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:11
+msgid "what is that ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:13
+msgid "URL by id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:14
+msgid ""
+"In case this repository is renamed or moved into another group the repository url changes.\n"
+"                               Using above url guarantees that this repository will allways be accessible under such url.\n"
+"                               Usefull for CI systems, or any other cases that you need to hardcode the url into 3rd party service."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:21
+msgid "Clone uri"
+msgstr "複製URL"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:27
+#: rhodecode/templates/base/perms_summary.html:43
+#: rhodecode/templates/base/perms_summary.html:79
+#: rhodecode/templates/base/perms_summary.html:81
+#: rhodecode/templates/data_table/_dt_elements.html:124
+#: rhodecode/templates/data_table/_dt_elements.html:125
+#: rhodecode/templates/data_table/_dt_elements.html:152
+#: rhodecode/templates/data_table/_dt_elements.html:153
+#: rhodecode/templates/data_table/_dt_elements.html:169
+#: rhodecode/templates/data_table/_dt_elements.html:185
+msgid "edit"
+msgstr "編輯"
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:30
+msgid "new value"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:37
+msgid "http[s] url used for doing remote pulls."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:46
+msgid "Optional select a group to put this repository into."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:55
+#: rhodecode/templates/forks/fork.html:65
+msgid "Default revision for files page, downloads, whoosh and readme"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:65
+msgid "Change owner of this repository."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:6
+msgid "Processed commits"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:7
+msgid "Processed progress"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Reset statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_statistics.html:10
+msgid "Confirm to remove current statistics"
+msgstr "確認移除目前的統計"
 
 #: rhodecode/templates/admin/repos/repos.html:5
 msgid "Repositories administration"
 msgstr "版本庫管理員"
 
-#: rhodecode/templates/admin/repos/repos.html:88
-#: rhodecode/templates/admin/users/user_edit_my_account.html:185
-#: rhodecode/templates/admin/users/users.html:109
-#: rhodecode/templates/bookmarks/bookmarks.html:76
-#: rhodecode/templates/branches/branches.html:75
-#: rhodecode/templates/journal/journal.html:206
-#: rhodecode/templates/journal/journal.html:296
-#: rhodecode/templates/tags/tags.html:76
-msgid "No records found."
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
-msgid "apply to children"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88
-msgid ""
-"Set or revoke permission to all children of that group, including non-"
-"private repositories and other groups"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
-#, python-format
-msgid "%s Group Dashboard"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:9
-msgid "Home"
-msgstr "首頁"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:13
-msgid "with"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
-msgid "Add repository group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16
-#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91
-msgid "Repository groups"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13
-msgid "Add new repository group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56
-msgid "Group parent"
-msgstr "父群組"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59
-msgid "save"
-msgstr "儲存"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
-msgid "Edit repository group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13
-#, python-format
-msgid "Edit repository group %s"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27
-msgid "Add child group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68
-msgid ""
-"Enable lock-by-pulling on group. This option will be applied to all other "
-"groups and repositories inside"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
-msgid "Repository groups administration"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45
-msgid "Number of toplevel repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64
-#: rhodecode/templates/admin/users_groups/users_groups.html:48
-#: rhodecode/templates/changeset/changeset_file_comment.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:171
-msgid "Edit"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65
-#: rhodecode/templates/admin/users_groups/users_groups.html:49
-#: rhodecode/templates/base/perms_summary.html:29
-#: rhodecode/templates/base/perms_summary.html:60
-#: rhodecode/templates/base/perms_summary.html:62
-#: rhodecode/templates/data_table/_dt_elements.html:116
-#: rhodecode/templates/data_table/_dt_elements.html:117
-#: rhodecode/templates/data_table/_dt_elements.html:130
-#: rhodecode/templates/data_table/_dt_elements.html:131
-msgid "edit"
-msgstr "編輯"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
-#, python-format
-msgid "Confirm to delete this group: %s with %s repository"
-msgid_plural "Confirm to delete this group: %s with %s repositories"
-msgstr[0] ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78
-msgid "There are no repository groups yet"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/hooks.html:5
+#: rhodecode/templates/admin/repos/repos.html:54
+msgid "State"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings.html:5
 msgid "Settings administration"
 msgstr "設定管理員"
 
-#: rhodecode/templates/admin/settings/hooks.html:24
-msgid "Built in hooks - read only"
-msgstr "內建hook - 唯讀"
-
-#: rhodecode/templates/admin/settings/hooks.html:40
-msgid "Custom hooks"
-msgstr "自訂hook"
-
-#: rhodecode/templates/admin/settings/hooks.html:56
-msgid "remove"
-msgstr "移除"
-
-#: rhodecode/templates/admin/settings/hooks.html:88
-msgid "Failed to remove hook"
-msgstr "移除hook失敗"
-
-#: rhodecode/templates/admin/settings/settings.html:26
-msgid "Remap and rescan repositories"
-msgstr "重新對映與掃描版本庫"
-
-#: rhodecode/templates/admin/settings/settings.html:34
-msgid "Rescan option"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:40
-msgid ""
-"In case a repository was deleted from filesystem and there are leftovers in "
-"the database check this option to scan obsolete data in database and remove "
-"it."
-msgstr "如果版本庫已從檔案系統中刪除，但是資料還留在資料庫，請勾選這個項目清理資料庫中舊的資料"
+msgid "VCS"
+msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:41
-msgid "Destroy old data"
+msgid "Remap and rescan"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:43
-msgid ""
-"Rescan repositories location for new repositories. Also deletes obsolete if "
-"`destroy` flag is checked "
+msgid "Visual"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:45
+#: rhodecode/templates/admin/settings/settings_vcs.html:19
+msgid "Hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:46
+msgid "Full text search"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:47
+msgid "System Info"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:48
-msgid "Rescan repositories"
-msgstr "重新掃描版本庫"
-
-#: rhodecode/templates/admin/settings/settings.html:54
-msgid "Whoosh indexing"
-msgstr "Whoosh 索引"
-
-#: rhodecode/templates/admin/settings/settings.html:62
-msgid "Index build option"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:67
-msgid "Build from scratch"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:73
-msgid "Reindex"
-msgstr "重新索引"
-
-#: rhodecode/templates/admin/settings/settings.html:79
-msgid "Global application settings"
-msgstr "全域設定"
-
-#: rhodecode/templates/admin/settings/settings.html:88
+msgid "License"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:4
+msgid "Email prefix"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:5
+msgid "RhodeCode email from"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:6
+msgid "Error email from"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:7
+msgid "Error email recipients"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:9
+msgid "SMTP server"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:10
+msgid "SMTP username"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:11
+msgid "SMTP password"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:12
+msgid "SMTP port"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:14
+msgid "SMTP use TLS"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:15
+msgid "SMTP use SSL"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:16
+msgid "SMTP auth"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:31
+msgid "Send test email to"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_email.html:39
+msgid "Send"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:8
 msgid "Site branding"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:97
+#: rhodecode/templates/admin/settings/settings_global.html:12
+msgid "Set a custom title for your RhodeCode Service."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:18
 msgid "HTTP authentication realm"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:106
+#: rhodecode/templates/admin/settings/settings_global.html:27
 msgid "Google Analytics code"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:114
-#: rhodecode/templates/admin/settings/settings.html:195
-#: rhodecode/templates/admin/settings/settings.html:287
+#: rhodecode/templates/admin/settings/settings_global.html:36
+msgid "ReCaptcha public key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:40
+msgid "Public key for reCaptcha system."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:46
+msgid "ReCaptcha private key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:50
+msgid ""
+"Private key for reCaptcha system. Setting this value will enable captcha on "
+"registration"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_global.html:55
+#: rhodecode/templates/admin/settings/settings_license.html:42
+#: rhodecode/templates/admin/settings/settings_vcs.html:80
+#: rhodecode/templates/admin/settings/settings_visual.html:115
 msgid "Save settings"
 msgstr "儲存設定"
 
-#: rhodecode/templates/admin/settings/settings.html:121
-msgid "Visualisation settings"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:129
-msgid "General"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:134
-msgid "Use repository extra fields"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:136
-msgid "Allows storing additional customized fields per repository."
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:139
-msgid "Show RhodeCode version"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:141
-msgid "Shows or hides displayed version of RhodeCode in the footer"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:146
-msgid "Dashboard items"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:150
+#: rhodecode/templates/admin/settings/settings_hooks.html:1
+msgid "Built in Mercurial hooks - read only"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:15
+msgid ""
+"Hooks can be used to trigger actions on certain events such as push / pull. "
+"They can trigger Python functions or external applications."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:19
+msgid "Custom hooks"
+msgstr "自訂hook"
+
+#: rhodecode/templates/admin/settings/settings_hooks.html:69
+msgid "Failed to remove hook"
+msgstr "移除hook失敗"
+
+#: rhodecode/templates/admin/settings/settings_license.html:2
+msgid "Currently you're using a free license, which is limited to 20 users."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:9
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "RhodeCode version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "License token"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:10
+msgid "No license token"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:13
+msgid "License issued to"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:14
+msgid "License issued on"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "License users limit"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:15
+msgid "unlimited"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:16
+msgid "License expires on"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:33
+msgid "License key"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:37
+msgid "Paste your RhodeCode license key into that textarea."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_license.html:52
+msgid ""
+"Please enter following lines (if yet not present) into [app:main] section of"
+" your .ini file. The token below is autogenerated."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:6
+msgid "Rescan option"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:11
+msgid "Destroy old data"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:13
+msgid ""
+"In case a repository was deleted from filesystem and it still exists in the "
+"database check this option to scan obsolete data in database and remove it."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:17
+msgid "Invalidate cache for all repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:19
 msgid ""
-"Number of items displayed in lightweight dashboard before pagination is "
-"shown."
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:155
-msgid "Icons"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:160
-msgid "Show public repo icon on repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:164
-msgid "Show private repo icon on repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:166
-msgid "Show public/private icons next to repositories names"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:172
-msgid "Meta-Tagging"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:177
-msgid "Stylify recognised metatags:"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:204
-msgid "VCS settings"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:213
+"Each cache data for repositories will be cleaned with this option selected. "
+"Use this to reload data and clear cache keys."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:23
+msgid "Install GIT hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:25
+msgid ""
+"Verify if RhodeCodes GIT hooks are installed for each repository. Current "
+"hooks will be updated to latest version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_mapping.html:32
+msgid "Rescan Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:7
+msgid "Index build option"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:12
+msgid "Build from scratch"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:15
+msgid ""
+"This option completely reindex all the files within RhodeCode for proper "
+"fulltext search capabilities."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_search.html:21
+msgid "Reindex"
+msgstr "重新索引"
+
+#: rhodecode/templates/admin/settings/settings_system.html:4
+msgid "check for updates"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:5
+msgid "Python version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:6
+msgid "Platform"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:7
+msgid "GIT version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:8
+msgid "GIT path"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Upgrade info endpoint"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:9
+msgid "Note: please make sure this server can access this url"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:14
+msgid "Checking for updates..."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:22
+msgid "Python packages"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:6
 msgid "Web"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:218
+#: rhodecode/templates/admin/settings/settings_vcs.html:11
 msgid "Require SSL for vcs operations"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:220
+#: rhodecode/templates/admin/settings/settings_vcs.html:13
 msgid ""
-"RhodeCode will require SSL for pushing or pulling. If SSL is missing it will"
-" return HTTP Error 406: Not Acceptable"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:226
-msgid "Hooks"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:231
+"Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
+"certificate is missing it will return a HTTP Error 406: Not Acceptable."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:24
+msgid "Show repository size after push"
+msgstr "push 後顯示版本庫大小"
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:28
+msgid "Log user push commands"
+msgstr "紀錄使用者推送命令"
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:32
+msgid "Log user pull commands"
+msgstr "紀錄使用者抓取命令"
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:36
 msgid "Update repository after push (hg update)"
 msgstr "push後更新版本庫 (hg update)"
 
-#: rhodecode/templates/admin/settings/settings.html:235
-msgid "Show repository size after push"
-msgstr "push 後顯示版本庫大小"
-
-#: rhodecode/templates/admin/settings/settings.html:239
-msgid "Log user push commands"
-msgstr "紀錄使用者推送命令"
-
-#: rhodecode/templates/admin/settings/settings.html:243
-msgid "Log user pull commands"
-msgstr "紀錄使用者抓取命令"
-
-#: rhodecode/templates/admin/settings/settings.html:247
-msgid "Advanced setup"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:252
+#: rhodecode/templates/admin/settings/settings_vcs.html:42
 msgid "Mercurial Extensions"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:257
+#: rhodecode/templates/admin/settings/settings_vcs.html:47
 msgid "Enable largefiles extension"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:261
+#: rhodecode/templates/admin/settings/settings_vcs.html:51
 msgid "Enable hgsubversion extension"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:263
+#: rhodecode/templates/admin/settings/settings_vcs.html:53
 msgid ""
-"Requires hgsubversion library installed. Allows cloning from svn remote "
-"locations"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:274
+"Requires hgsubversion library to be installed. Allows cloning remote SVN "
+"repositories and migrates them to Mercurial type."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_vcs.html:64
 msgid "Repositories location"
 msgstr "版本庫路徑"
 
-#: rhodecode/templates/admin/settings/settings.html:279
+#: rhodecode/templates/admin/settings/settings_vcs.html:69
 msgid ""
 "Click to unlock. You must restart RhodeCode in order to make this setting "
 "take effect."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:280
-#: rhodecode/templates/base/base.html:143
-msgid "Unlock"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:282
+#: rhodecode/templates/admin/settings/settings_vcs.html:72
+msgid ""
+"Filesystem location where repositories should be stored. After changing this"
+" value a restart and rescan of the repository folder are required."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:8
+msgid "General"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:13
+msgid "Use repository extra fields"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:15
+msgid "Allows storing additional customized fields per repository."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:18
+msgid "Show RhodeCode version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:20
+msgid "Shows or hides a version number of RhodeCode displayed in the footer."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:24
+msgid "Use Gravatars in RhodeCode"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:30
+msgid ""
+"Gravatar url allows you to use other avatar server application.\n"
+"                                                        Following variables of the URL will be replaced accordingly.\n"
+"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {email}     user email,\n"
+"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
+"                                                        {size}      size of the image that is expected from the server application,\n"
+"                                                        {netloc}    network location/server host of running RhodeCode server"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:42
+msgid ""
+"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
+"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
+"                                                        {user}   current user username,\n"
+"                                                        {netloc} network location/server host of running RhodeCode server,\n"
+"                                                        {repo}   full repository name,\n"
+"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:54
+msgid "Dashboard items"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:58
+msgid ""
+"Number of items displayed in the main page dashboard before pagination is "
+"shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:64
+msgid "Admin pages items"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:68
 msgid ""
-"Location where repositories are stored. After changing this value a restart,"
-" and rescan is required"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:303
-msgid "Test Email"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:311
-msgid "Email to"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:319
-msgid "Send"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:325
-msgid "System Info and Packages"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:328
-#: rhodecode/templates/changelog/changelog.html:51
-msgid "Show"
-msgstr "顯示"
+"Number of items displayed in the admin pages grids before pagination is "
+"shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:74
+msgid "Icons"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:79
+msgid "Show public repo icon on repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:83
+msgid "Show private repo icon on repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:85
+msgid "Show public/private icons next to repositories names."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:91
+msgid "Meta-Tagging"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:96
+msgid "Stylify recognised meta tags:"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_visual.html:110
+msgid ""
+"Parses meta tags from repository description field and turns them into "
+"colored tags."
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:5
+msgid "Add user group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:13
+#: rhodecode/templates/base/base.html:73 rhodecode/templates/base/base.html:93
+msgid "User groups"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:15
+#: rhodecode/templates/admin/user_groups/user_groups.html:28
+msgid "Add User Group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_add.html:47
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:19
+msgid "Short, optional description for this user group."
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:5
+#, python-format
+msgid "%s user group settings"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:14
+msgid "User Groups"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:44
+#: rhodecode/templates/admin/users/user_edit.html:45
+msgid "Default permissions"
+msgstr "預設權限"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:46
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:6
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:32
+#: rhodecode/templates/admin/user_groups/user_groups.html:52
+msgid "Members"
+msgstr "成員"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:1
+#, python-format
+msgid "User Group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:19
+#: rhodecode/templates/data_table/_dt_elements.html:176
+#, python-format
+msgid "Confirm to delete this user group: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:21
+msgid "Delete this user group"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_members.html:15
+msgid "No members yet"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:40
+msgid "Chosen group members"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:43
+msgid "Remove all elements"
+msgstr "移除所有元素"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:53
+msgid "Available members"
+msgstr "啟用的成員"
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:56
+msgid "Add all elements"
+msgstr "新增索有元素"
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:5
+msgid "User groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_groups.html:13
+msgid "user groups"
+msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr "新增使用者"
 
-#: rhodecode/templates/admin/users/user_add.html:10
-#: rhodecode/templates/admin/users/user_edit.html:11
-#: rhodecode/templates/base/base.html:76
+#: rhodecode/templates/admin/users/user_add.html:13
+#: rhodecode/templates/admin/users/user_edit.html:14
+#: rhodecode/templates/base/base.html:72
 msgid "Users"
 msgstr "使用者"
 
-#: rhodecode/templates/admin/users/user_add.html:12
-#: rhodecode/templates/admin/users/users.html:23
-msgid "Add new user"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_add.html:50
+#: rhodecode/templates/admin/users/user_add.html:15
+#: rhodecode/templates/admin/users/users.html:27
+msgid "Add User"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_add.html:53
 msgid "Password confirmation"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:5
-msgid "Edit user"
-msgstr "編輯使用者"
-
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#, python-format
-msgid "Edit %s"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:34
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:10
-msgid "Change your avatar at"
-msgstr "修改您的頭像於"
-
-#: rhodecode/templates/admin/users/user_edit.html:35
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:11
-msgid "Using"
-msgstr "使用中"
-
-#: rhodecode/templates/admin/users/user_edit.html:43
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:20
-msgid "API key"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:50
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25
-msgid "Current IP"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:70
-msgid "LDAP DN"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:79
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
-msgid "New password"
-msgstr "新密碼"
-
-#: rhodecode/templates/admin/users/user_edit.html:88
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
+#, python-format
+msgid "%s user settings"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:46
+msgid "Emails"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:47
+msgid "Ip whitelist"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:1
+#, python-format
+msgid "User: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:7
+#: rhodecode/templates/admin/users/user_edit_profile.html:51
+msgid "Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:9
+msgid "Last Login"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:10
+msgid "Member of User groups"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:160
+#, python-format
+msgid "Confirm to delete this user: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_advanced.html:23
+msgid "Delete this user"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_ips.html:8
+#, python-format
+msgid "Inherited from %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:8
+msgid "Change avatar at"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:12
+msgid "Missing email, please update this user email address."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:27
+#, python-format
+msgid ""
+"This user is in an external Source of Record (%s); some details cannot be "
+"managed here."
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:60
+msgid "Name in Source of Record"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_profile.html:78
 msgid "New password confirmation"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:163
-msgid "Email addresses"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:176
-#, python-format
-msgid "Confirm to delete this email: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:190
-msgid "New email address"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:254
-msgid "My account"
-msgstr "我的帳號"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:9
-msgid "My Account"
-msgstr "我的帳號"
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:35
-msgid "My permissions"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:54
-msgid "My repos"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account.html:41
-msgid "My pull requests"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4
-msgid "Show closed pull requests"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6
-msgid "Opened by me"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
-#, python-format
-msgid "Pull request #%s opened on %s"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45
-#: rhodecode/templates/pullrequests/pullrequest_data.html:11
-#: rhodecode/templates/pullrequests/pullrequest_show.html:27
-#: rhodecode/templates/pullrequests/pullrequest_show.html:42
-msgid "Closed"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23
-msgid "Confirm to delete this pull request"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51
-msgid "Nothing here yet"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34
-msgid "I participate in"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42
-#: rhodecode/templates/pullrequests/pullrequest_data.html:8
-#, python-format
-msgid "Pull request #%s opened by %s on %s"
-msgstr ""
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "使用者管理員"
 
-#: rhodecode/templates/admin/users/users.html:9
+#: rhodecode/templates/admin/users/users.html:13
 msgid "users"
 msgstr "使用者"
 
-#: rhodecode/templates/admin/users/users.html:80
+#: rhodecode/templates/admin/users/users.html:54
 msgid "Firstname"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:81
+#: rhodecode/templates/admin/users/users.html:55
 msgid "Lastname"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:82
+#: rhodecode/templates/admin/users/users.html:56
 msgid "Last login"
 msgstr ""
 
-#: rhodecode/templates/admin/users_groups/users_group_add.html:5
-msgid "Add user group"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_add.html:10
-#: rhodecode/templates/admin/users_groups/users_groups.html:11
-#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94
-msgid "User groups"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_add.html:12
-#: rhodecode/templates/admin/users_groups/users_groups.html:26
-msgid "Add new user group"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:5
-msgid "Edit user group"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:11
-msgid "UserGroups"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:50
-#: rhodecode/templates/admin/users_groups/users_groups.html:38
-msgid "Members"
-msgstr "成員"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:58
-msgid "Chosen group members"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:61
-msgid "Remove all elements"
-msgstr "移除所有元素"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:75
-msgid "Available members"
-msgstr "啟用的成員"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:79
-msgid "Add all elements"
-msgstr "新增索有元素"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:109
-msgid "No members yet"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:117
-msgid "Global Permissions"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:5
-msgid "User groups administration"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:55
-#, python-format
-msgid "Confirm to delete this user group: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:62
-msgid "There are no user groups yet"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:42
+#: rhodecode/templates/admin/users/users.html:59
+msgid "Auth type"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:37
 #, python-format
 msgid "Server instance: %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:52
-msgid "Report a bug"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:121
-#: rhodecode/templates/data_table/_dt_elements.html:9
+#: rhodecode/templates/base/base.html:46
+msgid "Support"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:131
+msgid "Create fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:142
 #: rhodecode/templates/data_table/_dt_elements.html:11
-#: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/summary/summary.html:8
+#: rhodecode/templates/data_table/_dt_elements.html:15
+#: rhodecode/templates/summary/summary.html:11
 msgid "Summary"
 msgstr "概況"
 
-#: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/changelog/changelog.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:17
+#: rhodecode/templates/base/base.html:143
+#: rhodecode/templates/changelog/changelog.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
-#: rhodecode/templates/data_table/_dt_elements.html:21
+#: rhodecode/templates/data_table/_dt_elements.html:23
 msgid "Changelog"
 msgstr "修改紀錄"
 
-#: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/data_table/_dt_elements.html:25
+#: rhodecode/templates/base/base.html:144
 #: rhodecode/templates/data_table/_dt_elements.html:27
-#: rhodecode/templates/data_table/_dt_elements.html:29
-#: rhodecode/templates/files/files.html:12
+#: rhodecode/templates/data_table/_dt_elements.html:31
+#: rhodecode/templates/files/files.html:15
 msgid "Files"
 msgstr "檔案"
 
-#: rhodecode/templates/base/base.html:125
+#: rhodecode/templates/base/base.html:146
 msgid "Switch To"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:127
-#: rhodecode/templates/base/base.html:279
-msgid "loading..."
-msgstr "載入中..."
-
-#: rhodecode/templates/base/base.html:131
-msgid "Options"
-msgstr "選項"
-
-#: rhodecode/templates/base/base.html:137
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:139
-#: rhodecode/templates/base/base.html:312
-#: rhodecode/templates/search/search.html:14
-#: rhodecode/templates/search/search.html:54
-msgid "Search"
-msgstr "搜尋"
-
-#: rhodecode/templates/base/base.html:145
-msgid "Lock"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:153
-msgid "Follow"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:154
-msgid "Unfollow"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:157
-#: rhodecode/templates/data_table/_dt_elements.html:33
-#: rhodecode/templates/data_table/_dt_elements.html:35
-#: rhodecode/templates/data_table/_dt_elements.html:37
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/forks/fork.html:9
-msgid "Fork"
-msgstr "分支"
-
-#: rhodecode/templates/base/base.html:159
-msgid "Create Pull Request"
+#: rhodecode/templates/base/base.html:155
+msgid "Options"
+msgstr "選項"
+
+#: rhodecode/templates/base/base.html:163
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:165
-msgid "Show Pull Requests"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:165
-msgid "Pull Requests"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:202
+#: rhodecode/templates/bookmarks/bookmarks.html:58
+#: rhodecode/templates/bookmarks/bookmarks_data.html:13
+#: rhodecode/templates/branches/branches.html:57
+#: rhodecode/templates/branches/branches_data.html:13
+#: rhodecode/templates/tags/tags.html:58
+#: rhodecode/templates/tags/tags_data.html:13
+msgid "Compare"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:167
+#: rhodecode/templates/base/base.html:334
+#: rhodecode/templates/search/search.html:17
+#: rhodecode/templates/search/search.html:57
+msgid "Search"
+msgstr "搜尋"
+
+#: rhodecode/templates/base/base.html:171
+msgid "Unlock"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:173
+msgid "Lock"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:181
+msgid "Follow"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:182
+msgid "Unfollow"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:185
+#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/data_table/_dt_elements.html:39
+#: rhodecode/templates/forks/fork.html:12
+msgid "Fork"
+msgstr "分支"
+
+#: rhodecode/templates/base/base.html:187
+msgid "Create Pull Request"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:193
+#, python-format
+msgid "Show Pull Requests for %s"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:230
 msgid "Not logged in"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:209
+#: rhodecode/templates/base/base.html:237
 msgid "Login to your account"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/templates/base/base.html:260
 msgid "Forgot password ?"
 msgstr "忘記密碼?"
 
-#: rhodecode/templates/base/base.html:255
+#: rhodecode/templates/base/base.html:283
 msgid "Log Out"
 msgstr "登出"
 
-#: rhodecode/templates/base/base.html:274
-msgid "Switch repository"
-msgstr "切換版本庫"
-
-#: rhodecode/templates/base/base.html:286
+#: rhodecode/templates/base/base.html:308
 msgid "Show recent activity"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:287
+#: rhodecode/templates/base/base.html:309
 #: rhodecode/templates/journal/journal.html:4
 msgid "Journal"
 msgstr "日誌"
 
-#: rhodecode/templates/base/base.html:298
+#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:315
+msgid "Public journal"
+msgstr "公開日誌"
+
+#: rhodecode/templates/base/base.html:320
 msgid "Show public gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:303
+#: rhodecode/templates/base/base.html:321
+msgid "Gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:324
+msgid "Create new gist"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:325
 msgid "All public gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:305
+#: rhodecode/templates/base/base.html:327
 msgid "My public gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/base/base.html:328
 msgid "My private gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:311
+#: rhodecode/templates/base/base.html:333
 msgid "Search in repositories"
 msgstr ""
 
+#: rhodecode/templates/base/base.html:394
+msgid "No matches found"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:522
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:531
+msgid "Site-wide shortcuts"
+msgstr ""
+
 #: rhodecode/templates/base/default_perms_box.html:14
-msgid "Inherit default permissions"
-msgstr ""
-
-#: rhodecode/templates/base/default_perms_box.html:18
+msgid "Inherit from defaults"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:19
 #, python-format
 msgid ""
-"Select to inherit permissions from %s settings. With this selected below "
-"options does not apply."
-msgstr ""
-
-#: rhodecode/templates/base/default_perms_box.html:26
+"Select to inherit permissions from %s permissions settings, and default IP "
+"address whitelist."
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:28
 msgid "Create repositories"
 msgstr "建立版本庫"
 
-#: rhodecode/templates/base/default_perms_box.html:30
+#: rhodecode/templates/base/default_perms_box.html:33
 msgid "Select this option to allow repository creation for this user"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.html:35
+#: rhodecode/templates/base/default_perms_box.html:40
 msgid "Create user groups"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.html:39
+#: rhodecode/templates/base/default_perms_box.html:45
 msgid "Select this option to allow user group creation for this user"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.html:44
+#: rhodecode/templates/base/default_perms_box.html:52
 msgid "Fork repositories"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.html:48
+#: rhodecode/templates/base/default_perms_box.html:57
 msgid "Select this option to allow repository forking for this user"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:11
+#: rhodecode/templates/base/perms_summary.html:13
+msgid "show"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:22
 msgid "No permissions defined yet"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:19
-#: rhodecode/templates/base/perms_summary.html:38
+#: rhodecode/templates/base/perms_summary.html:30
+#: rhodecode/templates/base/perms_summary.html:54
 msgid "Permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:20
-#: rhodecode/templates/base/perms_summary.html:39
+#: rhodecode/templates/base/perms_summary.html:32
+#: rhodecode/templates/base/perms_summary.html:56
 msgid "Edit Permission"
 msgstr ""
 
-#: rhodecode/templates/base/root.html:44
+#: rhodecode/templates/base/perms_summary.html:90
+msgid "No permission defined"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:47
 msgid "Add another comment"
 msgstr ""
 
-#: rhodecode/templates/base/root.html:45
-#: rhodecode/templates/data_table/_dt_elements.html:147
+#: rhodecode/templates/base/root.html:48
+#: rhodecode/templates/data_table/_dt_elements.html:216
 msgid "Stop following this repository"
 msgstr "停止追蹤這個版本庫"
 
-#: rhodecode/templates/base/root.html:46
+#: rhodecode/templates/base/root.html:49
 msgid "Start following this repository"
 msgstr "開始追蹤這個版本庫"
 
-#: rhodecode/templates/base/root.html:47
+#: rhodecode/templates/base/root.html:50
 msgid "Group"
 msgstr "群組"
 
-#: rhodecode/templates/base/root.html:48
+#: rhodecode/templates/base/root.html:51
 msgid "members"
 msgstr "成員"
 
-#: rhodecode/templates/base/root.html:49
-#: rhodecode/templates/pullrequests/pullrequest.html:203
+#: rhodecode/templates/base/root.html:52
+#: rhodecode/templates/pullrequests/pullrequest.html:202
 msgid "Loading ..."
 msgstr ""
 
-#: rhodecode/templates/base/root.html:50
-msgid "Search truncated"
-msgstr ""
-
-#: rhodecode/templates/base/root.html:51
-msgid "No matching files"
-msgstr ""
-
-#: rhodecode/templates/base/root.html:52
-#: rhodecode/templates/changelog/changelog.html:45
-msgid "Open new pull request"
-msgstr ""
-
 #: rhodecode/templates/base/root.html:53
-msgid "Open new pull request for selected changesets"
+msgid "loading ..."
 msgstr ""
 
 #: rhodecode/templates/base/root.html:54
-msgid "Show selected changesets __S -> __E"
+msgid "Search truncated"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:55
-msgid "Show selected changeset __S"
+msgid "No matching files"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:56
-msgid "Selection link"
+#: rhodecode/templates/changelog/changelog.html:51
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
+msgid "Open new pull request"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:57
-#: rhodecode/templates/changeset/diff_block.html:8
-msgid "Collapse diff"
+msgid "Open new pull request for selected changesets"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:58
-msgid "Expand diff"
+msgid "Show selected changesets __S -> __E"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:59
+msgid "Show selected changeset __S"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:60
+msgid "Selection link"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:61
+#: rhodecode/templates/changeset/diff_block.html:8
+msgid "Collapse diff"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:62
+msgid "Expand diff"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:63
 msgid "Failed to revoke permission"
 msgstr ""
 
+#: rhodecode/templates/base/root.html:64
+msgid "confirm to revoke permission for {0}: {1} ?"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:68
+msgid "specify changeset"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr ""
 
-#: rhodecode/templates/bookmarks/bookmarks.html:26
-msgid "Compare bookmarks"
-msgstr ""
-
-#: rhodecode/templates/bookmarks/bookmarks.html:51
-#: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:50
-#: rhodecode/templates/branches/branches_data.html:8
+#: rhodecode/templates/bookmarks/bookmarks.html:29
+msgid "Compare Bookmarks"
+msgstr ""
+
+#: rhodecode/templates/bookmarks/bookmarks.html:55
+#: rhodecode/templates/bookmarks/bookmarks_data.html:10
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:10
 #: rhodecode/templates/changelog/changelog_summary_data.html:8
-#: rhodecode/templates/tags/tags.html:51
-#: rhodecode/templates/tags/tags_data.html:8
+#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/tags/tags_data.html:10
 msgid "Author"
 msgstr ""
 
-#: rhodecode/templates/bookmarks/bookmarks.html:52
-#: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:51
-#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/bookmarks/bookmarks.html:56
+#: rhodecode/templates/bookmarks/bookmarks_data.html:12
+#: rhodecode/templates/branches/branches.html:55
+#: rhodecode/templates/branches/branches_data.html:12
 #: rhodecode/templates/changelog/changelog_summary_data.html:5
-#: rhodecode/templates/tags/tags.html:52
-#: rhodecode/templates/tags/tags_data.html:9
+#: rhodecode/templates/tags/tags.html:56
+#: rhodecode/templates/tags/tags_data.html:12
 msgid "Revision"
 msgstr "修訂"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:54
-#: rhodecode/templates/bookmarks/bookmarks_data.html:10
-#: rhodecode/templates/branches/branches.html:53
-#: rhodecode/templates/branches/branches_data.html:10
-#: rhodecode/templates/tags/tags.html:54
-#: rhodecode/templates/tags/tags_data.html:10
-msgid "Compare"
-msgstr ""
-
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
 msgstr ""
 
-#: rhodecode/templates/branches/branches.html:26
-msgid "Compare branches"
+#: rhodecode/templates/branches/branches.html:29
+msgid "Compare Branches"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:6
@@ -3584,93 +4572,110 @@
 msgid "%s Changelog"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:19
+#: rhodecode/templates/changelog/changelog.html:21
 #, python-format
 msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
 msgstr[0] ""
 
-#: rhodecode/templates/changelog/changelog.html:39
+#: rhodecode/templates/changelog/changelog.html:43
 msgid "Clear selection"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:42
+#: rhodecode/templates/changelog/changelog.html:47
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:42
-msgid "Compare fork with parent"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:78
-#: rhodecode/templates/changelog/changelog_summary_data.html:28
-#, python-format
-msgid "Click to open associated pull request #%s"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:102
-#: rhodecode/templates/summary/summary.html:403
-msgid "Show more"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changelog/changelog.html:49
+#, python-format
+msgid "Compare fork with Parent(%s)"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:56
+msgid "Show"
+msgstr "顯示"
+
+#: rhodecode/templates/changelog/changelog.html:82
+#: rhodecode/templates/changelog/changelog_summary_data.html:19
+#, python-format
+msgid ""
+"Changeset status: %s\n"
+"Click to open associated pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:86
+#: rhodecode/templates/compare/compare_cs.html:18
+#, python-format
+msgid "Changeset status: %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:105
+#: rhodecode/templates/compare/compare_cs.html:36
+msgid "Expand commit message"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:114
+msgid "Changeset has comments"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:124
 #: rhodecode/templates/changelog/changelog_summary_data.html:50
-#: rhodecode/templates/changeset/changeset.html:107
-#: rhodecode/templates/changeset/changeset_range.html:86
+#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset_range.html:93
 #, python-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:121
+#: rhodecode/templates/changelog/changelog.html:130
 #: rhodecode/templates/changelog/changelog_summary_data.html:56
-#: rhodecode/templates/changeset/changeset.html:113
-#: rhodecode/templates/changeset/changeset_range.html:92
+#: rhodecode/templates/changeset/changeset.html:100
+#: rhodecode/templates/changeset/changeset_range.html:99
 #, python-format
 msgid "Tag %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:135
 #: rhodecode/templates/changelog/changelog_summary_data.html:61
-#: rhodecode/templates/changeset/changeset.html:117
-#: rhodecode/templates/changeset/changeset_range.html:96
+#: rhodecode/templates/changeset/changeset.html:105
+#: rhodecode/templates/changeset/changeset_range.html:103
 #, python-format
 msgid "Branch %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:286
+#: rhodecode/templates/changelog/changelog.html:299
 msgid "There are no changes yet"
 msgstr "尚未有任何變更"
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:91
+#: rhodecode/templates/changeset/changeset.html:76
 msgid "Removed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:92
+#: rhodecode/templates/changeset/changeset.html:77
 msgid "Changed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:93
+#: rhodecode/templates/changeset/changeset.html:78
 msgid "Added"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:8
 #: rhodecode/templates/changelog/changelog_details.html:9
 #: rhodecode/templates/changelog/changelog_details.html:10
-#: rhodecode/templates/changeset/changeset.html:95
-#: rhodecode/templates/changeset/changeset.html:96
-#: rhodecode/templates/changeset/changeset.html:97
+#: rhodecode/templates/changeset/changeset.html:80
+#: rhodecode/templates/changeset/changeset.html:81
+#: rhodecode/templates/changeset/changeset.html:82
 #, python-format
 msgid "Affected %s files"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:6
-#: rhodecode/templates/files/files_add.html:75
-#: rhodecode/templates/files/files_edit.html:61
+#: rhodecode/templates/files/files_add.html:65
+#: rhodecode/templates/files/files_delete.html:53
 msgid "Commit message"
 msgstr ""
 
@@ -3687,9 +4692,8 @@
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:89
-#: rhodecode/templates/files/files_add.html:38
-#: rhodecode/templates/files/files_browser.html:31
-msgid "Add new file"
+#: rhodecode/templates/files/files_ypjax.html:9
+msgid "Add New File"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:95
@@ -3705,154 +4709,169 @@
 msgid "%s Changeset"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:39
-msgid "No parents"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:49
-msgid "No children"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:62
-#: rhodecode/templates/changeset/changeset_file_comment.html:20
-#: rhodecode/templates/changeset/changeset_range.html:44
+#: rhodecode/templates/changeset/changeset.html:37
+msgid "parent rev."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:43
+msgid "child rev."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:51
+#: rhodecode/templates/changeset/changeset_file_comment.html:41
+#: rhodecode/templates/changeset/changeset_range.html:51
 msgid "Changeset status"
 msgstr ""
 
+#: rhodecode/templates/changeset/changeset.html:55
+#: rhodecode/templates/changeset/diff_block.html:27
+#: rhodecode/templates/files/diff_2way.html:52
+msgid "Raw diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:58
+msgid "Patch diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:61
+#: rhodecode/templates/changeset/diff_block.html:30
+#: rhodecode/templates/files/diff_2way.html:55
+msgid "Download diff"
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset.html:67
-#: rhodecode/templates/changeset/diff_block.html:22
-msgid "Raw diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:68
-msgid "Patch diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:69
-#: rhodecode/templates/changeset/diff_block.html:23
-msgid "Download diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:103
+#: rhodecode/templates/changeset/changeset_file_comment.html:111
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 
-#: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:103
+#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:111
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
 msgstr[0] ""
 
-#: rhodecode/templates/changeset/changeset.html:103
-#: rhodecode/templates/changeset/changeset_range.html:82
+#: rhodecode/templates/changeset/changeset.html:88
+#: rhodecode/templates/changeset/changeset_range.html:89
 msgid "merge"
 msgstr "合併"
 
-#: rhodecode/templates/changeset/changeset.html:126
-#: rhodecode/templates/compare/compare_diff.html:40
-#: rhodecode/templates/pullrequests/pullrequest_show.html:113
+#: rhodecode/templates/changeset/changeset.html:124
+#: rhodecode/templates/compare/compare_diff.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:160
 #, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
 msgstr[0] ""
 
-#: rhodecode/templates/changeset/changeset.html:128
-#: rhodecode/templates/compare/compare_diff.html:42
-#: rhodecode/templates/pullrequests/pullrequest_show.html:115
+#: rhodecode/templates/changeset/changeset.html:126
+#: rhodecode/templates/compare/compare_diff.html:59
+#: rhodecode/templates/pullrequests/pullrequest_show.html:162
 #, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
 msgstr[0] ""
 
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Showing a huge diff might take some time and resources"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:141
-#: rhodecode/templates/changeset/changeset.html:153
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
-#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#: rhodecode/templates/changeset/changeset.html:139
+#: rhodecode/templates/changeset/changeset.html:151
+#: rhodecode/templates/compare/compare_diff.html:75
+#: rhodecode/templates/compare/compare_diff.html:85
+#: rhodecode/templates/pullrequests/pullrequest_show.html:178
+#: rhodecode/templates/pullrequests/pullrequest_show.html:202
 msgid "Show full diff"
 msgstr ""
 
+#: rhodecode/templates/changeset/changeset.html:214
+#: rhodecode/templates/changeset/changeset.html:251
+msgid "no revisions"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:23
+#, python-format
+msgid "Vote on pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:25
+#, python-format
+msgid "Comment on pull request #%s"
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset_file_comment.html:30
-#, python-format
-msgid "Status change on pull request #%s"
+msgid "Status change on changeset"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:32
-#, python-format
-msgid "Comment on pull request #%s"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:55
+msgid "Comment on changeset"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:63
 msgid "Submitting..."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:58
+#: rhodecode/templates/changeset/changeset_file_comment.html:66
 msgid "Commenting on line {1}."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:59
-#: rhodecode/templates/changeset/changeset_file_comment.html:145
+#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:153
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:61
-#: rhodecode/templates/changeset/changeset_file_comment.html:147
+#: rhodecode/templates/changeset/changeset_file_comment.html:69
+#: rhodecode/templates/changeset/changeset_file_comment.html:155
 msgid ""
 "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:65
-#: rhodecode/templates/changeset/changeset_file_comment.html:152
+#: rhodecode/templates/changeset/changeset_file_comment.html:73
+#: rhodecode/templates/changeset/changeset_file_comment.html:166
 msgid "Preview"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:72
-#: rhodecode/templates/changeset/changeset_file_comment.html:170
-msgid "Comment preview"
-msgstr ""
-
 #: rhodecode/templates/changeset/changeset_file_comment.html:80
-#: rhodecode/templates/changeset/changeset_file_comment.html:177
-#: rhodecode/templates/email_templates/changeset_comment.html:16
-#: rhodecode/templates/email_templates/pull_request_comment.html:16
-msgid "Comment"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:81
-msgid "Cancel"
+#: rhodecode/templates/changeset/changeset_file_comment.html:189
+msgid "Comment preview"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:196
+#: rhodecode/templates/email_templates/changeset_comment.html:11
+#: rhodecode/templates/email_templates/pull_request_comment.html:16
+msgid "Comment"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:96
 msgid "You need to be logged in to comment."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:88
+#: rhodecode/templates/changeset/changeset_file_comment.html:96
 msgid "Login now"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:92
+#: rhodecode/templates/changeset/changeset_file_comment.html:100
 msgid "Hide"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:149
-msgid "Change status"
+#: rhodecode/templates/changeset/changeset_file_comment.html:159
+msgid "Vote for pull request status"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:161
+msgid "Change changeset status"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:179
-msgid "Comment and close"
+msgid "Close (when approved or rejected)"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.html:5
@@ -3860,23 +4879,30 @@
 msgid "%s Changesets"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_range.html:52
+#: rhodecode/templates/changeset/changeset_range.html:59
 msgid "Files affected"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:21
+#: rhodecode/templates/files/diff_2way.html:46
 msgid "Show full diff for this file"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:29
+#: rhodecode/templates/changeset/diff_block.html:24
+#: rhodecode/templates/changeset/diff_block.html:68
+#: rhodecode/templates/files/diff_2way.html:49
+msgid "Show full side-by-side diff for this file"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:38
 msgid "Show inline comments"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:53
+#: rhodecode/templates/changeset/diff_block.html:62
 msgid "Show file at latest version in this repo"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:54
+#: rhodecode/templates/changeset/diff_block.html:64
 msgid "Show file at initial version in this repo"
 msgstr ""
 
@@ -3884,81 +4910,78 @@
 msgid "No changesets"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_cs.html:32
+#: rhodecode/templates/compare/compare_cs.html:8
 msgid "Ancestor"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:5
+#: rhodecode/templates/compare/compare_diff.html:6
+#: rhodecode/templates/compare/compare_diff.html:8
 #, python-format
 msgid "%s Compare"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:9
+#: rhodecode/templates/compare/compare_diff.html:16
 msgid "Compare revisions"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:33
-#: rhodecode/templates/pullrequests/pullrequest_show.html:106
+#: rhodecode/templates/compare/compare_diff.html:36
+msgid "Swap"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:38
+msgid "Compare Revisions"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:45
+msgid "Compare revisions, branches, bookmarks or tags."
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:50
+#: rhodecode/templates/pullrequests/pullrequest_show.html:153
 #, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
 msgstr[0] ""
 
-#: rhodecode/templates/compare/compare_diff.html:48
-#: rhodecode/templates/pullrequests/pullrequest_show.html:121
+#: rhodecode/templates/compare/compare_diff.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:168
 msgid "No files"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:58
-#: rhodecode/templates/compare/compare_diff.html:69
-msgid "confirm to show potentially huge diff"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.html:54
-#: rhodecode/templates/summary/summary.html:69
+#: rhodecode/templates/data_table/_dt_elements.html:63
 msgid "Mercurial repository"
 msgstr "Mercurial 版本庫"
 
-#: rhodecode/templates/data_table/_dt_elements.html:56
-#: rhodecode/templates/summary/summary.html:72
+#: rhodecode/templates/data_table/_dt_elements.html:65
 msgid "Git repository"
 msgstr "Git 版本庫"
 
-#: rhodecode/templates/data_table/_dt_elements.html:74
-#, python-format
-msgid "Fork of %s"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.html:88
+#: rhodecode/templates/data_table/_dt_elements.html:72
+msgid "Public repository"
+msgstr "公開的版本庫"
+
+#: rhodecode/templates/data_table/_dt_elements.html:82
+msgid "Repository creating in progress..."
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:96
 msgid "No changesets yet"
 msgstr "尚未有任何變更"
 
-#: rhodecode/templates/data_table/_dt_elements.html:95
-#: rhodecode/templates/data_table/_dt_elements.html:97
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "訂閱 %s rss"
 
-#: rhodecode/templates/data_table/_dt_elements.html:103
-#: rhodecode/templates/data_table/_dt_elements.html:105
+#: rhodecode/templates/data_table/_dt_elements.html:111
+#: rhodecode/templates/data_table/_dt_elements.html:113
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "訂閱 %s atom"
 
-#: rhodecode/templates/data_table/_dt_elements.html:122
-#, python-format
-msgid "Confirm to delete this repository: %s"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.html:137
-#, python-format
-msgid "Confirm to delete this user: %s"
-msgstr ""
-
-#: rhodecode/templates/email_templates/changeset_comment.html:4
-#: rhodecode/templates/email_templates/pull_request.html:4
-#: rhodecode/templates/email_templates/pull_request_comment.html:4
-msgid "URL"
+#: rhodecode/templates/data_table/_dt_elements.html:141
+msgid "Creating"
 msgstr ""
 
 #: rhodecode/templates/email_templates/changeset_comment.html:6
@@ -3966,7 +4989,7 @@
 msgid "%s commented on a %s changeset."
 msgstr ""
 
-#: rhodecode/templates/email_templates/changeset_comment.html:14
+#: rhodecode/templates/email_templates/changeset_comment.html:9
 msgid "The changeset status was changed to"
 msgstr ""
 
@@ -3998,9 +5021,9 @@
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:8
-#: rhodecode/templates/pullrequests/pullrequest.html:34
+#: rhodecode/templates/pullrequests/pullrequest.html:31
 #: rhodecode/templates/pullrequests/pullrequest_data.html:14
-#: rhodecode/templates/pullrequests/pullrequest_show.html:25
+#: rhodecode/templates/pullrequests/pullrequest_show.html:28
 msgid "Title"
 msgstr ""
 
@@ -4021,76 +5044,84 @@
 msgid "View this user here"
 msgstr ""
 
-#: rhodecode/templates/errors/error_document.html:55
+#: rhodecode/templates/errors/error_document.html:47
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr ""
 
+#: rhodecode/templates/files/diff_2way.html:15
+#, python-format
+msgid "%s File side-by-side diff"
+msgstr ""
+
+#: rhodecode/templates/files/diff_2way.html:22
+#: rhodecode/templates/files/file_diff.html:11
+msgid "File diff"
+msgstr "檔案差異"
+
+#: rhodecode/templates/files/diff_2way.html:58
+msgid "ignore white space"
+msgstr ""
+
+#: rhodecode/templates/files/diff_2way.html:59
+msgid "turn on edit mode"
+msgstr ""
+
 #: rhodecode/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr ""
 
-#: rhodecode/templates/files/file_diff.html:8
-msgid "File diff"
-msgstr "檔案差異"
-
 #: rhodecode/templates/files/files.html:4
-#: rhodecode/templates/files/files.html:76
+#: rhodecode/templates/files/files.html:84
 #, python-format
 msgid "%s Files"
 msgstr ""
 
-#: rhodecode/templates/files/files.html:30
-#: rhodecode/templates/files/files_add.html:31
-#: rhodecode/templates/files/files_edit.html:31
-msgid "Branch"
-msgstr ""
-
 #: rhodecode/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:19
-msgid "Add file"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.html:43
-msgid "File Name"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.html:47
-#: rhodecode/templates/files/files_add.html:56
-msgid "or"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.html:47
-#: rhodecode/templates/files/files_add.html:52
-msgid "Upload file"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.html:56
-msgid "Create new file"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.html:61
-#: rhodecode/templates/files/files_edit.html:37
+#: rhodecode/templates/files/files_add.html:25
+msgid "Add new file"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:45
+#: rhodecode/templates/files/files_edit.html:43
 #: rhodecode/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "位置"
 
-#: rhodecode/templates/files/files_add.html:65
-msgid "use / to separate directories"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.html:79
-#: rhodecode/templates/files/files_edit.html:65
+#: rhodecode/templates/files/files_add.html:47
+msgid "Enter filename..."
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:49
+#: rhodecode/templates/files/files_add.html:53
+msgid "or"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:49
+msgid "Upload File"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:53
+msgid "Create New File"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:58
+msgid "New file mode"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:69
+#: rhodecode/templates/files/files_delete.html:57
+#: rhodecode/templates/files/files_edit.html:72
 msgid "Commit changes"
 msgstr "遞交修改"
 
 #: rhodecode/templates/files/files_browser.html:13
-msgid "View"
+msgid "revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:14
@@ -4101,114 +5132,128 @@
 msgid "Next revision"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:23
+#: rhodecode/templates/files/files_browser.html:22
 msgid "Follow current branch"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:27
-msgid "Search file list"
-msgstr ""
-
-#: rhodecode/templates/files/files_browser.html:35
+#: rhodecode/templates/files/files_browser.html:25
+msgid "Search File List"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.html:29
 msgid "Loading file list..."
 msgstr "載入檔案列表..."
 
-#: rhodecode/templates/files/files_browser.html:48
+#: rhodecode/templates/files/files_browser.html:42
 msgid "Size"
 msgstr "大小"
 
-#: rhodecode/templates/files/files_browser.html:49
+#: rhodecode/templates/files/files_browser.html:43
 msgid "Mimetype"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:50
+#: rhodecode/templates/files/files_browser.html:44
 msgid "Last Revision"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:51
+#: rhodecode/templates/files/files_browser.html:45
 msgid "Last modified"
 msgstr "最後修改"
 
-#: rhodecode/templates/files/files_browser.html:52
+#: rhodecode/templates/files/files_browser.html:46
 msgid "Last committer"
 msgstr "最後的遞交者"
 
+#: rhodecode/templates/files/files_delete.html:4
+#, python-format
+msgid "%s Files Delete"
+msgstr ""
+
+#: rhodecode/templates/files/files_delete.html:25
+#: rhodecode/templates/files/files_delete.html:45
+msgid "Delete file"
+msgstr ""
+
 #: rhodecode/templates/files/files_edit.html:4
 #, python-format
-msgid "%s Files Edit"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:19
+msgid "%s File Edit"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:25
 msgid "Edit file"
 msgstr ""
 
-#: rhodecode/templates/files/files_edit.html:47
-#: rhodecode/templates/files/files_source.html:23
-msgid "Show annotation"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:26
-msgid "Download as raw"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:52
+#: rhodecode/templates/files/files_edit.html:53
+#: rhodecode/templates/files/files_source.html:32
+msgid "Show Annotation"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:55
+#: rhodecode/templates/files/files_source.html:35
+msgid "Download as Raw"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:58
 msgid "Source"
 msgstr ""
 
-#: rhodecode/templates/files/files_edit.html:57
+#: rhodecode/templates/files/files_edit.html:63
 msgid "Editing file"
 msgstr ""
 
+#: rhodecode/templates/files/files_edit.html:68
+msgid "Commit Message"
+msgstr ""
+
 #: rhodecode/templates/files/files_history_box.html:2
-msgid "History"
-msgstr "歷史"
-
-#: rhodecode/templates/files/files_history_box.html:9
-msgid "Diff to revision"
-msgstr ""
-
-#: rhodecode/templates/files/files_history_box.html:10
-msgid "Show at revision"
-msgstr ""
-
-#: rhodecode/templates/files/files_history_box.html:11
-msgid "Show full history"
-msgstr ""
-
-#: rhodecode/templates/files/files_history_box.html:16
 #, python-format
 msgid "%s author"
 msgid_plural "%s authors"
 msgstr[0] ""
 
-#: rhodecode/templates/files/files_source.html:6
-msgid "Load file history"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.html:21
-msgid "Show source"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.html:29
-#, python-format
-msgid "Edit on branch:%s"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.html:31
-msgid "Edit on branch:?"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.html:31
+#: rhodecode/templates/files/files_source.html:7
+msgid "Diff to Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:8
+msgid "Show at Revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:10
+msgid "Show Full History"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:11
+msgid "Show Authors"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:30
+msgid "Show Source"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:38
+#, python-format
+msgid "Edit on Branch:%s"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:41
+msgid "Editing binary files not allowed"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:44
 msgid "Editing files allowed only when on branch head revision"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:46
+#: rhodecode/templates/files/files_source.html:45
+msgid "Deleting files allowed only when on branch head revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:61
 #, python-format
 msgid "Binary file (%s)"
 msgstr "二進位檔 (%s)"
 
-#: rhodecode/templates/files/files_source.html:55
+#: rhodecode/templates/files/files_source.html:71
 msgid "File is too big to display"
 msgstr "顯示的檔案太大"
 
@@ -4216,11 +5261,11 @@
 msgid "annotation"
 msgstr ""
 
-#: rhodecode/templates/files/files_ypjax.html:15
-msgid "Go back"
-msgstr ""
-
-#: rhodecode/templates/files/files_ypjax.html:16
+#: rhodecode/templates/files/files_ypjax.html:23
+msgid "Go Back"
+msgstr ""
+
+#: rhodecode/templates/files/files_ypjax.html:24
 msgid "No files at given path"
 msgstr ""
 
@@ -4229,9 +5274,9 @@
 msgid "%s Followers"
 msgstr ""
 
-#: rhodecode/templates/followers/followers.html:9
-#: rhodecode/templates/summary/summary.html:183
-#: rhodecode/templates/summary/summary.html:184
+#: rhodecode/templates/followers/followers.html:12
+#: rhodecode/templates/summary/summary.html:149
+#: rhodecode/templates/summary/summary.html:150
 msgid "Followers"
 msgstr "追蹤者"
 
@@ -4241,35 +5286,35 @@
 
 #: rhodecode/templates/forks/fork.html:5
 #, python-format
-msgid "%s Fork"
-msgstr ""
-
-#: rhodecode/templates/forks/fork.html:28
+msgid "Fork repository %s"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:30
 msgid "Fork name"
 msgstr "分支名稱"
 
-#: rhodecode/templates/forks/fork.html:65
+#: rhodecode/templates/forks/fork.html:71
 msgid "Private"
 msgstr "私有"
 
-#: rhodecode/templates/forks/fork.html:74
+#: rhodecode/templates/forks/fork.html:80
 msgid "Copy permissions"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:78
-msgid "Copy permissions from forked repository"
-msgstr ""
-
 #: rhodecode/templates/forks/fork.html:84
+msgid "Copy permissions from forked repository"
+msgstr ""
+
+#: rhodecode/templates/forks/fork.html:90
 msgid "Update after clone"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:88
+#: rhodecode/templates/forks/fork.html:94
 msgid "Checkout source after making a clone"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:93
-msgid "Fork this repository"
+#: rhodecode/templates/forks/fork.html:99
+msgid "Fork this Repository"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.html:5
@@ -4277,9 +5322,9 @@
 msgid "%s Forks"
 msgstr ""
 
-#: rhodecode/templates/forks/forks.html:9
-#: rhodecode/templates/summary/summary.html:189
-#: rhodecode/templates/summary/summary.html:190
+#: rhodecode/templates/forks/forks.html:12
+#: rhodecode/templates/summary/summary.html:155
+#: rhodecode/templates/summary/summary.html:156
 msgid "Forks"
 msgstr ""
 
@@ -4291,25 +5336,16 @@
 msgid "There are no forks yet"
 msgstr "尚未有任何 fork"
 
-#: rhodecode/templates/journal/journal.html:21
+#: rhodecode/templates/journal/journal.html:24
 msgid "ATOM journal feed"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:22
+#: rhodecode/templates/journal/journal.html:25
 msgid "RSS journal feed"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:32
-msgid "Refresh"
-msgstr ""
-
-#: rhodecode/templates/journal/journal.html:35
-#: rhodecode/templates/journal/public_journal.html:24
-msgid "ATOM feed"
-msgstr ""
-
-#: rhodecode/templates/journal/journal.html:51
-msgid "Watched"
+#: rhodecode/templates/journal/journal.html:57
+msgid "My repos"
 msgstr ""
 
 #: rhodecode/templates/journal/journal_data.html:55
@@ -4317,15 +5353,15 @@
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.html:4
-#: rhodecode/templates/journal/public_journal.html:21
+#: rhodecode/templates/journal/public_journal.html:24
 msgid "Public Journal"
 msgstr "開放日誌"
 
-#: rhodecode/templates/journal/public_journal.html:13
+#: rhodecode/templates/journal/public_journal.html:16
 msgid "ATOM public journal feed"
 msgstr ""
 
-#: rhodecode/templates/journal/public_journal.html:14
+#: rhodecode/templates/journal/public_journal.html:17
 msgid "RSS public journal feed"
 msgstr ""
 
@@ -4334,46 +5370,42 @@
 msgid "New pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:25
-msgid "Create new pull request"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.html:47
+#: rhodecode/templates/pullrequests/pullrequest.html:44
 msgid "Write a short description on this pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:53
+#: rhodecode/templates/pullrequests/pullrequest.html:50
 msgid "Changeset flow"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:60
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+#: rhodecode/templates/pullrequests/pullrequest.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:68
 msgid "Origin repository"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:85
-msgid "Send pull request"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.html:94
-#: rhodecode/templates/pullrequests/pullrequest_show.html:137
+#: rhodecode/templates/pullrequests/pullrequest.html:82
+msgid "Send Pull Request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:91
+#: rhodecode/templates/pullrequests/pullrequest_show.html:104
 msgid "Pull request reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:103
-#: rhodecode/templates/pullrequests/pullrequest_show.html:149
+#: rhodecode/templates/pullrequests/pullrequest.html:100
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
 msgid "owner"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:115
+#: rhodecode/templates/pullrequests/pullrequest.html:114
 msgid "Add reviewer to this pull request."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:129
+#: rhodecode/templates/pullrequests/pullrequest.html:128
 msgid "Detailed compare view"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:150
+#: rhodecode/templates/pullrequests/pullrequest.html:149
 msgid "Destination repository"
 msgstr ""
 
@@ -4382,46 +5414,48 @@
 msgid "%s Pull Request #%s"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:35
+#: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Review status"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:40
-msgid "Pull request status"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:53
+#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:43
+msgid "Pull request status calculated from votes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:56
 msgid "Still not reviewed by"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:57
+#: rhodecode/templates/pullrequests/pullrequest_show.html:60
 #, python-format
 msgid "%d reviewer"
 msgid_plural "%d reviewers"
 msgstr[0] ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:59
+#: rhodecode/templates/pullrequests/pullrequest_show.html:62
 msgid "Pull request was reviewed by all reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:89
-msgid "Created on"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:102
-msgid "Compare view"
+#: rhodecode/templates/pullrequests/pullrequest_show.html:77
+#: rhodecode/templates/pullrequests/pullrequest_show.html:79
+msgid "Pull changes"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:116
+msgid "reviewer"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:133
+msgid "Add or remove reviewer to this pull request."
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:137
+msgid "Save Changes"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:149
-msgid "reviewer"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:164
-msgid "Add or remove reviewer to this pull request."
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:168
-msgid "Save changes"
+msgid "Compare view"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
@@ -4429,32 +5463,61 @@
 msgid "%s Pull Requests"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
+#, python-format
+msgid "Pull requests from %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:14
+#, python-format
+msgid "Pull requests to %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:38
+#, python-format
+msgid "Show pull requests to %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:40
+#, python-format
+msgid "Show pull requests from %s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:50
+msgid "Hide closed pull requests"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:52
+msgid "Show closed pull requests too"
+msgstr ""
+
 #: rhodecode/templates/search/search.html:6
-msgid "Search repository"
+#, python-format
+msgid "%s Search"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:8
-#: rhodecode/templates/search/search.html:16
+#: rhodecode/templates/search/search.html:19
 msgid "Search in all repositories"
 msgstr ""
 
-#: rhodecode/templates/search/search.html:50
+#: rhodecode/templates/search/search.html:53
 msgid "Search term"
 msgstr "搜尋關鍵字"
 
-#: rhodecode/templates/search/search.html:62
+#: rhodecode/templates/search/search.html:65
 msgid "Search in"
 msgstr "搜尋範圍"
 
-#: rhodecode/templates/search/search.html:65
+#: rhodecode/templates/search/search.html:68
 msgid "File contents"
 msgstr "文件內容"
 
-#: rhodecode/templates/search/search.html:66
+#: rhodecode/templates/search/search.html:69
 msgid "Commit messages"
 msgstr ""
 
-#: rhodecode/templates/search/search.html:67
+#: rhodecode/templates/search/search.html:70
 msgid "File names"
 msgstr "檔案名稱"
 
@@ -4464,6 +5527,75 @@
 msgid "Permission denied"
 msgstr "權限不足"
 
+#: rhodecode/templates/summary/statistics.html:4
+#, python-format
+msgid "%s Statistics"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:19
+#: rhodecode/templates/summary/summary.html:42
+#, python-format
+msgid "%s ATOM feed"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:20
+#: rhodecode/templates/summary/summary.html:43
+#, python-format
+msgid "%s RSS feed"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:39
+#: rhodecode/templates/summary/summary.html:107
+#: rhodecode/templates/summary/summary.html:123
+msgid "Enable"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:42
+msgid "Stats gathered: "
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:91
+#: rhodecode/templates/summary/summary.html:354
+msgid "files"
+msgstr "檔案"
+
+#: rhodecode/templates/summary/statistics.html:115
+#: rhodecode/templates/summary/summary.html:378
+msgid "Show more"
+msgstr ""
+
+#: rhodecode/templates/summary/statistics.html:392
+msgid "commits"
+msgstr "遞交"
+
+#: rhodecode/templates/summary/statistics.html:393
+msgid "files added"
+msgstr "多個檔案新增"
+
+#: rhodecode/templates/summary/statistics.html:394
+msgid "files changed"
+msgstr "多個檔案修改"
+
+#: rhodecode/templates/summary/statistics.html:395
+msgid "files removed"
+msgstr "移除多個檔案"
+
+#: rhodecode/templates/summary/statistics.html:397
+msgid "commit"
+msgstr "遞交"
+
+#: rhodecode/templates/summary/statistics.html:398
+msgid "file added"
+msgstr "檔案新增"
+
+#: rhodecode/templates/summary/statistics.html:399
+msgid "file changed"
+msgstr "檔案修改"
+
+#: rhodecode/templates/summary/statistics.html:400
+msgid "file removed"
+msgstr "移除檔案"
+
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
 msgid "%s Summary"
@@ -4471,170 +5603,85 @@
 
 #: rhodecode/templates/summary/summary.html:16
 #, python-format
-msgid "%s ATOM feed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:17
-#, python-format
-msgid "%s RSS feed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:62
-#, python-format
 msgid "Repository locked by %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:64
+#: rhodecode/templates/summary/summary.html:18
 msgid "Repository unlocked"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:83
-#, python-format
-msgid "Non changable ID %s"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:88
-msgid "Public"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:88
-#: rhodecode/templates/summary/summary.html:89
-msgid "Fork of"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:97
-msgid "Remote clone"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:117
-msgid "Contact"
-msgstr "聯絡方式"
-
-#: rhodecode/templates/summary/summary.html:131
+#: rhodecode/templates/summary/summary.html:76
 msgid "Clone url"
 msgstr "複製連結"
 
-#: rhodecode/templates/summary/summary.html:136
+#: rhodecode/templates/summary/summary.html:81
 msgid "Show by Name"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:137
+#: rhodecode/templates/summary/summary.html:82
 msgid "Show by ID"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:143
+#: rhodecode/templates/summary/summary.html:99
 msgid "Trending files"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:151
-#: rhodecode/templates/summary/summary.html:167
-msgid "Enable"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:159
+#: rhodecode/templates/summary/summary.html:115
 msgid "Download"
 msgstr "下載"
 
-#: rhodecode/templates/summary/summary.html:163
+#: rhodecode/templates/summary/summary.html:119
 msgid "There are no downloads yet"
 msgstr "沒有任何下載"
 
-#: rhodecode/templates/summary/summary.html:165
+#: rhodecode/templates/summary/summary.html:121
 msgid "Downloads are disabled for this repository"
 msgstr "這個版本庫的下載已停用"
 
+#: rhodecode/templates/summary/summary.html:127
+msgid "Download as zip"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:132
+msgid "Check this to download archive with subrepos"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:132
+msgid "with subrepos"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:163
+msgid "Repository Size"
+msgstr ""
+
 #: rhodecode/templates/summary/summary.html:170
-msgid "Download as zip"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:174
-msgid "Check this to download archive with subrepos"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:174
-msgid "with subrepos"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:197
-msgid "Repository Size"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:204
-#: rhodecode/templates/summary/summary.html:206
+#: rhodecode/templates/summary/summary.html:172
 msgid "Feed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:224
-msgid "Commit activity by day / author"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:232
-msgid "enable"
-msgstr "啟用"
-
-#: rhodecode/templates/summary/summary.html:235
-msgid "Stats gathered: "
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:256
+#: rhodecode/templates/summary/summary.html:193
 msgid "Latest changes"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:258
+#: rhodecode/templates/summary/summary.html:195
 msgid "Quick start"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:272
-#, python-format
-msgid "Readme file from revision %s"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:332
+#: rhodecode/templates/summary/summary.html:209
+#, python-format
+msgid "Readme file from revision %s:%s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:299
 #, python-format
 msgid "Download %s as %s"
 msgstr "下載 %s 為 %s"
 
-#: rhodecode/templates/summary/summary.html:379
-msgid "files"
-msgstr "檔案"
-
-#: rhodecode/templates/summary/summary.html:689
-msgid "commits"
-msgstr "遞交"
-
-#: rhodecode/templates/summary/summary.html:690
-msgid "files added"
-msgstr "多個檔案新增"
-
-#: rhodecode/templates/summary/summary.html:691
-msgid "files changed"
-msgstr "多個檔案修改"
-
-#: rhodecode/templates/summary/summary.html:692
-msgid "files removed"
-msgstr "移除多個檔案"
-
-#: rhodecode/templates/summary/summary.html:694
-msgid "commit"
-msgstr "遞交"
-
-#: rhodecode/templates/summary/summary.html:695
-msgid "file added"
-msgstr "檔案新增"
-
-#: rhodecode/templates/summary/summary.html:696
-msgid "file changed"
-msgstr "檔案修改"
-
-#: rhodecode/templates/summary/summary.html:697
-msgid "file removed"
-msgstr "移除檔案"
-
 #: rhodecode/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr ""
 
-#: rhodecode/templates/tags/tags.html:26
+#: rhodecode/templates/tags/tags.html:29
 msgid "Compare tags"
 msgstr ""