translation updates

rhodecode/i18n/en/LC_MESSAGES/rhodecode.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: rhodecode 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-12-14 04:19+0100\n"
+"POT-Creation-Date: 2013-01-28 00:24+0100\n"
 "PO-Revision-Date: 2011-02-25 19:13+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <[e-mail]>\n"
@@ -34,15 +34,15 b' msgstr ""'
 msgid "%s line context"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:314
-#: rhodecode/controllers/pullrequests.py:417
+#: rhodecode/controllers/changeset.py:329
+#: rhodecode/controllers/pullrequests.py:416
 #, python-format
 msgid "Status change -> %s"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:345
+#: rhodecode/controllers/changeset.py:360
 msgid ""
-"Changing status on a changeset associated witha closed pull request is "
+"Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr ""
 
@@ -93,8 +93,8 b' msgstr ""'
 #: rhodecode/templates/changeset/changeset.html:149
 #: rhodecode/templates/compare/compare_diff.html:62
 #: rhodecode/templates/compare/compare_diff.html:73
-#: rhodecode/templates/pullrequests/pullrequest_show.html:94
-#: rhodecode/templates/pullrequests/pullrequest_show.html:153
+#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:171
 msgid "Changeset was too big and was cut off..."
 msgstr ""
 
@@ -111,110 +111,113 b' msgstr ""'
 msgid "There are no files yet %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325
+#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:292
+#: rhodecode/controllers/files.py:281
+msgid "You can only edit files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:295
 #, python-format
-msgid "Edited %s via RhodeCode"
-msgstr ""
-
-#: rhodecode/controllers/files.py:297
+msgid "Edited file %s via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:311
 msgid "No changes"
 msgstr ""
 
-#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372
+#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384
 #, python-format
 msgid "Successfully committed to %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378
+#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/controllers/files.py:344
-#, python-format
-msgid "Added %s via RhodeCode"
-msgstr ""
-
-#: rhodecode/controllers/files.py:358
+#: rhodecode/controllers/files.py:350
+msgid "Added file via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:370
 msgid "No content"
 msgstr ""
 
-#: rhodecode/controllers/files.py:362
+#: rhodecode/controllers/files.py:374
 msgid "No filename"
 msgstr ""
 
-#: rhodecode/controllers/files.py:404
+#: rhodecode/controllers/files.py:416
 msgid "downloads disabled"
 msgstr ""
 
-#: rhodecode/controllers/files.py:415
+#: rhodecode/controllers/files.py:427
 #, python-format
 msgid "Unknown revision %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:417
+#: rhodecode/controllers/files.py:429
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/controllers/files.py:419
+#: rhodecode/controllers/files.py:431
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/controllers/files.py:564
+#: rhodecode/controllers/files.py:576
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74
-#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550
+#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74
+#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78
-#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561
+#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78
+#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:158
+#: rhodecode/controllers/forks.py:165
 #, python-format
 msgid "forked %s repository as %s"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:172
+#: rhodecode/controllers/forks.py:179
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261
+#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318
 msgid "public journal"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322
+#: rhodecode/templates/base/base.html:238
 #: rhodecode/templates/journal/journal.html:12
 msgid "journal"
 msgstr ""
 
-#: rhodecode/controllers/login.py:143
+#: rhodecode/controllers/login.py:142
 msgid "You have successfully registered into rhodecode"
 msgstr ""
 
-#: rhodecode/controllers/login.py:164
+#: rhodecode/controllers/login.py:163
 msgid "Your password reset link was sent"
 msgstr ""
 
-#: rhodecode/controllers/login.py:184
+#: rhodecode/controllers/login.py:183
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556
+#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570
 msgid "Bookmarks"
 msgstr ""
 
@@ -238,7 +241,7 b' msgstr ""'
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:452
+#: rhodecode/controllers/pullrequests.py:451
 msgid "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr ""
 
@@ -254,46 +257,46 b' msgstr ""'
 msgid "An error occurred during this search operation"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:119
-#: rhodecode/controllers/admin/repos.py:272
+#: rhodecode/controllers/settings.py:120
+#: rhodecode/controllers/admin/repos.py:254
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:137
-#: rhodecode/controllers/admin/repos.py:290
+#: rhodecode/controllers/settings.py:138
+#: rhodecode/controllers/admin/repos.py:272
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:162
-#: rhodecode/controllers/admin/repos.py:315
+#: rhodecode/controllers/settings.py:163
+#: rhodecode/controllers/admin/repos.py:297
 #, python-format
 msgid "deleted repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:166
-#: rhodecode/controllers/admin/repos.py:325
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/settings.py:167
+#: rhodecode/controllers/admin/repos.py:307
+#: rhodecode/controllers/admin/repos.py:313
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:185
+#: rhodecode/controllers/settings.py:186
 msgid "unlocked"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:188
+#: rhodecode/controllers/settings.py:189
 msgid "locked"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:190
+#: rhodecode/controllers/settings.py:191
 #, python-format
 msgid "Repository has been %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:194
-#: rhodecode/controllers/admin/repos.py:423
+#: rhodecode/controllers/settings.py:195
+#: rhodecode/controllers/admin/repos.py:405
 msgid "An error occurred during unlocking"
 msgstr ""
 
@@ -370,23 +373,23 b' msgstr ""'
 msgid "error occurred during update of ldap settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:59
-#: rhodecode/controllers/admin/permissions.py:63
-msgid "None"
-msgstr ""
-
 #: rhodecode/controllers/admin/permissions.py:60
 #: rhodecode/controllers/admin/permissions.py:64
-msgid "Read"
+msgid "None"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
-msgid "Write"
+msgid "Read"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:62
 #: rhodecode/controllers/admin/permissions.py:66
+msgid "Write"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
 #: rhodecode/templates/admin/defaults/defaults.html:9
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
@@ -400,225 +403,225 b' msgstr ""'
 #: 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:126
+#: rhodecode/templates/admin/users/user_edit.html:130
 #: rhodecode/templates/admin/users/users.html:9
 #: rhodecode/templates/admin/users_groups/users_group_add.html:8
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:197
-#: rhodecode/templates/base/base.html:350
-#: rhodecode/templates/base/base.html:352
-#: rhodecode/templates/base/base.html:354
+#: rhodecode/templates/base/base.html:203
+#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:328
 msgid "Admin"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:69
+#: rhodecode/controllers/admin/permissions.py:70
 msgid "disabled"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/controllers/admin/permissions.py:72
 msgid "allowed with manual account activation"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:73
+#: rhodecode/controllers/admin/permissions.py:74
 msgid "allowed with automatic account activation"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:75
-#: rhodecode/controllers/admin/permissions.py:78
-msgid "Disabled"
-msgstr ""
-
 #: rhodecode/controllers/admin/permissions.py:76
 #: rhodecode/controllers/admin/permissions.py:79
+msgid "Disabled"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:77
+#: rhodecode/controllers/admin/permissions.py:80
 msgid "Enabled"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:122
+#: rhodecode/controllers/admin/permissions.py:128
 msgid "Default permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:136
+#: rhodecode/controllers/admin/permissions.py:142
 msgid "error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:121
+#: rhodecode/controllers/admin/repos.py:123
 msgid "--REMOVE FORK--"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:190
+#: rhodecode/controllers/admin/repos.py:162
 #, python-format
 msgid "created repository %s from %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:194
+#: rhodecode/controllers/admin/repos.py:166
 #, python-format
 msgid "created repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:225
+#: rhodecode/controllers/admin/repos.py:197
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:320
+#: rhodecode/controllers/admin/repos.py:302
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:349
+#: rhodecode/controllers/admin/repos.py:331
 msgid "An error occurred during deletion of repository user"
 msgstr ""
 
+#: rhodecode/controllers/admin/repos.py:350
+msgid "An error occurred during deletion of repository users groups"
+msgstr ""
+
 #: rhodecode/controllers/admin/repos.py:368
-msgid "An error occurred during deletion of repository users groups"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:386
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:403
+#: rhodecode/controllers/admin/repos.py:385
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:443
+#: rhodecode/controllers/admin/repos.py:425
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
+#: rhodecode/controllers/admin/repos.py:429
+msgid "An error occurred during setting this repository in public journal"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:434 rhodecode/model/validators.py:301
+msgid "Token mismatch"
+msgstr ""
+
 #: rhodecode/controllers/admin/repos.py:447
-msgid "An error occurred during setting this repository in public journal"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300
-msgid "Token mismatch"
+msgid "Pulled from remote location"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:449
+msgid "An error occurred during pull from remote location"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:465
-msgid "Pulled from remote location"
+msgid "Nothing"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:467
-msgid "An error occurred during pull from remote location"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:483
-msgid "Nothing"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:485
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:489
+#: rhodecode/controllers/admin/repos.py:471
 msgid "An error occurred during this operation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:120
+#: rhodecode/controllers/admin/repos_groups.py:136
 #, python-format
 msgid "created repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:133
+#: rhodecode/controllers/admin/repos_groups.py:148
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:167
+#: rhodecode/controllers/admin/repos_groups.py:205
 #, python-format
 msgid "updated repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:180
+#: rhodecode/controllers/admin/repos_groups.py:220
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:198
+#: rhodecode/controllers/admin/repos_groups.py:238
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:206
+#: rhodecode/controllers/admin/repos_groups.py:246
 #, python-format
 msgid "removed repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:212
+#: rhodecode/controllers/admin/repos_groups.py:252
 msgid "Cannot delete this group it still contains subgroups"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:217
-#: rhodecode/controllers/admin/repos_groups.py:222
+#: rhodecode/controllers/admin/repos_groups.py:257
+#: rhodecode/controllers/admin/repos_groups.py:262
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:243
+#: rhodecode/controllers/admin/repos_groups.py:283
 msgid "An error occurred during deletion of group user"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:264
+#: rhodecode/controllers/admin/repos_groups.py:304
 msgid "An error occurred during deletion of group users groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:123
+#: rhodecode/controllers/admin/settings.py:124
 #, python-format
-msgid "Repositories successfully rescanned added: %s,removed: %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:131
+msgid "Repositories successfully rescanned added: %s ; removed: %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:133
 msgid "Whoosh reindex task scheduled"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:162
+#: rhodecode/controllers/admin/settings.py:164
 msgid "Updated application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:166
-#: rhodecode/controllers/admin/settings.py:299
+#: rhodecode/controllers/admin/settings.py:168
+#: rhodecode/controllers/admin/settings.py:301
 msgid "error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:207
+#: rhodecode/controllers/admin/settings.py:209
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:212
+#: rhodecode/controllers/admin/settings.py:214
 msgid "error occurred during updating visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:295
+#: rhodecode/controllers/admin/settings.py:297
 msgid "Updated VCS settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:309
+#: rhodecode/controllers/admin/settings.py:311
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:321
+#: rhodecode/controllers/admin/settings.py:323
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:325
+#: rhodecode/controllers/admin/settings.py:327
 msgid "error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:344
+#: rhodecode/controllers/admin/settings.py:346
 msgid "Email task created"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:399
+#: rhodecode/controllers/admin/settings.py:408
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:430
+#: rhodecode/controllers/admin/settings.py:448
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:445
-#: rhodecode/controllers/admin/users.py:196
+#: rhodecode/controllers/admin/settings.py:463
+#: rhodecode/controllers/admin/users.py:198
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr ""
@@ -637,52 +640,65 b' msgstr ""'
 msgid "User updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:212
+#: rhodecode/controllers/admin/users.py:214
 msgid "successfully deleted user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:217
+#: rhodecode/controllers/admin/users.py:219
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:231
+#: rhodecode/controllers/admin/users.py:233
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:272
+#: rhodecode/controllers/admin/users.py:276
 msgid "Granted 'repository create' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:277
+#: rhodecode/controllers/admin/users.py:281
 msgid "Revoked 'repository create' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:283
+#: rhodecode/controllers/admin/users.py:287
 msgid "Granted 'repository fork' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:288
+#: rhodecode/controllers/admin/users.py:292
 msgid "Revoked 'repository fork' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users.py:298
 #: rhodecode/controllers/admin/users_groups.py:279
 msgid "An error occurred during permissions saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:309
+#: rhodecode/controllers/admin/users.py:312
 #, python-format
 msgid "Added email %s to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:315
+#: rhodecode/controllers/admin/users.py:318
 msgid "An error occurred during email saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:325
+#: rhodecode/controllers/admin/users.py:328
 msgid "Removed email from user"
 msgstr ""
 
+#: rhodecode/controllers/admin/users.py:341
+#, python-format
+msgid "Added ip %s to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:347
+msgid "An error occurred during ip saving"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:359
+msgid "Removed ip from user"
+msgstr ""
+
 #: rhodecode/controllers/admin/users_groups.py:86
 #, python-format
 msgid "created users group %s"
@@ -727,11 +743,16 b' msgstr ""'
 msgid "Revoked 'repository fork' permission to users group"
 msgstr ""
 
-#: rhodecode/lib/auth.py:499
+#: rhodecode/lib/auth.py:509
+#, python-format
+msgid "IP %s not allowed"
+msgstr ""
+
+#: rhodecode/lib/auth.py:558
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
-#: rhodecode/lib/auth.py:540
+#: rhodecode/lib/auth.py:599
 msgid "You need to be a signed in to view this page"
 msgstr ""
 
@@ -884,16 +905,16 b' msgstr ""'
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:883
+#: rhodecode/lib/helpers.py:884
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:887
+#: rhodecode/lib/helpers.py:888
 msgid "No Files"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1163
+#: rhodecode/lib/helpers.py:1164
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -971,92 +992,112 b' msgstr ""'
 msgid "password reset link"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313
 msgid "Repository no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314
 msgid "Repository read access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315
 msgid "Repository write access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316
 msgid "Repository admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318
 msgid "Repositories Group no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319
 msgid "Repositories Group read access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320
 msgid "Repositories Group write access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321
 msgid "Repositories Group admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323
 msgid "RhodeCode Administrator"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324
 msgid "Repository creation disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325
 msgid "Repository creation enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326
 msgid "Repository forking disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327
 msgid "Repository forking enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328
 msgid "Register disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776
 msgid "Not Reviewed"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777
 msgid "Approved"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778
 msgid "Rejected"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779
 msgid "Under Review"
 msgstr ""
 
-#: rhodecode/model/comment.py:110
+#: rhodecode/model/comment.py:109
 #, python-format
 msgid "on line %s"
 msgstr ""
 
-#: rhodecode/model/comment.py:173
+#: rhodecode/model/comment.py:176
 msgid "[Mention]"
 msgstr ""
 
@@ -1108,173 +1149,185 b' msgstr ""'
 msgid "commented on pull request at %(when)s"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:90
+#: rhodecode/model/pull_request.py:100
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr ""
 
-#: rhodecode/model/scm.py:542
+#: rhodecode/model/scm.py:556
 msgid "latest tip"
 msgstr ""
 
-#: rhodecode/model/user.py:232
+#: rhodecode/model/user.py:231
 msgid "new user registration"
 msgstr ""
 
-#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
-#: rhodecode/model/user.py:303
+#: rhodecode/model/user.py:256 rhodecode/model/user.py:280
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:327
+#: rhodecode/model/user.py:302
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:333
+#: rhodecode/model/user.py:308
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories. %s"
 msgstr ""
 
-#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37
+#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38
 msgid "Value cannot be an empty list"
 msgstr ""
 
-#: rhodecode/model/validators.py:83
+#: rhodecode/model/validators.py:84
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:85
+#: rhodecode/model/validators.py:86
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr ""
 
-#: rhodecode/model/validators.py:87
+#: rhodecode/model/validators.py:88
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
 msgstr ""
 
-#: rhodecode/model/validators.py:115
+#: rhodecode/model/validators.py:116
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:134
-msgid "Invalid users group name"
-msgstr ""
-
 #: rhodecode/model/validators.py:135
+msgid "Invalid users group name"
+msgstr ""
+
+#: rhodecode/model/validators.py:136
 #, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:137
+#: rhodecode/model/validators.py:138
 msgid ""
 "users group name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr ""
 
-#: rhodecode/model/validators.py:175
+#: rhodecode/model/validators.py:176
 msgid "Cannot assign this group as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:176
+#: rhodecode/model/validators.py:177
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:178
+#: rhodecode/model/validators.py:179
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:236
+#: rhodecode/model/validators.py:237
 msgid "Invalid characters (non-ascii) in password"
 msgstr ""
 
-#: rhodecode/model/validators.py:251
+#: rhodecode/model/validators.py:252
 msgid "Passwords do not match"
 msgstr ""
 
-#: rhodecode/model/validators.py:268
-msgid "invalid password"
-msgstr ""
-
 #: rhodecode/model/validators.py:269
-msgid "invalid user name"
+msgid "invalid password"
 msgstr ""
 
 #: rhodecode/model/validators.py:270
+msgid "invalid user name"
+msgstr ""
+
+#: rhodecode/model/validators.py:271
 msgid "Your account is disabled"
 msgstr ""
 
-#: rhodecode/model/validators.py:314
+#: rhodecode/model/validators.py:315
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr ""
 
-#: rhodecode/model/validators.py:316
-#, python-format
-msgid "Repository named %(repo)s already exists"
-msgstr ""
-
 #: rhodecode/model/validators.py:317
 #, python-format
+msgid "Repository named %(repo)s already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:318
+#, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:319
+#: rhodecode/model/validators.py:320
 #, python-format
 msgid "Repositories group with name \"%(repo)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:432
-msgid "invalid clone url"
-msgstr ""
-
 #: rhodecode/model/validators.py:433
+msgid "invalid clone url"
+msgstr ""
+
+#: rhodecode/model/validators.py:434
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 
-#: rhodecode/model/validators.py:458
+#: rhodecode/model/validators.py:459
 msgid "Fork have to be the same type as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:473
+#: rhodecode/model/validators.py:474
 msgid "You don't have permissions to create repository in this group"
 msgstr ""
 
-#: rhodecode/model/validators.py:498
+#: rhodecode/model/validators.py:501
+msgid "You don't have permissions to create a group in this location"
+msgstr ""
+
+#: rhodecode/model/validators.py:540
 msgid "This username or users group name is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:591
+#: rhodecode/model/validators.py:636
 msgid "This is not a valid path"
 msgstr ""
 
-#: rhodecode/model/validators.py:606
+#: rhodecode/model/validators.py:651
 msgid "This e-mail address is already taken"
 msgstr ""
 
-#: rhodecode/model/validators.py:626
+#: rhodecode/model/validators.py:671
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr ""
 
-#: rhodecode/model/validators.py:663
+#: rhodecode/model/validators.py:708
 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:682
+#: rhodecode/model/validators.py:727
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
+#: rhodecode/model/validators.py:759
+msgid "Please enter a valid IPv4 or IpV6 address"
+msgstr ""
+
+#: rhodecode/model/validators.py:760
+#, python-format
+msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
+msgstr ""
+
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr ""
@@ -1287,43 +1340,54 b' msgstr ""'
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 #: rhodecode/templates/branches/branches.html:9
 #: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:48
+#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:50
 #: rhodecode/templates/tags/tags.html:10
 msgid "quick filter..."
 msgstr ""
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:233
+#: rhodecode/templates/base/base.html:239
 msgid "repositories"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:13
-#: rhodecode/templates/index_base.html:15
+#: rhodecode/templates/index_base.html:14
+#: rhodecode/templates/index_base.html:17
+#: rhodecode/templates/admin/repos/repo_add.html:5
+#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
 #: rhodecode/templates/admin/repos/repos.html:21
-msgid "ADD REPOSITORY"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:29
-#: rhodecode/templates/index_base.html:136
+msgid "Add repository"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:23
+msgid "Edit group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:23
+msgid "You have admin right to this group, and can edit it"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:36
+#: rhodecode/templates/index_base.html:140
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
 #: rhodecode/templates/admin/users_groups/users_group_add.html:32
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33
 msgid "Group name"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:30
-#: rhodecode/templates/index_base.html:72
-#: rhodecode/templates/index_base.html:138
-#: rhodecode/templates/index_base.html:176
-#: rhodecode/templates/index_base.html:266
+#: rhodecode/templates/index_base.html:37
+#: rhodecode/templates/index_base.html:79
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/index_base.html:180
+#: rhodecode/templates/index_base.html:273
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
-#: rhodecode/templates/admin/repos/repos.html:72
+#: rhodecode/templates/admin/repos/repos.html:73
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
 #: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:66
@@ -1331,31 +1395,29 b' msgstr ""'
 msgid "Description"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:40
+#: rhodecode/templates/index_base.html:47
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47
 msgid "Repositories group"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:71
-#: rhodecode/templates/index_base.html:174
-#: rhodecode/templates/index_base.html:264
+#: rhodecode/templates/index_base.html:78
+#: rhodecode/templates/index_base.html:178
+#: rhodecode/templates/index_base.html:271
+#: rhodecode/templates/admin/permissions/permissions.html:117
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
-#: rhodecode/templates/admin/repos/repos.html:70
-#: rhodecode/templates/admin/users/user_edit.html:196
-#: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:180
-#: rhodecode/templates/admin/users/user_edit_my_account.html:216
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
+#: rhodecode/templates/admin/repos/repos.html:71
+#: rhodecode/templates/admin/users/user_edit.html:200
+#: rhodecode/templates/admin/users/user_edit_my_account.html:60
+#: rhodecode/templates/admin/users/user_edit_my_account.html:211
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:184
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
 #: rhodecode/templates/branches/branches.html:50
 #: rhodecode/templates/branches/branches_data.html:6
 #: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:70
-#: rhodecode/templates/journal/journal.html:196
-#: rhodecode/templates/journal/journal_page_repos.html:7
+#: rhodecode/templates/journal/journal.html:201
+#: rhodecode/templates/journal/journal.html:305
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
 #: rhodecode/templates/summary/summary.html:132
@@ -1364,99 +1426,107 b' msgstr ""'
 msgid "Name"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:73
+#: rhodecode/templates/index_base.html:80
 msgid "Last change"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:74
-#: rhodecode/templates/index_base.html:179
-#: rhodecode/templates/admin/users/user_edit_my_account.html:182
-#: rhodecode/templates/journal/journal.html:198
+#: rhodecode/templates/index_base.html:81
+#: rhodecode/templates/index_base.html:183
+#: rhodecode/templates/index_base.html:276
+#: rhodecode/templates/admin/repos/repos.html:74
+#: rhodecode/templates/admin/users/user_edit_my_account.html:213
+#: rhodecode/templates/journal/journal.html:203
+#: rhodecode/templates/journal/journal.html:307
 msgid "Tip"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:75
-#: rhodecode/templates/index_base.html:181
-#: rhodecode/templates/index_base.html:269
+#: rhodecode/templates/index_base.html:82
+#: rhodecode/templates/index_base.html:185
+#: rhodecode/templates/index_base.html:278
 #: rhodecode/templates/admin/repos/repo_edit.html:121
-#: rhodecode/templates/admin/repos/repos.html:73
+#: rhodecode/templates/admin/repos/repos.html:76
 msgid "Owner"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:76
+#: rhodecode/templates/index_base.html:83
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:77
+#: rhodecode/templates/index_base.html:84
 msgid "Atom"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:167
-#: rhodecode/templates/index_base.html:207
-#: rhodecode/templates/index_base.html:291
-#: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:202
+#: rhodecode/templates/index_base.html:171
+#: rhodecode/templates/index_base.html:211
+#: rhodecode/templates/index_base.html:300
+#: rhodecode/templates/admin/repos/repos.html:97
+#: rhodecode/templates/admin/users/user_edit_my_account.html:235
 #: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
 #: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:221
+#: rhodecode/templates/journal/journal.html:225
+#: rhodecode/templates/journal/journal.html:329
 #: rhodecode/templates/tags/tags.html:77
 msgid "Click to sort ascending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:168
-#: rhodecode/templates/index_base.html:208
-#: rhodecode/templates/index_base.html:292
-#: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:203
+#: rhodecode/templates/index_base.html:172
+#: rhodecode/templates/index_base.html:212
+#: rhodecode/templates/index_base.html:301
+#: rhodecode/templates/admin/repos/repos.html:98
+#: rhodecode/templates/admin/users/user_edit_my_account.html:236
 #: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:222
+#: rhodecode/templates/journal/journal.html:226
+#: rhodecode/templates/journal/journal.html:330
 #: rhodecode/templates/tags/tags.html:78
 msgid "Click to sort descending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:177
-#: rhodecode/templates/index_base.html:267
+#: rhodecode/templates/index_base.html:181
+#: rhodecode/templates/index_base.html:274
 msgid "Last Change"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:209
-#: rhodecode/templates/index_base.html:293
-#: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:204
+#: rhodecode/templates/index_base.html:213
+#: rhodecode/templates/index_base.html:302
+#: rhodecode/templates/admin/repos/repos.html:99
+#: rhodecode/templates/admin/users/user_edit_my_account.html:237
 #: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
 #: rhodecode/templates/branches/branches.html:78
-#: rhodecode/templates/journal/journal.html:223
+#: rhodecode/templates/journal/journal.html:227
+#: rhodecode/templates/journal/journal.html:331
 #: rhodecode/templates/tags/tags.html:79
 msgid "No records found."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:210
-#: rhodecode/templates/index_base.html:294
-#: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:205
+#: rhodecode/templates/index_base.html:214
+#: rhodecode/templates/index_base.html:303
+#: rhodecode/templates/admin/repos/repos.html:100
+#: rhodecode/templates/admin/users/user_edit_my_account.html:238
 #: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:79
-#: rhodecode/templates/journal/journal.html:224
+#: rhodecode/templates/journal/journal.html:228
+#: rhodecode/templates/journal/journal.html:332
 #: rhodecode/templates/tags/tags.html:80
 msgid "Data error."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:211
-#: rhodecode/templates/index_base.html:295
-#: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:206
+#: rhodecode/templates/index_base.html:215
+#: rhodecode/templates/index_base.html:304
+#: rhodecode/templates/admin/repos/repos.html:101
+#: rhodecode/templates/admin/users/user_edit_my_account.html:105
+#: rhodecode/templates/admin/users/user_edit_my_account.html:239
 #: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:80
-#: rhodecode/templates/journal/journal.html:62
-#: rhodecode/templates/journal/journal.html:225
+#: rhodecode/templates/journal/journal.html:229
+#: rhodecode/templates/journal/journal.html:333
 #: rhodecode/templates/tags/tags.html:81
 msgid "Loading..."
 msgstr ""
@@ -1472,9 +1542,9 b' msgstr ""'
 #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
 #: rhodecode/templates/admin/admin_log.html:5
 #: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:50
+#: rhodecode/templates/admin/users/user_edit.html:54
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
-#: rhodecode/templates/base/base.html:83
+#: rhodecode/templates/base/base.html:89
 #: rhodecode/templates/summary/summary.html:131
 msgid "Username"
 msgstr ""
@@ -1482,7 +1552,7 b' msgstr ""'
 #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
 #: rhodecode/templates/admin/ldap/ldap.html:46
 #: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:92
+#: rhodecode/templates/base/base.html:98
 msgid "Password"
 msgstr ""
 
@@ -1494,7 +1564,7 b' msgstr ""'
 msgid "Forgot your password ?"
 msgstr ""
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109
 msgid "Don't have an account ?"
 msgstr ""
 
@@ -1532,22 +1602,22 b' msgstr ""'
 
 #: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:90
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
+#: rhodecode/templates/admin/users/user_edit.html:94
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57
 msgid "First Name"
 msgstr ""
 
 #: rhodecode/templates/register.html:56
 #: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:99
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
+#: rhodecode/templates/admin/users/user_edit.html:103
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66
 msgid "Last Name"
 msgstr ""
 
 #: rhodecode/templates/register.html:65
 #: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:108
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
+#: rhodecode/templates/admin/users/user_edit.html:112
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75
 #: rhodecode/templates/summary/summary.html:133
 msgid "Email"
 msgstr ""
@@ -1626,11 +1696,10 b' msgstr[0] ""'
 msgstr[1] ""
 
 #: rhodecode/templates/admin/admin_log.html:6
-#: rhodecode/templates/admin/repos/repos.html:74
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:10
+#: rhodecode/templates/admin/repos/repos.html:77
+#: rhodecode/templates/admin/users/user_edit_my_account.html:215
+#: rhodecode/templates/journal/journal.html:205
+#: rhodecode/templates/journal/journal.html:309
 msgid "Action"
 msgstr ""
 
@@ -1704,7 +1773,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/defaults/defaults.html:75
 #: rhodecode/templates/admin/repos/repo_edit.html:112
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71
 msgid "Enable locking"
 msgstr ""
 
@@ -1715,12 +1784,13 b' msgstr ""'
 
 #: rhodecode/templates/admin/defaults/defaults.html:84
 #: rhodecode/templates/admin/ldap/ldap.html:89
+#: rhodecode/templates/admin/permissions/permissions.html:92
 #: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79
 #: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_edit.html:133
-#: rhodecode/templates/admin/users/user_edit.html:178
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
+#: rhodecode/templates/admin/users/user_edit.html:137
+#: rhodecode/templates/admin/users/user_edit.html:182
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135
 #: rhodecode/templates/settings/repo_settings.html:94
 msgid "Save"
@@ -1813,8 +1883,8 b' msgid "Comments"'
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:267
-#: rhodecode/templates/base/base.html:269
+#: rhodecode/templates/base/base.html:272
+#: rhodecode/templates/base/base.html:274
 msgid "Pull requests"
 msgstr ""
 
@@ -1841,8 +1911,8 b' msgstr ""'
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:134
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
-#: rhodecode/templates/admin/users/user_edit.html:143
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63
+#: rhodecode/templates/admin/users/user_edit.html:147
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
 #: rhodecode/templates/settings/repo_settings.html:86
 msgid "Permissions"
@@ -1896,19 +1966,107 b' msgstr ""'
 msgid "Repository forking"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:92
-#: rhodecode/templates/admin/repos/repo_edit.html:264
-msgid "set"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
-msgid "Add repository"
+#: rhodecode/templates/admin/permissions/permissions.html:93
+#: rhodecode/templates/admin/permissions/permissions.html:209
+#: rhodecode/templates/admin/repos/repo_edit.html:142
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80
+#: rhodecode/templates/admin/settings/settings.html:113
+#: rhodecode/templates/admin/settings/settings.html:179
+#: rhodecode/templates/admin/settings/settings.html:269
+#: rhodecode/templates/admin/users/user_edit.html:138
+#: rhodecode/templates/admin/users/user_edit.html:183
+#: rhodecode/templates/admin/users/user_edit.html:286
+#: rhodecode/templates/admin/users/user_edit.html:334
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
+#: rhodecode/templates/files/files_add.html:82
+#: rhodecode/templates/files/files_edit.html:68
+#: rhodecode/templates/pullrequests/pullrequest.html:124
+#: rhodecode/templates/settings/repo_settings.html:95
+msgid "Reset"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:103
+msgid "Default User Permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:111
+#: rhodecode/templates/admin/users/user_edit.html:194
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
+msgid "Nothing here yet"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:118
+#: rhodecode/templates/admin/users/user_edit.html:201
+#: rhodecode/templates/admin/users/user_edit_my_account.html:61
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
+msgid "Permission"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:119
+#: rhodecode/templates/admin/users/user_edit.html:202
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
+msgid "Edit Permission"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:149
+#: rhodecode/templates/admin/permissions/permissions.html:151
+#: rhodecode/templates/admin/repos/repo_edit.html:13
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/users/user_edit.html:13
+#: rhodecode/templates/admin/users/user_edit.html:232
+#: rhodecode/templates/admin/users/user_edit.html:234
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
+#: rhodecode/templates/data_table/_dt_elements.html:116
+#: rhodecode/templates/data_table/_dt_elements.html:117
+msgid "edit"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:168
+#: rhodecode/templates/admin/users/user_edit.html:295
+msgid "Allowed IP addresses"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:182
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
+#: rhodecode/templates/admin/users/user_edit.html:263
+#: rhodecode/templates/admin/users/user_edit.html:308
+#: rhodecode/templates/admin/users_groups/users_groups.html:44
+#: rhodecode/templates/data_table/_dt_elements.html:122
+#: rhodecode/templates/data_table/_dt_elements.html:130
+msgid "delete"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:183
+#: rhodecode/templates/admin/users/user_edit.html:309
+#, fuzzy, python-format
+msgid "Confirm to delete this ip: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:189
+#: rhodecode/templates/admin/users/user_edit.html:315
+msgid "All IP addresses are allowed"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:200
+#: rhodecode/templates/admin/users/user_edit.html:326
+msgid "New ip address"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:208
+#: rhodecode/templates/admin/users/user_edit.html:285
+#: rhodecode/templates/admin/users/user_edit.html:333
+msgid "Add"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:11
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
+#: rhodecode/templates/base/base.html:154
 msgid "Repositories"
 msgstr ""
 
@@ -1970,19 +2128,6 b' msgstr ""'
 msgid "Edit repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:228
-#: rhodecode/templates/admin/users/user_edit.html:230
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
-#: rhodecode/templates/files/files_source.html:29
-#: rhodecode/templates/journal/journal_page_repos.html:29
-msgid "edit"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:40
 #: rhodecode/templates/settings/repo_settings.html:39
 msgid "Clone uri"
@@ -1997,23 +2142,6 b' msgstr ""'
 msgid "Change owner of this repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
-#: rhodecode/templates/admin/settings/settings.html:113
-#: rhodecode/templates/admin/settings/settings.html:179
-#: rhodecode/templates/admin/settings/settings.html:269
-#: rhodecode/templates/admin/users/user_edit.html:134
-#: rhodecode/templates/admin/users/user_edit.html:179
-#: rhodecode/templates/admin/users/user_edit.html:282
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/files/files_add.html:82
-#: rhodecode/templates/files/files_edit.html:68
-#: rhodecode/templates/pullrequests/pullrequest.html:124
-#: rhodecode/templates/settings/repo_settings.html:95
-msgid "Reset"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr ""
@@ -2082,16 +2210,16 b' msgstr ""'
 
 #: rhodecode/templates/admin/repos/repo_edit.html:203
 #: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:117
+#: rhodecode/templates/admin/users/user_edit.html:121
 #: rhodecode/templates/admin/users_groups/users_group_add.html:41
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42
 msgid "Active"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:218
-#: rhodecode/templates/base/base.html:331
-#: rhodecode/templates/base/base.html:333
-#: rhodecode/templates/base/base.html:335
+#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/base/base.html:308
+#: rhodecode/templates/base/base.html:310
 msgid "Public journal"
 msgstr ""
 
@@ -2141,12 +2269,16 b' msgstr ""'
 msgid "Set as fork of"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit.html:264
+msgid "set"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit.html:268
 msgid "Manually set this repository as a fork of another from the list"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:274
-#: rhodecode/templates/changeset/changeset_file_comment.html:26
+#: rhodecode/templates/changeset/changeset_file_comment.html:41
 msgid "Delete"
 msgstr ""
 
@@ -2186,7 +2318,7 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:6
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
 #: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/base/base.html:229
+#: rhodecode/templates/base/base.html:235
 msgid "admin"
 msgstr ""
 
@@ -2196,8 +2328,7 b' msgid "member"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-#: rhodecode/templates/data_table/_dt_elements.html:67
-#: rhodecode/templates/journal/journal.html:95
+#: rhodecode/templates/data_table/_dt_elements.html:61
 #: rhodecode/templates/summary/summary.html:85
 msgid "private repository"
 msgstr ""
@@ -2240,15 +2371,12 b' msgstr ""'
 
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74
 msgid ""
-"Set or revoke permission to all children of that group, including "
-"repositories and other groups"
+"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:9
-#: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:313
-#: rhodecode/templates/base/base.html:315
-#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:128
 #: rhodecode/templates/bookmarks/bookmarks.html:11
 #: rhodecode/templates/branches/branches.html:10
 #: rhodecode/templates/changelog/changelog.html:10
@@ -2289,7 +2417,7 b' msgid "add new repos group"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55
 msgid "Group parent"
 msgstr ""
 
@@ -2297,7 +2425,7 b' msgstr ""'
 #: rhodecode/templates/admin/users/user_add.html:94
 #: rhodecode/templates/admin/users_groups/users_group_add.html:49
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "save"
 msgstr ""
 
@@ -2309,7 +2437,11 b' msgstr ""'
 msgid "edit repos group"
 msgstr ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26
+msgid "Add new child group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
 msgid ""
 "Enable lock-by-pulling on group. This option will be applied to all other"
 " groups and repositories inside"
@@ -2320,7 +2452,7 b' msgid "Repositories groups administratio'
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
-msgid "ADD NEW GROUP"
+msgid "Add new group"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
@@ -2333,22 +2465,14 b' msgstr ""'
 msgid "action"
 msgstr ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
-#: rhodecode/templates/admin/users/user_edit.html:259
-#: rhodecode/templates/admin/users_groups/users_groups.html:44
-#: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/data_table/_dt_elements.html:121
-msgid "delete"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
 #, 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:63
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68
 msgid "There are no repositories groups yet"
 msgstr ""
 
@@ -2550,7 +2674,7 b' msgid ""'
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:262
-#: rhodecode/templates/base/base.html:221
+#: rhodecode/templates/base/base.html:227
 msgid "unlock"
 msgstr ""
 
@@ -2616,26 +2740,30 b' msgstr ""'
 msgid "API key"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:63
+#: rhodecode/templates/admin/users/user_edit.html:48
+msgid "Your IP"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:67
 msgid "LDAP DN"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:72
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:35
+#: rhodecode/templates/admin/users/user_edit.html:76
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39
 msgid "New password"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:81
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
+#: rhodecode/templates/admin/users/user_edit.html:85
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48
 msgid "New password confirmation"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:151
+#: rhodecode/templates/admin/users/user_edit.html:155
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
 msgid "Inherit default permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:156
+#: rhodecode/templates/admin/users/user_edit.html:160
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113
 #, python-format
 msgid ""
@@ -2643,53 +2771,31 b' msgid ""'
 "options does not have any action"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:162
+#: rhodecode/templates/admin/users/user_edit.html:166
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:170
+#: rhodecode/templates/admin/users/user_edit.html:174
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127
 msgid "Fork repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:190
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
-msgid "Nothing here yet"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:197
-#: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:217
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
-msgid "Permission"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:198
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
-msgid "Edit Permission"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:247
+#: rhodecode/templates/admin/users/user_edit.html:251
 msgid "Email addresses"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:260
+#: rhodecode/templates/admin/users/user_edit.html:264
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:274
+#: rhodecode/templates/admin/users/user_edit.html:278
 msgid "New email address"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:281
-msgid "Add"
-msgstr ""
-
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:124
+#: rhodecode/templates/base/base.html:130
 msgid "My account"
 msgstr ""
 
@@ -2702,7 +2808,7 b' msgid "My permissions"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:57
 msgid "My repos"
 msgstr ""
 
@@ -2711,6 +2817,7 b' msgid "My pull requests"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:45
+#: rhodecode/templates/journal/journal.html:61
 msgid "Add repo"
 msgstr ""
 
@@ -2737,50 +2844,17 b' msgstr ""'
 msgid "Pull request #%s opened by %s on %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7
-#: rhodecode/templates/bookmarks/bookmarks.html:40
-#: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:54
-#: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:8
-#: rhodecode/templates/tags/tags.html:55
-#: rhodecode/templates/tags/tags_data.html:9
-msgid "Revision"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/journal/journal_page_repos.html:29
-msgid "private"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31
-#: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/journal/journal_page_repos.html:32
-#, python-format
-msgid "Confirm to delete this repository: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38
-#: rhodecode/templates/journal/journal_page_repos.html:42
-msgid "No repositories yet"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40
-#: rhodecode/templates/journal/journal_page_repos.html:44
-msgid "create one now"
-msgstr ""
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:235
+#: rhodecode/templates/base/base.html:241
 msgid "users"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:23
-msgid "ADD NEW USER"
+msgid "Add new user"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:77
@@ -2805,7 +2879,7 b' msgid "active"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:238
+#: rhodecode/templates/base/base.html:244
 msgid "ldap"
 msgstr ""
 
@@ -2871,7 +2945,7 b' msgid "Users groups administration"'
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:23
-msgid "ADD NEW USER GROUP"
+msgid "Add new user group"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:32
@@ -2892,149 +2966,152 b' msgstr ""'
 msgid "Submit a bug"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:77
+#: rhodecode/templates/base/base.html:76
+msgid "Not logged in"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:83
 msgid "Login to your account"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:100
+#: rhodecode/templates/base/base.html:106
 msgid "Forgot password ?"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:107
+#: rhodecode/templates/base/base.html:113
 msgid "Log In"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:118
+#: rhodecode/templates/base/base.html:124
 msgid "Inbox"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:322
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:129
+#: rhodecode/templates/base/base.html:297
+#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:301
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/public_journal.html:4
 msgid "Journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:125
+#: rhodecode/templates/base/base.html:131
 msgid "Log Out"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:144
+#: rhodecode/templates/base/base.html:150
 msgid "Switch repository"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:146
-msgid "Products"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:152
-#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47
-msgid "loading..."
+msgid "Products"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:158
-#: rhodecode/templates/base/base.html:160
-#: rhodecode/templates/base/base.html:162
-#: rhodecode/templates/data_table/_dt_elements.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:17
-#: rhodecode/templates/data_table/_dt_elements.html:19
-msgid "Summary"
+#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47
+msgid "loading..."
 msgstr ""
 
 #: rhodecode/templates/base/base.html:166
 #: rhodecode/templates/base/base.html:168
 #: rhodecode/templates/base/base.html:170
+#: rhodecode/templates/data_table/_dt_elements.html:9
+#: rhodecode/templates/data_table/_dt_elements.html:11
+#: rhodecode/templates/data_table/_dt_elements.html:13
+msgid "Summary"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:174
+#: rhodecode/templates/base/base.html:176
+#: rhodecode/templates/base/base.html:178
 #: rhodecode/templates/changelog/changelog.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:23
+#: rhodecode/templates/data_table/_dt_elements.html:17
+#: rhodecode/templates/data_table/_dt_elements.html:19
+#: rhodecode/templates/data_table/_dt_elements.html:21
+msgid "Changelog"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:182
+#: rhodecode/templates/base/base.html:184
+#: rhodecode/templates/base/base.html:186
+msgid "Switch to"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:193
+#: rhodecode/templates/base/base.html:195
+#: rhodecode/templates/base/base.html:197
 #: rhodecode/templates/data_table/_dt_elements.html:25
 #: rhodecode/templates/data_table/_dt_elements.html:27
-msgid "Changelog"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:175
-#: rhodecode/templates/base/base.html:177
-#: rhodecode/templates/base/base.html:179
-msgid "Switch to"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:186
-#: rhodecode/templates/base/base.html:188
-#: rhodecode/templates/base/base.html:190
-#: rhodecode/templates/data_table/_dt_elements.html:31
-#: rhodecode/templates/data_table/_dt_elements.html:33
-#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/data_table/_dt_elements.html:29
 msgid "Files"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:195
-#: rhodecode/templates/base/base.html:199
+#: rhodecode/templates/base/base.html:201
+#: rhodecode/templates/base/base.html:205
 msgid "Options"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:204
-#: rhodecode/templates/base/base.html:206
-msgid "repository settings"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:210
-#: rhodecode/templates/data_table/_dt_elements.html:80
+#: rhodecode/templates/base/base.html:212
+msgid "repository settings"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:216
+#: rhodecode/templates/data_table/_dt_elements.html:74
 #: rhodecode/templates/forks/fork.html:13
 msgid "fork"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50
+#: rhodecode/templates/base/base.html:218
 #: rhodecode/templates/changelog/changelog.html:43
-msgid "Open new pull request"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:215
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:217
-msgid "search"
+msgid "open new pull request"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:221
+msgid "compare fork"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:223
+msgid "search"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:229
 msgid "lock"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:234
-msgid "repositories groups"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:236
-msgid "users groups"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:237
-msgid "permissions"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:239
-msgid "defaults"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:240
+msgid "repositories groups"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:242
+msgid "users groups"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:243
+msgid "permissions"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:245
+msgid "defaults"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:246
 msgid "settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:251
-#: rhodecode/templates/base/base.html:253
+#: rhodecode/templates/base/base.html:256
+#: rhodecode/templates/base/base.html:258
 msgid "Followers"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:259
-#: rhodecode/templates/base/base.html:261
+#: rhodecode/templates/base/base.html:264
+#: rhodecode/templates/base/base.html:266
 msgid "Forks"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:340
-#: rhodecode/templates/base/base.html:342
-#: rhodecode/templates/base/base.html:344
+#: rhodecode/templates/base/base.html:315
+#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:319
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr ""
@@ -3044,7 +3121,7 b' msgid "add another comment"'
 msgstr ""
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:83
+#: rhodecode/templates/data_table/_dt_elements.html:140
 #: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr ""
@@ -3066,6 +3143,10 b' msgstr ""'
 msgid "no matching files"
 msgstr ""
 
+#: rhodecode/templates/base/root.html:50
+msgid "Open new pull request"
+msgstr ""
+
 #: rhodecode/templates/base/root.html:51
 msgid "Open new pull request for selected changesets"
 msgstr ""
@@ -3092,6 +3173,15 b' msgstr ""'
 msgid "Author"
 msgstr ""
 
+#: rhodecode/templates/bookmarks/bookmarks.html:40
+#: rhodecode/templates/bookmarks/bookmarks_data.html:9
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/tags/tags_data.html:9
+msgid "Revision"
+msgstr ""
+
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
@@ -3158,7 +3248,8 b' msgstr ""'
 
 #: rhodecode/templates/changelog/changelog.html:94
 #: rhodecode/templates/shortlog/shortlog_data.html:20
-msgid "Click to open associated pull request"
+#, python-format
+msgid "Click to open associated pull request #%s"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:104
@@ -3197,7 +3288,7 b' msgstr ""'
 msgid "tag"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:301
+#: rhodecode/templates/changelog/changelog.html:302
 msgid "There are no changes yet"
 msgstr ""
 
@@ -3254,7 +3345,7 b' msgid "download diff"'
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:76
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -3262,7 +3353,7 b' msgstr[0] ""'
 msgstr[1] ""
 
 #: rhodecode/templates/changeset/changeset.html:76
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
@@ -3271,7 +3362,7 b' msgstr[1] ""'
 
 #: rhodecode/templates/changeset/changeset.html:122
 #: rhodecode/templates/compare/compare_diff.html:44
-#: rhodecode/templates/pullrequests/pullrequest_show.html:76
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
 #, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
@@ -3280,63 +3371,73 b' msgstr[1] ""'
 
 #: rhodecode/templates/changeset/changeset.html:124
 #: rhodecode/templates/compare/compare_diff.html:46
-#: rhodecode/templates/pullrequests/pullrequest_show.html:78
+#: rhodecode/templates/pullrequests/pullrequest_show.html:96
 #, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:42
-msgid "Submitting..."
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:45
-msgid "Commenting on line {1}."
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:46
-#: rhodecode/templates/changeset/changeset_file_comment.html:121
+#: rhodecode/templates/changeset/changeset_file_comment.html:30
 #, python-format
-msgid "Comments parsed using %s syntax with %s support."
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:48
-#: rhodecode/templates/changeset/changeset_file_comment.html:123
-msgid "Use @username inside this text to send notification to this RhodeCode user"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:59
-#: rhodecode/templates/changeset/changeset_file_comment.html:143
-msgid "Comment"
+msgid "Status from pull request %s"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:32
+#, python-format
+msgid "Comment from pull request %s"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:57
+msgid "Submitting..."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:60
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
+msgid "Commenting on line {1}."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:61
+#: rhodecode/templates/changeset/changeset_file_comment.html:140
+#, python-format
+msgid "Comments parsed using %s syntax with %s support."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:63
+#: rhodecode/templates/changeset/changeset_file_comment.html:142
+msgid "Use @username inside this text to send notification to this RhodeCode user"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:74
+#: rhodecode/templates/changeset/changeset_file_comment.html:162
+msgid "Comment"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:75
+#: rhodecode/templates/changeset/changeset_file_comment.html:86
 msgid "Hide"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 msgid "You need to be logged in to comment."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 msgid "Login now"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:118
+#: rhodecode/templates/changeset/changeset_file_comment.html:137
 msgid "Leave a comment"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:125
+#: rhodecode/templates/changeset/changeset_file_comment.html:144
 msgid "Check this to change current status of code-review for this changeset"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:125
+#: rhodecode/templates/changeset/changeset_file_comment.html:144
 msgid "change status"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:145
+#: rhodecode/templates/changeset/changeset_file_comment.html:164
 msgid "Comment and close"
 msgstr ""
 
@@ -3371,7 +3472,7 b' msgid "No changesets"'
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.html:37
-#: rhodecode/templates/pullrequests/pullrequest_show.html:69
+#: rhodecode/templates/pullrequests/pullrequest_show.html:87
 #, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
@@ -3379,58 +3480,60 b' msgstr[0] ""'
 msgstr[1] ""
 
 #: rhodecode/templates/compare/compare_diff.html:52
-#: rhodecode/templates/pullrequests/pullrequest_show.html:84
+#: rhodecode/templates/pullrequests/pullrequest_show.html:102
 msgid "No files"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:39
-#: rhodecode/templates/data_table/_dt_elements.html:41
-#: rhodecode/templates/data_table/_dt_elements.html:43
+#: rhodecode/templates/data_table/_dt_elements.html:33
+#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/data_table/_dt_elements.html:37
 msgid "Fork"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:60
-#: rhodecode/templates/journal/journal.html:89
+#: rhodecode/templates/data_table/_dt_elements.html:54
 #: rhodecode/templates/summary/summary.html:77
 msgid "Mercurial repository"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:62
-#: rhodecode/templates/journal/journal.html:91
+#: rhodecode/templates/data_table/_dt_elements.html:56
 #: rhodecode/templates/summary/summary.html:80
 msgid "Git repository"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:69
-#: rhodecode/templates/journal/journal.html:97
+#: rhodecode/templates/data_table/_dt_elements.html:63
 #: rhodecode/templates/summary/summary.html:87
 msgid "public repository"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:80
+#: rhodecode/templates/data_table/_dt_elements.html:74
 #: rhodecode/templates/summary/summary.html:96
 #: rhodecode/templates/summary/summary.html:97
 msgid "Fork of"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:94
+#: rhodecode/templates/data_table/_dt_elements.html:88
 msgid "No changesets yet"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:101
-#: rhodecode/templates/data_table/_dt_elements.html:103
+#: 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:109
-#: rhodecode/templates/data_table/_dt_elements.html:111
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:105
 #, 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:131
+#, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
 
@@ -3474,14 +3577,14 b' msgstr ""'
 msgid "description"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request.html:11
+#: rhodecode/templates/email_templates/pull_request.html:7
+msgid "View this pull request here"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request.html:12
 msgid "revisions for reviewing"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request.html:18
-msgid "View this pull request here"
-msgstr ""
-
 #: rhodecode/templates/email_templates/pull_request_comment.html:4
 #, python-format
 msgid "User %s commented on pull request #%s for repository %s"
@@ -3641,7 +3744,7 b' msgstr ""'
 
 #: rhodecode/templates/files/files_edit.html:50
 #: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:53
+#: rhodecode/templates/files/files_source.html:55
 msgid "show as raw"
 msgstr ""
 
@@ -3690,12 +3793,25 b' msgstr ""'
 msgid "show source"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:44
+#: 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
+msgid "Editing files allowed only when on branch head revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:46
 #, python-format
 msgid "Binary file (%s)"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:53
+#: rhodecode/templates/files/files_source.html:55
 msgid "File is too big to display"
 msgstr ""
 
@@ -3770,6 +3886,10 b' msgstr ""'
 msgid "forked"
 msgstr ""
 
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
+msgstr ""
+
 #: rhodecode/templates/forks/forks_data.html:42
 msgid "There are no forks yet"
 msgstr ""
@@ -3797,26 +3917,10 b' msgstr ""'
 msgid "ATOM feed"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:54
 msgid "Watched"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:54
-msgid "ADD"
-msgstr ""
-
-#: rhodecode/templates/journal/journal.html:77
-msgid "following user"
-msgstr ""
-
-#: rhodecode/templates/journal/journal.html:77
-msgid "user"
-msgstr ""
-
-#: rhodecode/templates/journal/journal.html:110
-msgid "You are not following any users or repositories"
-msgstr ""
-
 #: rhodecode/templates/journal/journal_data.html:55
 msgid "No entries yet"
 msgstr ""
@@ -3847,17 +3951,17 b' msgid "Detailed compare view"'
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:100
+#: rhodecode/templates/pullrequests/pullrequest_show.html:118
 msgid "Pull request reviewers"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:130
 msgid "owner"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:127
+#: rhodecode/templates/pullrequests/pullrequest_show.html:145
 msgid "Add reviewer to this pull request."
 msgstr ""
 
@@ -3908,15 +4012,19 b' msgstr[1] ""'
 msgid "pull request was reviewed by all reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:58
+#: rhodecode/templates/pullrequests/pullrequest_show.html:56
+msgid "Origin repository"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:76
 msgid "Created on"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:83
 msgid "Compare view"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:130
 #, fuzzy
 msgid "reviewer"
 msgstr ""
@@ -4194,19 +4302,3 b' msgstr ""'
 msgid "Compare tags"
 msgstr ""
 
-#~ msgid ""
-#~ "%s repository is not mapped to db"
-#~ " perhaps it was created or renamed"
-#~ " from the file system please run "
-#~ "the application again in order to "
-#~ "rescan repositories"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "%s repository is not mapped to db"
-#~ " perhaps it was moved or renamed  "
-#~ "from the filesystem please run the "
-#~ "application again in order to rescan "
-#~ "repositories"
-#~ msgstr ""
-

rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode 1.1.5\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-12-14 04:19+0100\n"
+"POT-Creation-Date: 2013-01-28 00:24+0100\n"
 "PO-Revision-Date: 2012-10-02 11:32+0100\n"
 "Last-Translator: Vincent Duvert <[e-mail]>\n"
 "Language-Team: fr <[e-mail]>\n"
@@ -34,15 +34,16 b' msgstr "Ignorer les espaces et tabulatio'
 msgid "%s line context"
 msgstr "Afficher %s lignes de contexte"
 
-#: rhodecode/controllers/changeset.py:314
-#: rhodecode/controllers/pullrequests.py:417
+#: rhodecode/controllers/changeset.py:329
+#: rhodecode/controllers/pullrequests.py:416
 #, python-format
 msgid "Status change -> %s"
 msgstr "Changement de statut -> %s"
 
-#: rhodecode/controllers/changeset.py:345
+#: rhodecode/controllers/changeset.py:360
+#, fuzzy
 msgid ""
-"Changing status on a changeset associated witha closed pull request is "
+"Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr ""
 "Le changement de statut d’un changeset associé à une pull request fermée "
@@ -99,8 +100,8 b' msgstr "Flux %s de %s"'
 #: rhodecode/templates/changeset/changeset.html:149
 #: rhodecode/templates/compare/compare_diff.html:62
 #: rhodecode/templates/compare/compare_diff.html:73
-#: rhodecode/templates/pullrequests/pullrequest_show.html:94
-#: rhodecode/templates/pullrequests/pullrequest_show.html:153
+#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:171
 msgid "Changeset was too big and was cut off..."
 msgstr "Cet ensemble de changements était trop important et a été découpé…"
 
@@ -117,104 +118,108 b' msgstr "Ajouter un nouveau fichier"'
 msgid "There are no files yet %s"
 msgstr "Il n’y a pas encore de fichiers %s"
 
-#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325
+#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338
 #, 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:292
-#, python-format
-msgid "Edited %s via RhodeCode"
+#: rhodecode/controllers/files.py:281
+msgid "You can only edit files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:295
+#, fuzzy, python-format
+msgid "Edited file %s via RhodeCode"
 msgstr "%s édité via RhodeCode"
 
-#: rhodecode/controllers/files.py:297
+#: rhodecode/controllers/files.py:311
 msgid "No changes"
 msgstr "Aucun changement"
 
-#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372
+#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Commit réalisé avec succès sur %s"
 
-#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378
+#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390
 msgid "Error occurred during commit"
 msgstr "Une erreur est survenue durant le commit"
 
-#: rhodecode/controllers/files.py:344
-#, python-format
-msgid "Added %s via RhodeCode"
+#: rhodecode/controllers/files.py:350
+#, fuzzy
+msgid "Added file via RhodeCode"
 msgstr "%s ajouté par RhodeCode"
 
-#: rhodecode/controllers/files.py:358
+#: rhodecode/controllers/files.py:370
 msgid "No content"
 msgstr "Aucun contenu"
 
-#: rhodecode/controllers/files.py:362
+#: rhodecode/controllers/files.py:374
 msgid "No filename"
 msgstr "Aucun nom de fichier"
 
-#: rhodecode/controllers/files.py:404
+#: rhodecode/controllers/files.py:416
 msgid "downloads disabled"
 msgstr "Les téléchargements sont désactivés"
 
-#: rhodecode/controllers/files.py:415
+#: rhodecode/controllers/files.py:427
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Révision %s inconnue."
 
-#: rhodecode/controllers/files.py:417
+#: rhodecode/controllers/files.py:429
 msgid "Empty repository"
 msgstr "Dépôt vide."
 
-#: rhodecode/controllers/files.py:419
+#: rhodecode/controllers/files.py:431
 msgid "Unknown archive type"
 msgstr "Type d’archive inconnu"
 
-#: rhodecode/controllers/files.py:564
+#: rhodecode/controllers/files.py:576
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr "Changesets"
 
-#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74
-#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550
+#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74
+#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564
 msgid "Branches"
 msgstr "Branches"
 
-#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78
-#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561
+#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78
+#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575
 msgid "Tags"
 msgstr "Tags"
 
-#: rhodecode/controllers/forks.py:158
+#: rhodecode/controllers/forks.py:165
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "dépôt %s forké en tant que %s"
 
-#: rhodecode/controllers/forks.py:172
+#: rhodecode/controllers/forks.py:179
 #, 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:218 rhodecode/controllers/journal.py:261
+#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318
 msgid "public journal"
 msgstr "Journal public"
 
-#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322
+#: rhodecode/templates/base/base.html:238
 #: rhodecode/templates/journal/journal.html:12
 msgid "journal"
 msgstr "Journal"
 
-#: rhodecode/controllers/login.py:143
+#: rhodecode/controllers/login.py:142
 msgid "You have successfully registered into rhodecode"
 msgstr "Vous vous êtes inscrits avec succès à RhodeCode"
 
-#: rhodecode/controllers/login.py:164
+#: rhodecode/controllers/login.py:163
 msgid "Your password reset link was sent"
 msgstr "Un lien de rénitialisation de votre mot de passe vous a été envoyé."
 
-#: rhodecode/controllers/login.py:184
+#: rhodecode/controllers/login.py:183
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
@@ -222,7 +227,7 b' msgstr ""'
 "Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a "
 "été envoyé par e-mail."
 
-#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556
+#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570
 msgid "Bookmarks"
 msgstr "Signets"
 
@@ -246,7 +251,7 b' msgstr "Une erreur est survenue durant l\xe2\x80\x99envoi de la requ\xc3\xaate de pull."'
 msgid "Successfully deleted pull request"
 msgstr "La requête de pull a été supprimée avec succès."
 
-#: rhodecode/controllers/pullrequests.py:452
+#: rhodecode/controllers/pullrequests.py:451
 msgid "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr ""
 
@@ -264,46 +269,46 b' msgstr ""'
 msgid "An error occurred during this search operation"
 msgstr "Une erreur est survenue durant l’opération de recherche."
 
-#: rhodecode/controllers/settings.py:119
-#: rhodecode/controllers/admin/repos.py:272
+#: rhodecode/controllers/settings.py:120
+#: rhodecode/controllers/admin/repos.py:254
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "Dépôt %s mis à jour avec succès."
 
-#: rhodecode/controllers/settings.py:137
-#: rhodecode/controllers/admin/repos.py:290
+#: rhodecode/controllers/settings.py:138
+#: rhodecode/controllers/admin/repos.py:272
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr "Une erreur est survenue lors de la mise à jour du dépôt %s."
 
-#: rhodecode/controllers/settings.py:162
-#: rhodecode/controllers/admin/repos.py:315
+#: rhodecode/controllers/settings.py:163
+#: rhodecode/controllers/admin/repos.py:297
 #, python-format
 msgid "deleted repository %s"
 msgstr "Dépôt %s supprimé"
 
-#: rhodecode/controllers/settings.py:166
-#: rhodecode/controllers/admin/repos.py:325
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/settings.py:167
+#: rhodecode/controllers/admin/repos.py:307
+#: rhodecode/controllers/admin/repos.py:313
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "Erreur pendant la suppression de %s"
 
-#: rhodecode/controllers/settings.py:185
+#: rhodecode/controllers/settings.py:186
 msgid "unlocked"
 msgstr "déverrouillé"
 
-#: rhodecode/controllers/settings.py:188
+#: rhodecode/controllers/settings.py:189
 msgid "locked"
 msgstr "verrouillé"
 
-#: rhodecode/controllers/settings.py:190
+#: rhodecode/controllers/settings.py:191
 #, python-format
 msgid "Repository has been %s"
 msgstr "Le dépôt a été %s."
 
-#: rhodecode/controllers/settings.py:194
-#: rhodecode/controllers/admin/repos.py:423
+#: rhodecode/controllers/settings.py:195
+#: rhodecode/controllers/admin/repos.py:405
 msgid "An error occurred during unlocking"
 msgstr "Une erreur est survenue durant le déverrouillage."
 
@@ -382,23 +387,23 b' msgstr "Impossible d\xe2\x80\x99activer LDAP. La biblioth\xc3\xa8que \xc2\xab\xe2\x80\xafpython-ldap\xe2\x80\xaf\xc2\xbb est manquante."'
 msgid "error occurred during update of ldap settings"
 msgstr "Une erreur est survenue durant la mise à jour des réglages du LDAP."
 
-#: rhodecode/controllers/admin/permissions.py:59
-#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:60
+#: rhodecode/controllers/admin/permissions.py:64
 msgid "None"
 msgstr "Aucun"
 
-#: rhodecode/controllers/admin/permissions.py:60
-#: rhodecode/controllers/admin/permissions.py:64
-msgid "Read"
-msgstr "Lire"
-
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
-msgid "Write"
-msgstr "Écrire"
+msgid "Read"
+msgstr "Lire"
 
 #: rhodecode/controllers/admin/permissions.py:62
 #: rhodecode/controllers/admin/permissions.py:66
+msgid "Write"
+msgstr "Écrire"
+
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
 #: rhodecode/templates/admin/defaults/defaults.html:9
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
@@ -412,235 +417,235 b' msgstr "\xc3\x89crire"'
 #: 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:126
+#: rhodecode/templates/admin/users/user_edit.html:130
 #: rhodecode/templates/admin/users/users.html:9
 #: rhodecode/templates/admin/users_groups/users_group_add.html:8
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:197
-#: rhodecode/templates/base/base.html:350
-#: rhodecode/templates/base/base.html:352
-#: rhodecode/templates/base/base.html:354
+#: rhodecode/templates/base/base.html:203
+#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:328
 msgid "Admin"
 msgstr "Administration"
 
-#: rhodecode/controllers/admin/permissions.py:69
+#: rhodecode/controllers/admin/permissions.py:70
 msgid "disabled"
 msgstr "Désactivé"
 
-#: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/controllers/admin/permissions.py:72
 msgid "allowed with manual account activation"
 msgstr "Autorisé avec activation manuelle du compte"
 
-#: rhodecode/controllers/admin/permissions.py:73
+#: rhodecode/controllers/admin/permissions.py:74
 msgid "allowed with automatic account activation"
 msgstr "Autorisé avec activation automatique du compte"
 
-#: rhodecode/controllers/admin/permissions.py:75
-#: rhodecode/controllers/admin/permissions.py:78
-msgid "Disabled"
-msgstr "Interdite"
-
 #: rhodecode/controllers/admin/permissions.py:76
 #: rhodecode/controllers/admin/permissions.py:79
+msgid "Disabled"
+msgstr "Interdite"
+
+#: rhodecode/controllers/admin/permissions.py:77
+#: rhodecode/controllers/admin/permissions.py:80
 msgid "Enabled"
 msgstr "Autorisée"
 
-#: rhodecode/controllers/admin/permissions.py:122
+#: rhodecode/controllers/admin/permissions.py:128
 msgid "Default permissions updated successfully"
 msgstr "Permissions par défaut mises à jour avec succès"
 
-#: rhodecode/controllers/admin/permissions.py:136
+#: rhodecode/controllers/admin/permissions.py:142
 msgid "error occurred during update of permissions"
 msgstr "erreur pendant la mise à jour des permissions"
 
-#: rhodecode/controllers/admin/repos.py:121
+#: rhodecode/controllers/admin/repos.py:123
 msgid "--REMOVE FORK--"
 msgstr "[Pas un fork]"
 
-#: rhodecode/controllers/admin/repos.py:190
+#: rhodecode/controllers/admin/repos.py:162
 #, python-format
 msgid "created repository %s from %s"
 msgstr "Le dépôt %s a été créé depuis %s."
 
-#: rhodecode/controllers/admin/repos.py:194
+#: rhodecode/controllers/admin/repos.py:166
 #, python-format
 msgid "created repository %s"
 msgstr "Le dépôt %s a été créé."
 
-#: rhodecode/controllers/admin/repos.py:225
+#: rhodecode/controllers/admin/repos.py:197
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr "Une erreur est survenue durant la création du dépôt %s."
 
-#: rhodecode/controllers/admin/repos.py:320
+#: rhodecode/controllers/admin/repos.py:302
 #, 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:349
+#: rhodecode/controllers/admin/repos.py:331
 msgid "An error occurred during deletion of repository user"
 msgstr "Une erreur est survenue durant la suppression de l’utilisateur du dépôt."
 
-#: rhodecode/controllers/admin/repos.py:368
+#: rhodecode/controllers/admin/repos.py:350
 msgid "An error occurred during deletion of repository users groups"
 msgstr ""
 "Une erreur est survenue durant la suppression du groupe d’utilisateurs de"
 " ce dépôt."
 
-#: rhodecode/controllers/admin/repos.py:386
+#: rhodecode/controllers/admin/repos.py:368
 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:403
+#: rhodecode/controllers/admin/repos.py:385
 msgid "An error occurred during cache invalidation"
 msgstr "Une erreur est survenue durant l’invalidation du cache."
 
-#: rhodecode/controllers/admin/repos.py:443
+#: rhodecode/controllers/admin/repos.py:425
 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:447
+#: rhodecode/controllers/admin/repos.py:429
 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:452 rhodecode/model/validators.py:300
+#: rhodecode/controllers/admin/repos.py:434 rhodecode/model/validators.py:301
 msgid "Token mismatch"
 msgstr "Jeton d’authentification incorrect."
 
-#: rhodecode/controllers/admin/repos.py:465
+#: rhodecode/controllers/admin/repos.py:447
 msgid "Pulled from remote location"
 msgstr "Les changements distants ont été récupérés."
 
+#: rhodecode/controllers/admin/repos.py:449
+msgid "An error occurred during pull from remote location"
+msgstr "Une erreur est survenue durant le pull depuis la source distante."
+
+#: rhodecode/controllers/admin/repos.py:465
+msgid "Nothing"
+msgstr "[Aucun dépôt]"
+
 #: rhodecode/controllers/admin/repos.py:467
-msgid "An error occurred during pull from remote location"
-msgstr "Une erreur est survenue durant le pull depuis la source distante."
-
-#: rhodecode/controllers/admin/repos.py:483
-msgid "Nothing"
-msgstr "[Aucun dépôt]"
-
-#: rhodecode/controllers/admin/repos.py:485
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "Le dépôt %s a été marké comme fork de %s"
 
-#: rhodecode/controllers/admin/repos.py:489
+#: rhodecode/controllers/admin/repos.py:471
 msgid "An error occurred during this operation"
 msgstr "Une erreur est survenue durant cette opération."
 
-#: rhodecode/controllers/admin/repos_groups.py:120
+#: rhodecode/controllers/admin/repos_groups.py:136
 #, python-format
 msgid "created repos group %s"
 msgstr "Le groupe de dépôts %s a été créé."
 
-#: rhodecode/controllers/admin/repos_groups.py:133
+#: rhodecode/controllers/admin/repos_groups.py:148
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr "Une erreur est survenue durant la création du groupe de dépôts %s."
 
-#: rhodecode/controllers/admin/repos_groups.py:167
+#: rhodecode/controllers/admin/repos_groups.py:205
 #, python-format
 msgid "updated repos group %s"
 msgstr "Le groupe de dépôts %s a été mis à jour."
 
-#: rhodecode/controllers/admin/repos_groups.py:180
+#: rhodecode/controllers/admin/repos_groups.py:220
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr "Une erreur est survenue durant la mise à jour du groupe de dépôts %s."
 
-#: rhodecode/controllers/admin/repos_groups.py:198
+#: rhodecode/controllers/admin/repos_groups.py:238
 #, 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:206
+#: rhodecode/controllers/admin/repos_groups.py:246
 #, python-format
 msgid "removed repos group %s"
 msgstr "Le groupe de dépôts %s a été supprimé."
 
-#: rhodecode/controllers/admin/repos_groups.py:212
+#: rhodecode/controllers/admin/repos_groups.py:252
 msgid "Cannot delete this group it still contains subgroups"
 msgstr "Impossible de supprimer ce groupe : Il contient des sous-groupes."
 
-#: rhodecode/controllers/admin/repos_groups.py:217
-#: rhodecode/controllers/admin/repos_groups.py:222
+#: rhodecode/controllers/admin/repos_groups.py:257
+#: rhodecode/controllers/admin/repos_groups.py:262
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr "Une erreur est survenue durant la suppression du groupe de dépôts %s."
 
-#: rhodecode/controllers/admin/repos_groups.py:243
+#: rhodecode/controllers/admin/repos_groups.py:283
 msgid "An error occurred during deletion of group user"
 msgstr ""
 "Une erreur est survenue durant la suppression de l’utilisateur du groupe "
 "de dépôts."
 
-#: rhodecode/controllers/admin/repos_groups.py:264
+#: rhodecode/controllers/admin/repos_groups.py:304
 msgid "An error occurred during deletion of group users groups"
 msgstr ""
 "Une erreur est survenue durant la suppression du groupe d’utilisateurs du"
 " groupe de dépôts."
 
-#: rhodecode/controllers/admin/settings.py:123
-#, python-format
-msgid "Repositories successfully rescanned added: %s,removed: %s"
+#: rhodecode/controllers/admin/settings.py:124
+#, fuzzy, python-format
+msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr "Après re-scan : %s ajouté(s), %s enlevé(s)"
 
-#: rhodecode/controllers/admin/settings.py:131
+#: rhodecode/controllers/admin/settings.py:133
 msgid "Whoosh reindex task scheduled"
 msgstr "La tâche de réindexation Whoosh a été planifiée."
 
-#: rhodecode/controllers/admin/settings.py:162
+#: rhodecode/controllers/admin/settings.py:164
 msgid "Updated application settings"
 msgstr "Réglages mis à jour"
 
-#: rhodecode/controllers/admin/settings.py:166
-#: rhodecode/controllers/admin/settings.py:299
+#: rhodecode/controllers/admin/settings.py:168
+#: rhodecode/controllers/admin/settings.py:301
 msgid "error occurred during updating application settings"
 msgstr "Une erreur est survenue durant la mise à jour des options."
 
-#: rhodecode/controllers/admin/settings.py:207
+#: rhodecode/controllers/admin/settings.py:209
 msgid "Updated visualisation settings"
 msgstr "Réglages d’affichage mis à jour."
 
-#: rhodecode/controllers/admin/settings.py:212
+#: rhodecode/controllers/admin/settings.py:214
 msgid "error occurred during updating visualisation settings"
 msgstr "Une erreur est survenue durant la mise à jour des réglages d’affichages."
 
-#: rhodecode/controllers/admin/settings.py:295
+#: rhodecode/controllers/admin/settings.py:297
 msgid "Updated VCS settings"
 msgstr "Réglages des gestionnaires de versions mis à jour."
 
-#: rhodecode/controllers/admin/settings.py:309
+#: rhodecode/controllers/admin/settings.py:311
 msgid "Added new hook"
 msgstr "Le nouveau hook a été ajouté."
 
-#: rhodecode/controllers/admin/settings.py:321
+#: rhodecode/controllers/admin/settings.py:323
 msgid "Updated hooks"
 msgstr "Hooks mis à jour"
 
-#: rhodecode/controllers/admin/settings.py:325
+#: rhodecode/controllers/admin/settings.py:327
 msgid "error occurred during hook creation"
 msgstr "Une erreur est survenue durant la création du hook."
 
-#: rhodecode/controllers/admin/settings.py:344
+#: rhodecode/controllers/admin/settings.py:346
 msgid "Email task created"
 msgstr "La tâche d’e-mail a été créée."
 
-#: rhodecode/controllers/admin/settings.py:399
+#: rhodecode/controllers/admin/settings.py:408
 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:430
+#: rhodecode/controllers/admin/settings.py:448
 msgid "Your account was updated successfully"
 msgstr "Votre compte a été mis à jour avec succès"
 
-#: rhodecode/controllers/admin/settings.py:445
-#: rhodecode/controllers/admin/users.py:196
+#: rhodecode/controllers/admin/settings.py:463
+#: rhodecode/controllers/admin/users.py:198
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr "Une erreur est survenue durant la mise à jour de l’utilisateur %s."
@@ -659,52 +664,67 b' msgstr "Une erreur est survenue durant la cr\xc3\xa9ation de l\xe2\x80\x99utilisateur %s."'
 msgid "User updated successfully"
 msgstr "L’utilisateur a été mis à jour avec succès."
 
-#: rhodecode/controllers/admin/users.py:212
+#: rhodecode/controllers/admin/users.py:214
 msgid "successfully deleted user"
 msgstr "L’utilisateur a été supprimé avec succès."
 
-#: rhodecode/controllers/admin/users.py:217
+#: rhodecode/controllers/admin/users.py:219
 msgid "An error occurred during deletion of user"
 msgstr "Une erreur est survenue durant la suppression de l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:231
+#: rhodecode/controllers/admin/users.py:233
 msgid "You can't edit this user"
 msgstr "Vous ne pouvez pas éditer cet utilisateur"
 
-#: rhodecode/controllers/admin/users.py:272
+#: rhodecode/controllers/admin/users.py:276
 msgid "Granted 'repository create' permission to user"
 msgstr "La permission de création de dépôts a été accordée à l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:277
+#: rhodecode/controllers/admin/users.py:281
 msgid "Revoked 'repository create' permission to user"
 msgstr "La permission de création de dépôts a été révoquée à l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:283
+#: rhodecode/controllers/admin/users.py:287
 msgid "Granted 'repository fork' permission to user"
 msgstr "La permission de fork de dépôts a été accordée à l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:288
+#: rhodecode/controllers/admin/users.py:292
 msgid "Revoked 'repository fork' permission to user"
 msgstr "La permission de fork de dépôts a été révoquée à l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users.py:298
 #: rhodecode/controllers/admin/users_groups.py:279
 msgid "An error occurred during permissions saving"
 msgstr "Une erreur est survenue durant l’enregistrement des permissions."
 
-#: rhodecode/controllers/admin/users.py:309
+#: rhodecode/controllers/admin/users.py:312
 #, python-format
 msgid "Added email %s to user"
 msgstr "L’e-mail « %s » a été ajouté à l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:315
+#: rhodecode/controllers/admin/users.py:318
 msgid "An error occurred during email saving"
 msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail."
 
-#: rhodecode/controllers/admin/users.py:325
+#: rhodecode/controllers/admin/users.py:328
 msgid "Removed email from user"
 msgstr "L’e-mail a été enlevé de l’utilisateur."
 
+#: rhodecode/controllers/admin/users.py:341
+#, fuzzy, python-format
+msgid "Added ip %s to user"
+msgstr "L’e-mail « %s » a été ajouté à l’utilisateur."
+
+#: rhodecode/controllers/admin/users.py:347
+#, fuzzy
+msgid "An error occurred during ip saving"
+msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail."
+
+#: rhodecode/controllers/admin/users.py:359
+#, fuzzy
+msgid "Removed ip from user"
+msgstr "L’e-mail a été enlevé de l’utilisateur."
+
 #: rhodecode/controllers/admin/users_groups.py:86
 #, python-format
 msgid "created users group %s"
@@ -753,11 +773,16 b' msgstr "La permission de fork de d\xc3\xa9p\xc3\xb4ts a \xc3\xa9t\xc3\xa9 accord\xc3\xa9e au groupe d\xe2\x80\x99utilisateur."'
 msgid "Revoked 'repository fork' permission to users group"
 msgstr "La permission de fork de dépôts a été révoquée au groupe d’utilisateurs."
 
-#: rhodecode/lib/auth.py:499
+#: rhodecode/lib/auth.py:509
+#, fuzzy, python-format
+msgid "IP %s not allowed"
+msgstr "Followers de %s"
+
+#: rhodecode/lib/auth.py:558
 msgid "You need to be a registered user to perform this action"
 msgstr "Vous devez être un utilisateur enregistré pour effectuer cette action."
 
-#: rhodecode/lib/auth.py:540
+#: rhodecode/lib/auth.py:599
 msgid "You need to be a signed in to view this page"
 msgstr "Vous devez être connecté pour visualiser cette page."
 
@@ -912,16 +937,16 b' msgstr "[suit maintenant] le d\xc3\xa9p\xc3\xb4t"'
 msgid "[stopped following] repository"
 msgstr "[ne suit plus] le dépôt"
 
-#: rhodecode/lib/helpers.py:883
+#: rhodecode/lib/helpers.py:884
 #, python-format
 msgid " and %s more"
 msgstr "et %s de plus"
 
-#: rhodecode/lib/helpers.py:887
+#: rhodecode/lib/helpers.py:888
 msgid "No Files"
 msgstr "Aucun fichier"
 
-#: rhodecode/lib/helpers.py:1163
+#: rhodecode/lib/helpers.py:1164
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -1002,92 +1027,112 b' msgstr "\xc3\xa0 l\xe2\x80\x99instant"'
 msgid "password reset link"
 msgstr "Réinitialisation du mot de passe"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313
 msgid "Repository no access"
 msgstr "Aucun accès au dépôt"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314
 msgid "Repository read access"
 msgstr "Accès en lecture au dépôt"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315
 msgid "Repository write access"
 msgstr "Accès en écriture au dépôt"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316
 msgid "Repository admin access"
 msgstr "Accès administrateur au dépôt"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318
 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/model/db.py:1189
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319
 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/model/db.py:1190
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320
 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/model/db.py:1191
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321
 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/model/db.py:1193
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323
 msgid "RhodeCode Administrator"
 msgstr "Administrateur RhodeCode"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324
 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/model/db.py:1195
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325
 msgid "Repository creation enabled"
 msgstr "Création de dépôt activée"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326
 msgid "Repository forking disabled"
 msgstr "Fork de dépôt désactivé"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327
 msgid "Repository forking enabled"
 msgstr "Fork de dépôt activé"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328
 msgid "Register disabled"
 msgstr "Enregistrement désactivé"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329
 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/model/db.py:1202
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332
 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/model/db.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776
 msgid "Not Reviewed"
 msgstr "Pas encore relue"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777
 msgid "Approved"
 msgstr "Approuvée "
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778
 msgid "Rejected"
 msgstr "Rejetée"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779
 msgid "Under Review"
 msgstr "En cours de relecture"
 
-#: rhodecode/model/comment.py:110
+#: rhodecode/model/comment.py:109
 #, python-format
 msgid "on line %s"
 msgstr "à la ligne %s"
 
-#: rhodecode/model/comment.py:173
+#: rhodecode/model/comment.py:176
 msgid "[Mention]"
 msgstr "[Mention]"
 
@@ -1139,33 +1184,32 b' msgstr "a ouvert une nouvelle requ\xc3\xaate de pull %(when)s"'
 msgid "commented on pull request at %(when)s"
 msgstr "a commenté sur la requête de pull %(when)s"
 
-#: rhodecode/model/pull_request.py:90
+#: rhodecode/model/pull_request.py:100
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr "%(user)s voudrait que vous examiniez sa requête de pull nº%(pr_id)s"
 
-#: rhodecode/model/scm.py:542
+#: rhodecode/model/scm.py:556
 msgid "latest tip"
 msgstr "Dernier sommet"
 
-#: rhodecode/model/user.py:232
+#: rhodecode/model/user.py:231
 msgid "new user registration"
 msgstr "Nouveau compte utilisateur enregistré"
 
-#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
-#: rhodecode/model/user.py:303
+#: rhodecode/model/user.py:256 rhodecode/model/user.py:280
 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:327
+#: rhodecode/model/user.py:302
 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:333
+#: rhodecode/model/user.py:308
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch "
@@ -1174,21 +1218,21 b' msgstr ""'
 "L’utilisateur « %s » possède %s dépôts et ne peut être supprimé. Changez "
 "les propriétaires de ces dépôts. %s"
 
-#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37
+#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38
 msgid "Value cannot be an empty list"
 msgstr "Cette valeur ne peut être une liste vide."
 
-#: rhodecode/model/validators.py:83
+#: rhodecode/model/validators.py:84
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "Le nom d’utilisateur « %(username)s » existe déjà."
 
-#: rhodecode/model/validators.py:85
+#: rhodecode/model/validators.py:86
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr "Le nom d’utilisateur « %(username)s » n’est pas autorisé"
 
-#: rhodecode/model/validators.py:87
+#: rhodecode/model/validators.py:88
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
@@ -1197,21 +1241,21 b' msgstr ""'
 "numériques ainsi que les caractères suivants : « _ . - ». Il doit "
 "commencer par un caractère alpha-numérique."
 
-#: rhodecode/model/validators.py:115
+#: rhodecode/model/validators.py:116
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide."
 
-#: rhodecode/model/validators.py:134
+#: rhodecode/model/validators.py:135
 msgid "Invalid users group name"
 msgstr "Nom de groupe d’utilisateurs invalide."
 
-#: rhodecode/model/validators.py:135
+#: rhodecode/model/validators.py:136
 #, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr "Le groupe d’utilisateurs « %(usersgroup)s » existe déjà."
 
-#: rhodecode/model/validators.py:137
+#: rhodecode/model/validators.py:138
 msgid ""
 "users group name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
@@ -1220,96 +1264,101 b' msgstr ""'
 "alpha-numériques ainsi que les caractères suivants : « _ . - ». Il doit "
 "commencer par un caractère alpha-numérique."
 
-#: rhodecode/model/validators.py:175
+#: rhodecode/model/validators.py:176
 msgid "Cannot assign this group as parent"
 msgstr "Impossible d’assigner ce groupe en tant que parent."
 
-#: rhodecode/model/validators.py:176
+#: rhodecode/model/validators.py:177
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "Le groupe « %(group_name)s » existe déjà."
 
-#: rhodecode/model/validators.py:178
+#: rhodecode/model/validators.py:179
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "Un dépôt portant le nom « %(group_name)s » existe déjà."
 
-#: rhodecode/model/validators.py:236
+#: rhodecode/model/validators.py:237
 msgid "Invalid characters (non-ascii) in password"
 msgstr "Caractères incorrects (non-ASCII) dans le mot de passe."
 
-#: rhodecode/model/validators.py:251
+#: rhodecode/model/validators.py:252
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas."
 
-#: rhodecode/model/validators.py:268
+#: rhodecode/model/validators.py:269
 msgid "invalid password"
 msgstr "mot de passe invalide"
 
-#: rhodecode/model/validators.py:269
+#: rhodecode/model/validators.py:270
 msgid "invalid user name"
 msgstr "nom d’utilisateur invalide"
 
-#: rhodecode/model/validators.py:270
+#: rhodecode/model/validators.py:271
 msgid "Your account is disabled"
 msgstr "Votre compte est désactivé"
 
-#: rhodecode/model/validators.py:314
+#: rhodecode/model/validators.py:315
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr "Le nom de dépôt « %(repo)s » n’est pas autorisé."
 
-#: rhodecode/model/validators.py:316
+#: rhodecode/model/validators.py:317
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "Un dépôt portant le nom « %(repo)s » existe déjà."
 
-#: rhodecode/model/validators.py:317
+#: rhodecode/model/validators.py:318
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "Le dépôt « %(repo)s » existe déjà dans le groupe « %(group)s »."
 
-#: rhodecode/model/validators.py:319
+#: rhodecode/model/validators.py:320
 #, python-format
 msgid "Repositories group with name \"%(repo)s\" already exists"
 msgstr "Un groupe de dépôts portant le nom « %(repo)s » existe déjà."
 
-#: rhodecode/model/validators.py:432
+#: rhodecode/model/validators.py:433
 msgid "invalid clone url"
 msgstr "URL de clonage invalide."
 
-#: rhodecode/model/validators.py:433
+#: rhodecode/model/validators.py:434
 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:458
+#: rhodecode/model/validators.py:459
 msgid "Fork have to be the same type as parent"
 msgstr "Le fork doit être du même type que le parent."
 
-#: rhodecode/model/validators.py:473
+#: rhodecode/model/validators.py:474
 msgid "You don't have permissions to create repository in this group"
 msgstr "Vous n’avez pas la permission de créer un dépôt dans ce groupe."
 
-#: rhodecode/model/validators.py:498
+#: rhodecode/model/validators.py:501
+#, fuzzy
+msgid "You don't have permissions to create a group in this location"
+msgstr "Vous n’avez pas la permission de créer un dépôt dans ce groupe."
+
+#: rhodecode/model/validators.py:540
 msgid "This username or users group name is not valid"
 msgstr "Ce nom d’utilisateur ou de groupe n’est pas valide."
 
-#: rhodecode/model/validators.py:591
+#: rhodecode/model/validators.py:636
 msgid "This is not a valid path"
 msgstr "Ceci n’est pas un chemin valide"
 
-#: rhodecode/model/validators.py:606
+#: rhodecode/model/validators.py:651
 msgid "This e-mail address is already taken"
 msgstr "Cette adresse e-mail est déjà enregistrée"
 
-#: rhodecode/model/validators.py:626
+#: rhodecode/model/validators.py:671
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "L’adresse e-mail « %(email)s » n’existe pas"
 
-#: rhodecode/model/validators.py:663
+#: rhodecode/model/validators.py:708
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
@@ -1317,13 +1366,22 b' msgstr ""'
 "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom"
 " d’utilisateur."
 
-#: rhodecode/model/validators.py:682
+#: rhodecode/model/validators.py:727
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 "Les révisions %(revs)s font déjà partie de la requête de pull ou on des "
 "statuts définis."
 
+#: rhodecode/model/validators.py:759
+msgid "Please enter a valid IPv4 or IpV6 address"
+msgstr ""
+
+#: rhodecode/model/validators.py:760
+#, python-format
+msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
+msgstr ""
+
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr "Tableau de bord"
@@ -1336,43 +1394,55 b' msgstr "Tableau de bord"'
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 #: rhodecode/templates/branches/branches.html:9
 #: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:48
+#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:50
 #: rhodecode/templates/tags/tags.html:10
 msgid "quick filter..."
 msgstr "Filtre rapide…"
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:233
+#: rhodecode/templates/base/base.html:239
 msgid "repositories"
 msgstr "Dépôts"
 
-#: rhodecode/templates/index_base.html:13
-#: rhodecode/templates/index_base.html:15
+#: rhodecode/templates/index_base.html:14
+#: rhodecode/templates/index_base.html:17
+#: rhodecode/templates/admin/repos/repo_add.html:5
+#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
 #: rhodecode/templates/admin/repos/repos.html:21
-msgid "ADD REPOSITORY"
-msgstr "AJOUTER UN DÉPÔT"
-
-#: rhodecode/templates/index_base.html:29
-#: rhodecode/templates/index_base.html:136
+msgid "Add repository"
+msgstr "Ajouter un dépôt"
+
+#: rhodecode/templates/index_base.html:23
+#, fuzzy
+msgid "Edit group"
+msgstr "Édition du groupe de dépôt"
+
+#: rhodecode/templates/index_base.html:23
+msgid "You have admin right to this group, and can edit it"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:36
+#: rhodecode/templates/index_base.html:140
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
 #: rhodecode/templates/admin/users_groups/users_group_add.html:32
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33
 msgid "Group name"
 msgstr "Nom de groupe"
 
-#: rhodecode/templates/index_base.html:30
-#: rhodecode/templates/index_base.html:72
-#: rhodecode/templates/index_base.html:138
-#: rhodecode/templates/index_base.html:176
-#: rhodecode/templates/index_base.html:266
+#: rhodecode/templates/index_base.html:37
+#: rhodecode/templates/index_base.html:79
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/index_base.html:180
+#: rhodecode/templates/index_base.html:273
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
-#: rhodecode/templates/admin/repos/repos.html:72
+#: rhodecode/templates/admin/repos/repos.html:73
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
 #: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:66
@@ -1380,31 +1450,29 b' msgstr "Nom de groupe"'
 msgid "Description"
 msgstr "Description"
 
-#: rhodecode/templates/index_base.html:40
+#: rhodecode/templates/index_base.html:47
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47
 msgid "Repositories group"
 msgstr "Groupe de dépôts"
 
-#: rhodecode/templates/index_base.html:71
-#: rhodecode/templates/index_base.html:174
-#: rhodecode/templates/index_base.html:264
+#: rhodecode/templates/index_base.html:78
+#: rhodecode/templates/index_base.html:178
+#: rhodecode/templates/index_base.html:271
+#: rhodecode/templates/admin/permissions/permissions.html:117
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
-#: rhodecode/templates/admin/repos/repos.html:70
-#: rhodecode/templates/admin/users/user_edit.html:196
-#: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:180
-#: rhodecode/templates/admin/users/user_edit_my_account.html:216
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
+#: rhodecode/templates/admin/repos/repos.html:71
+#: rhodecode/templates/admin/users/user_edit.html:200
+#: rhodecode/templates/admin/users/user_edit_my_account.html:60
+#: rhodecode/templates/admin/users/user_edit_my_account.html:211
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:184
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
 #: rhodecode/templates/branches/branches.html:50
 #: rhodecode/templates/branches/branches_data.html:6
 #: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:70
-#: rhodecode/templates/journal/journal.html:196
-#: rhodecode/templates/journal/journal_page_repos.html:7
+#: rhodecode/templates/journal/journal.html:201
+#: rhodecode/templates/journal/journal.html:305
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
 #: rhodecode/templates/summary/summary.html:132
@@ -1413,99 +1481,107 b' msgstr "Groupe de d\xc3\xa9p\xc3\xb4ts"'
 msgid "Name"
 msgstr "Nom"
 
-#: rhodecode/templates/index_base.html:73
+#: rhodecode/templates/index_base.html:80
 msgid "Last change"
 msgstr "Dernière modification"
 
-#: rhodecode/templates/index_base.html:74
-#: rhodecode/templates/index_base.html:179
-#: rhodecode/templates/admin/users/user_edit_my_account.html:182
-#: rhodecode/templates/journal/journal.html:198
+#: rhodecode/templates/index_base.html:81
+#: rhodecode/templates/index_base.html:183
+#: rhodecode/templates/index_base.html:276
+#: rhodecode/templates/admin/repos/repos.html:74
+#: rhodecode/templates/admin/users/user_edit_my_account.html:213
+#: rhodecode/templates/journal/journal.html:203
+#: rhodecode/templates/journal/journal.html:307
 msgid "Tip"
 msgstr "Sommet"
 
-#: rhodecode/templates/index_base.html:75
-#: rhodecode/templates/index_base.html:181
-#: rhodecode/templates/index_base.html:269
+#: rhodecode/templates/index_base.html:82
+#: rhodecode/templates/index_base.html:185
+#: rhodecode/templates/index_base.html:278
 #: rhodecode/templates/admin/repos/repo_edit.html:121
-#: rhodecode/templates/admin/repos/repos.html:73
+#: rhodecode/templates/admin/repos/repos.html:76
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: rhodecode/templates/index_base.html:76
+#: rhodecode/templates/index_base.html:83
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr "RSS"
 
-#: rhodecode/templates/index_base.html:77
+#: rhodecode/templates/index_base.html:84
 msgid "Atom"
 msgstr "Atom"
 
-#: rhodecode/templates/index_base.html:167
-#: rhodecode/templates/index_base.html:207
-#: rhodecode/templates/index_base.html:291
-#: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:202
+#: rhodecode/templates/index_base.html:171
+#: rhodecode/templates/index_base.html:211
+#: rhodecode/templates/index_base.html:300
+#: rhodecode/templates/admin/repos/repos.html:97
+#: rhodecode/templates/admin/users/user_edit_my_account.html:235
 #: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
 #: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:221
+#: rhodecode/templates/journal/journal.html:225
+#: rhodecode/templates/journal/journal.html:329
 #: rhodecode/templates/tags/tags.html:77
 msgid "Click to sort ascending"
 msgstr "Tri ascendant"
 
-#: rhodecode/templates/index_base.html:168
-#: rhodecode/templates/index_base.html:208
-#: rhodecode/templates/index_base.html:292
-#: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:203
+#: rhodecode/templates/index_base.html:172
+#: rhodecode/templates/index_base.html:212
+#: rhodecode/templates/index_base.html:301
+#: rhodecode/templates/admin/repos/repos.html:98
+#: rhodecode/templates/admin/users/user_edit_my_account.html:236
 #: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:222
+#: rhodecode/templates/journal/journal.html:226
+#: rhodecode/templates/journal/journal.html:330
 #: rhodecode/templates/tags/tags.html:78
 msgid "Click to sort descending"
 msgstr "Tri descendant"
 
-#: rhodecode/templates/index_base.html:177
-#: rhodecode/templates/index_base.html:267
+#: rhodecode/templates/index_base.html:181
+#: rhodecode/templates/index_base.html:274
 msgid "Last Change"
 msgstr "Dernière modification"
 
-#: rhodecode/templates/index_base.html:209
-#: rhodecode/templates/index_base.html:293
-#: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:204
+#: rhodecode/templates/index_base.html:213
+#: rhodecode/templates/index_base.html:302
+#: rhodecode/templates/admin/repos/repos.html:99
+#: rhodecode/templates/admin/users/user_edit_my_account.html:237
 #: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
 #: rhodecode/templates/branches/branches.html:78
-#: rhodecode/templates/journal/journal.html:223
+#: rhodecode/templates/journal/journal.html:227
+#: rhodecode/templates/journal/journal.html:331
 #: rhodecode/templates/tags/tags.html:79
 msgid "No records found."
 msgstr "Aucun élément n’a été trouvé."
 
-#: rhodecode/templates/index_base.html:210
-#: rhodecode/templates/index_base.html:294
-#: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:205
+#: rhodecode/templates/index_base.html:214
+#: rhodecode/templates/index_base.html:303
+#: rhodecode/templates/admin/repos/repos.html:100
+#: rhodecode/templates/admin/users/user_edit_my_account.html:238
 #: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:79
-#: rhodecode/templates/journal/journal.html:224
+#: rhodecode/templates/journal/journal.html:228
+#: rhodecode/templates/journal/journal.html:332
 #: rhodecode/templates/tags/tags.html:80
 msgid "Data error."
 msgstr "Erreur d’intégrité des données."
 
-#: rhodecode/templates/index_base.html:211
-#: rhodecode/templates/index_base.html:295
-#: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:206
+#: rhodecode/templates/index_base.html:215
+#: rhodecode/templates/index_base.html:304
+#: rhodecode/templates/admin/repos/repos.html:101
+#: rhodecode/templates/admin/users/user_edit_my_account.html:105
+#: rhodecode/templates/admin/users/user_edit_my_account.html:239
 #: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:80
-#: rhodecode/templates/journal/journal.html:62
-#: rhodecode/templates/journal/journal.html:225
+#: rhodecode/templates/journal/journal.html:229
+#: rhodecode/templates/journal/journal.html:333
 #: rhodecode/templates/tags/tags.html:81
 msgid "Loading..."
 msgstr "Chargement…"
@@ -1521,9 +1597,9 b' msgstr "Connexion \xc3\xa0"'
 #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
 #: rhodecode/templates/admin/admin_log.html:5
 #: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:50
+#: rhodecode/templates/admin/users/user_edit.html:54
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
-#: rhodecode/templates/base/base.html:83
+#: rhodecode/templates/base/base.html:89
 #: rhodecode/templates/summary/summary.html:131
 msgid "Username"
 msgstr "Nom d’utilisateur"
@@ -1531,7 +1607,7 b' msgstr "Nom d\xe2\x80\x99utilisateur"'
 #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
 #: rhodecode/templates/admin/ldap/ldap.html:46
 #: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:92
+#: rhodecode/templates/base/base.html:98
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -1543,7 +1619,7 b' msgstr "Se souvenir de moi"'
 msgid "Forgot your password ?"
 msgstr "Mot de passe oublié ?"
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109
 msgid "Don't have an account ?"
 msgstr "Vous n’avez pas de compte ?"
 
@@ -1581,22 +1657,22 b' msgstr "Confirmation"'
 
 #: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:90
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
+#: rhodecode/templates/admin/users/user_edit.html:94
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57
 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:99
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
+#: rhodecode/templates/admin/users/user_edit.html:103
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66
 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:108
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
+#: rhodecode/templates/admin/users/user_edit.html:112
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75
 #: rhodecode/templates/summary/summary.html:133
 msgid "Email"
 msgstr "E-mail"
@@ -1677,11 +1753,10 b' msgstr[0] ""'
 msgstr[1] ""
 
 #: rhodecode/templates/admin/admin_log.html:6
-#: rhodecode/templates/admin/repos/repos.html:74
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:10
+#: rhodecode/templates/admin/repos/repos.html:77
+#: rhodecode/templates/admin/users/user_edit_my_account.html:215
+#: rhodecode/templates/journal/journal.html:205
+#: rhodecode/templates/journal/journal.html:309
 msgid "Action"
 msgstr "Action"
 
@@ -1759,7 +1834,7 b' msgstr "Afficher le menu de t\xc3\xa9l\xc3\xa9chargements sur la page du d\xc3\xa9p\xc3\xb4t."'
 
 #: rhodecode/templates/admin/defaults/defaults.html:75
 #: rhodecode/templates/admin/repos/repo_edit.html:112
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71
 msgid "Enable locking"
 msgstr "Activer le verrouillage"
 
@@ -1770,12 +1845,13 b' msgstr "Activer le verrouillage lors d\xe2\x80\x99un pull sur le d\xc3\xa9p\xc3\xb4t."'
 
 #: rhodecode/templates/admin/defaults/defaults.html:84
 #: rhodecode/templates/admin/ldap/ldap.html:89
+#: rhodecode/templates/admin/permissions/permissions.html:92
 #: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79
 #: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_edit.html:133
-#: rhodecode/templates/admin/users/user_edit.html:178
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
+#: rhodecode/templates/admin/users/user_edit.html:137
+#: rhodecode/templates/admin/users/user_edit.html:182
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135
 #: rhodecode/templates/settings/repo_settings.html:94
 msgid "Save"
@@ -1867,8 +1943,8 b' msgid "Comments"'
 msgstr "Commentaires"
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:267
-#: rhodecode/templates/base/base.html:269
+#: rhodecode/templates/base/base.html:272
+#: rhodecode/templates/base/base.html:274
 msgid "Pull requests"
 msgstr "Requêtes de pull"
 
@@ -1895,8 +1971,8 b' msgstr "Gestion des permissions"'
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:134
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
-#: rhodecode/templates/admin/users/user_edit.html:143
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63
+#: rhodecode/templates/admin/users/user_edit.html:147
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
 #: rhodecode/templates/settings/repo_settings.html:86
 msgid "Permissions"
@@ -1957,19 +2033,110 b' msgstr "Cr\xc3\xa9ation de d\xc3\xa9p\xc3\xb4t"'
 msgid "Repository forking"
 msgstr "Fork de dépôt"
 
-#: rhodecode/templates/admin/permissions/permissions.html:92
-#: rhodecode/templates/admin/repos/repo_edit.html:264
-msgid "set"
-msgstr "Définir"
-
-#: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
-msgid "Add repository"
-msgstr "Ajouter un dépôt"
+#: rhodecode/templates/admin/permissions/permissions.html:93
+#: rhodecode/templates/admin/permissions/permissions.html:209
+#: rhodecode/templates/admin/repos/repo_edit.html:142
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80
+#: rhodecode/templates/admin/settings/settings.html:113
+#: rhodecode/templates/admin/settings/settings.html:179
+#: rhodecode/templates/admin/settings/settings.html:269
+#: rhodecode/templates/admin/users/user_edit.html:138
+#: rhodecode/templates/admin/users/user_edit.html:183
+#: rhodecode/templates/admin/users/user_edit.html:286
+#: rhodecode/templates/admin/users/user_edit.html:334
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
+#: rhodecode/templates/files/files_add.html:82
+#: rhodecode/templates/files/files_edit.html:68
+#: rhodecode/templates/pullrequests/pullrequest.html:124
+#: rhodecode/templates/settings/repo_settings.html:95
+msgid "Reset"
+msgstr "Réinitialiser"
+
+#: rhodecode/templates/admin/permissions/permissions.html:103
+#, fuzzy
+msgid "Default User Permissions"
+msgstr "Permissions par défaut"
+
+#: rhodecode/templates/admin/permissions/permissions.html:111
+#: rhodecode/templates/admin/users/user_edit.html:194
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
+msgid "Nothing here yet"
+msgstr "Rien ici pour le moment"
+
+#: rhodecode/templates/admin/permissions/permissions.html:118
+#: rhodecode/templates/admin/users/user_edit.html:201
+#: rhodecode/templates/admin/users/user_edit_my_account.html:61
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
+msgid "Permission"
+msgstr "Permission"
+
+#: rhodecode/templates/admin/permissions/permissions.html:119
+#: rhodecode/templates/admin/users/user_edit.html:202
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
+msgid "Edit Permission"
+msgstr "Éditer"
+
+#: rhodecode/templates/admin/permissions/permissions.html:149
+#: rhodecode/templates/admin/permissions/permissions.html:151
+#: rhodecode/templates/admin/repos/repo_edit.html:13
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/users/user_edit.html:13
+#: rhodecode/templates/admin/users/user_edit.html:232
+#: rhodecode/templates/admin/users/user_edit.html:234
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
+#: rhodecode/templates/data_table/_dt_elements.html:116
+#: rhodecode/templates/data_table/_dt_elements.html:117
+msgid "edit"
+msgstr "éditer"
+
+#: rhodecode/templates/admin/permissions/permissions.html:168
+#: rhodecode/templates/admin/users/user_edit.html:295
+#, fuzzy
+msgid "Allowed IP addresses"
+msgstr "Adresses e-mail"
+
+#: rhodecode/templates/admin/permissions/permissions.html:182
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
+#: rhodecode/templates/admin/users/user_edit.html:263
+#: rhodecode/templates/admin/users/user_edit.html:308
+#: rhodecode/templates/admin/users_groups/users_groups.html:44
+#: rhodecode/templates/data_table/_dt_elements.html:122
+#: rhodecode/templates/data_table/_dt_elements.html:130
+msgid "delete"
+msgstr "Supprimer"
+
+#: rhodecode/templates/admin/permissions/permissions.html:183
+#: rhodecode/templates/admin/users/user_edit.html:309
+#, fuzzy, python-format
+msgid "Confirm to delete this ip: %s"
+msgstr "Veuillez confirmer la suppression de l’e-mail : %s"
+
+#: rhodecode/templates/admin/permissions/permissions.html:189
+#: rhodecode/templates/admin/users/user_edit.html:315
+msgid "All IP addresses are allowed"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:200
+#: rhodecode/templates/admin/users/user_edit.html:326
+#, fuzzy
+msgid "New ip address"
+msgstr "Nouvelle adrese"
+
+#: rhodecode/templates/admin/permissions/permissions.html:208
+#: rhodecode/templates/admin/users/user_edit.html:285
+#: rhodecode/templates/admin/users/user_edit.html:333
+msgid "Add"
+msgstr "Ajouter"
 
 #: rhodecode/templates/admin/repos/repo_add.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:11
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
+#: rhodecode/templates/base/base.html:154
 msgid "Repositories"
 msgstr "Dépôts"
 
@@ -2035,19 +2202,6 b' msgstr "ajouter un nouveau d\xc3\xa9p\xc3\xb4t"'
 msgid "Edit repository"
 msgstr "Éditer le dépôt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:228
-#: rhodecode/templates/admin/users/user_edit.html:230
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
-#: rhodecode/templates/files/files_source.html:29
-#: rhodecode/templates/journal/journal_page_repos.html:29
-msgid "edit"
-msgstr "éditer"
-
 #: rhodecode/templates/admin/repos/repo_edit.html:40
 #: rhodecode/templates/settings/repo_settings.html:39
 msgid "Clone uri"
@@ -2062,23 +2216,6 b' msgstr "S\xc3\xa9lectionnez un groupe (optionel) dans lequel sera plac\xc3\xa9 le d\xc3\xa9p\xc3\xb4t."'
 msgid "Change owner of this repository."
 msgstr "Changer le propriétaire de ce dépôt."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
-#: rhodecode/templates/admin/settings/settings.html:113
-#: rhodecode/templates/admin/settings/settings.html:179
-#: rhodecode/templates/admin/settings/settings.html:269
-#: rhodecode/templates/admin/users/user_edit.html:134
-#: rhodecode/templates/admin/users/user_edit.html:179
-#: rhodecode/templates/admin/users/user_edit.html:282
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/files/files_add.html:82
-#: rhodecode/templates/files/files_edit.html:68
-#: rhodecode/templates/pullrequests/pullrequest.html:124
-#: rhodecode/templates/settings/repo_settings.html:95
-msgid "Reset"
-msgstr "Réinitialiser"
-
 #: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr "Administration"
@@ -2150,16 +2287,16 b' msgstr "Cl\xc3\xa9 d\xe2\x80\x99API"'
 
 #: rhodecode/templates/admin/repos/repo_edit.html:203
 #: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:117
+#: rhodecode/templates/admin/users/user_edit.html:121
 #: rhodecode/templates/admin/users_groups/users_group_add.html:41
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42
 msgid "Active"
 msgstr "Actif"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:218
-#: rhodecode/templates/base/base.html:331
-#: rhodecode/templates/base/base.html:333
-#: rhodecode/templates/base/base.html:335
+#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/base/base.html:308
+#: rhodecode/templates/base/base.html:310
 msgid "Public journal"
 msgstr "Journal public"
 
@@ -2213,12 +2350,16 b' msgstr ""'
 msgid "Set as fork of"
 msgstr "Indiquer comme fork"
 
+#: rhodecode/templates/admin/repos/repo_edit.html:264
+msgid "set"
+msgstr "Définir"
+
 #: rhodecode/templates/admin/repos/repo_edit.html:268
 msgid "Manually set this repository as a fork of another from the list"
 msgstr "Marquer ce dépôt comme fork d’un autre dépôt de la liste."
 
 #: rhodecode/templates/admin/repos/repo_edit.html:274
-#: rhodecode/templates/changeset/changeset_file_comment.html:26
+#: rhodecode/templates/changeset/changeset_file_comment.html:41
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -2266,7 +2407,7 b' msgstr "\xc3\x89criture"'
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:6
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
 #: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/base/base.html:229
+#: rhodecode/templates/base/base.html:235
 msgid "admin"
 msgstr "Administration"
 
@@ -2276,8 +2417,7 b' msgid "member"'
 msgstr "Membre"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-#: rhodecode/templates/data_table/_dt_elements.html:67
-#: rhodecode/templates/journal/journal.html:95
+#: rhodecode/templates/data_table/_dt_elements.html:61
 #: rhodecode/templates/summary/summary.html:85
 msgid "private repository"
 msgstr "Dépôt privé"
@@ -2319,18 +2459,16 b' msgid "apply to children"'
 msgstr "Appliquer aux enfants"
 
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74
+#, fuzzy
 msgid ""
-"Set or revoke permission to all children of that group, including "
-"repositories and other groups"
+"Set or revoke permission to all children of that group, including non-"
+"private repositories and other groups"
 msgstr ""
 "Applique ou révoque les permissions sur tous les éléments de ce groupe, "
 "notamment les dépôts et sous-groupes."
 
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:9
-#: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:313
-#: rhodecode/templates/base/base.html:315
-#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:128
 #: rhodecode/templates/bookmarks/bookmarks.html:11
 #: rhodecode/templates/branches/branches.html:10
 #: rhodecode/templates/changelog/changelog.html:10
@@ -2371,7 +2509,7 b' msgid "add new repos group"'
 msgstr "Nouveau groupe de dépôt"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55
 msgid "Group parent"
 msgstr "Parent du groupe"
 
@@ -2379,7 +2517,7 b' msgstr "Parent du groupe"'
 #: rhodecode/templates/admin/users/user_add.html:94
 #: rhodecode/templates/admin/users_groups/users_group_add.html:49
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "save"
 msgstr "Enregistrer"
 
@@ -2391,7 +2529,12 b' msgstr "\xc3\x89diter le groupe de d\xc3\xa9p\xc3\xb4t"'
 msgid "edit repos group"
 msgstr "Édition du groupe de dépôt"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26
+#, fuzzy
+msgid "Add new child group"
+msgstr "Ajouter un nouveau groupe"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
 msgid ""
 "Enable lock-by-pulling on group. This option will be applied to all other"
 " groups and repositories inside"
@@ -2404,8 +2547,9 b' msgid "Repositories groups administratio'
 msgstr "Administration des groupes de dépôts"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
-msgid "ADD NEW GROUP"
-msgstr "AJOUTER UN NOUVEAU GROUPE"
+#, fuzzy
+msgid "Add new group"
+msgstr "Ajouter un nouveau groupe"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
 msgid "Number of toplevel repositories"
@@ -2417,22 +2561,14 b' msgstr "Nombre de sous-d\xc3\xa9p\xc3\xb4ts"'
 msgid "action"
 msgstr "Action"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
-#: rhodecode/templates/admin/users/user_edit.html:259
-#: rhodecode/templates/admin/users_groups/users_groups.html:44
-#: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/data_table/_dt_elements.html:121
-msgid "delete"
-msgstr "Supprimer"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
 #, fuzzy, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68
 msgid "There are no repositories groups yet"
 msgstr "Aucun groupe de dépôts n’a été créé pour le moment."
 
@@ -2647,7 +2783,7 b' msgstr ""'
 "effectué. Cliquez sur ce texte pour déverrouiller."
 
 #: rhodecode/templates/admin/settings/settings.html:262
-#: rhodecode/templates/base/base.html:221
+#: rhodecode/templates/base/base.html:227
 msgid "unlock"
 msgstr "Déverrouiller"
 
@@ -2715,26 +2851,30 b' msgstr "en utilisant l\xe2\x80\x99adresse"'
 msgid "API key"
 msgstr "Clé d’API"
 
-#: rhodecode/templates/admin/users/user_edit.html:63
+#: rhodecode/templates/admin/users/user_edit.html:48
+msgid "Your IP"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:67
 msgid "LDAP DN"
 msgstr "DN LDAP"
 
-#: rhodecode/templates/admin/users/user_edit.html:72
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:35
+#: rhodecode/templates/admin/users/user_edit.html:76
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: rhodecode/templates/admin/users/user_edit.html:81
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
+#: rhodecode/templates/admin/users/user_edit.html:85
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48
 msgid "New password confirmation"
 msgstr "Confirmation du nouveau mot de passe"
 
-#: rhodecode/templates/admin/users/user_edit.html:151
+#: rhodecode/templates/admin/users/user_edit.html:155
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
 msgid "Inherit default permissions"
 msgstr "Utiliser les permissions par défaut"
 
-#: rhodecode/templates/admin/users/user_edit.html:156
+#: rhodecode/templates/admin/users/user_edit.html:160
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113
 #, python-format
 msgid ""
@@ -2744,53 +2884,31 b' msgstr ""'
 "Cochez pour utiliser les permissions des les réglages %s. Si cette option"
 " est activée, les réglages ci-dessous n’auront pas d’effet."
 
-#: rhodecode/templates/admin/users/user_edit.html:162
+#: rhodecode/templates/admin/users/user_edit.html:166
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr "Création de dépôts"
 
-#: rhodecode/templates/admin/users/user_edit.html:170
+#: rhodecode/templates/admin/users/user_edit.html:174
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127
 msgid "Fork repositories"
 msgstr "Forker les dépôts"
 
-#: rhodecode/templates/admin/users/user_edit.html:190
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
-msgid "Nothing here yet"
-msgstr "Rien ici pour le moment"
-
-#: rhodecode/templates/admin/users/user_edit.html:197
-#: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:217
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
-msgid "Permission"
-msgstr "Permission"
-
-#: rhodecode/templates/admin/users/user_edit.html:198
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
-msgid "Edit Permission"
-msgstr "Éditer"
-
-#: rhodecode/templates/admin/users/user_edit.html:247
+#: rhodecode/templates/admin/users/user_edit.html:251
 msgid "Email addresses"
 msgstr "Adresses e-mail"
 
-#: rhodecode/templates/admin/users/user_edit.html:260
+#: rhodecode/templates/admin/users/user_edit.html:264
 #, 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:274
+#: rhodecode/templates/admin/users/user_edit.html:278
 msgid "New email address"
 msgstr "Nouvelle adrese"
 
-#: rhodecode/templates/admin/users/user_edit.html:281
-msgid "Add"
-msgstr "Ajouter"
-
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:124
+#: rhodecode/templates/base/base.html:130
 msgid "My account"
 msgstr "Mon compte"
 
@@ -2803,7 +2921,7 b' msgid "My permissions"'
 msgstr "Mes permissions"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:57
 msgid "My repos"
 msgstr "Mes dépôts"
 
@@ -2812,6 +2930,7 b' msgid "My pull requests"'
 msgstr "Mes requêtes de pull"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:45
+#: rhodecode/templates/journal/journal.html:61
 msgid "Add repo"
 msgstr "Ajouter un dépôt"
 
@@ -2838,51 +2957,19 b' msgstr "Je participe \xc3\xa0"'
 msgid "Pull request #%s opened by %s on %s"
 msgstr "Requête de pull nº%s ouverte par %s le %s"
 
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7
-#: rhodecode/templates/bookmarks/bookmarks.html:40
-#: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:54
-#: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:8
-#: rhodecode/templates/tags/tags.html:55
-#: rhodecode/templates/tags/tags_data.html:9
-msgid "Revision"
-msgstr "Révision"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/journal/journal_page_repos.html:29
-msgid "private"
-msgstr "privé"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31
-#: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/journal/journal_page_repos.html:32
-#, python-format
-msgid "Confirm to delete this repository: %s"
-msgstr "Voulez-vous vraiment supprimer le dépôt %s ?"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38
-#: rhodecode/templates/journal/journal_page_repos.html:42
-msgid "No repositories yet"
-msgstr "Aucun dépôt pour le moment"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40
-#: rhodecode/templates/journal/journal_page_repos.html:44
-msgid "create one now"
-msgstr "En créer un maintenant"
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "Administration des utilisateurs"
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:235
+#: rhodecode/templates/base/base.html:241
 msgid "users"
 msgstr "Utilisateurs"
 
 #: rhodecode/templates/admin/users/users.html:23
-msgid "ADD NEW USER"
-msgstr "NOUVEL UTILISATEUR"
+#, fuzzy
+msgid "Add new user"
+msgstr "nouvel utilisateur"
 
 #: rhodecode/templates/admin/users/users.html:77
 msgid "username"
@@ -2906,7 +2993,7 b' msgid "active"'
 msgstr "Actif"
 
 #: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:238
+#: rhodecode/templates/base/base.html:244
 msgid "ldap"
 msgstr "LDAP"
 
@@ -2975,8 +3062,9 b' msgid "Users groups administration"'
 msgstr "Gestion des groupes d’utilisateurs"
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:23
-msgid "ADD NEW USER GROUP"
-msgstr "AJOUTER UN NOUVEAU GROUPE"
+#, fuzzy
+msgid "Add new user group"
+msgstr "Ajouter un nouveau groupe"
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:32
 msgid "group name"
@@ -2996,150 +3084,156 b' msgstr "Voulez-vous vraiment supprimer le groupe d\xe2\x80\x98utilisateurs \xc2\xab %s\xc2\xa0\xc2\xbb\xc2\xa0?"'
 msgid "Submit a bug"
 msgstr "Signaler un bogue"
 
-#: rhodecode/templates/base/base.html:77
+#: rhodecode/templates/base/base.html:76
+#, fuzzy
+msgid "Not logged in"
+msgstr "Dernière connexion"
+
+#: rhodecode/templates/base/base.html:83
 msgid "Login to your account"
 msgstr "Connexion à votre compte"
 
-#: rhodecode/templates/base/base.html:100
+#: rhodecode/templates/base/base.html:106
 msgid "Forgot password ?"
 msgstr "Mot de passe oublié ?"
 
-#: rhodecode/templates/base/base.html:107
+#: rhodecode/templates/base/base.html:113
 msgid "Log In"
 msgstr "Connexion"
 
-#: rhodecode/templates/base/base.html:118
+#: rhodecode/templates/base/base.html:124
 msgid "Inbox"
 msgstr "Boîte de réception"
 
-#: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:322
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:129
+#: rhodecode/templates/base/base.html:297
+#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:301
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/public_journal.html:4
 msgid "Journal"
 msgstr "Historique"
 
-#: rhodecode/templates/base/base.html:125
+#: rhodecode/templates/base/base.html:131
 msgid "Log Out"
 msgstr "Se déconnecter"
 
-#: rhodecode/templates/base/base.html:144
+#: rhodecode/templates/base/base.html:150
 msgid "Switch repository"
 msgstr "Aller au dépôt"
 
-#: rhodecode/templates/base/base.html:146
-msgid "Products"
-msgstr "Produits"
-
 #: rhodecode/templates/base/base.html:152
-#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47
-msgid "loading..."
-msgstr "Chargement…"
+msgid "Products"
+msgstr "Produits"
 
 #: rhodecode/templates/base/base.html:158
-#: rhodecode/templates/base/base.html:160
-#: rhodecode/templates/base/base.html:162
-#: rhodecode/templates/data_table/_dt_elements.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:17
-#: rhodecode/templates/data_table/_dt_elements.html:19
-msgid "Summary"
-msgstr "Résumé"
+#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47
+msgid "loading..."
+msgstr "Chargement…"
 
 #: rhodecode/templates/base/base.html:166
 #: rhodecode/templates/base/base.html:168
 #: rhodecode/templates/base/base.html:170
+#: rhodecode/templates/data_table/_dt_elements.html:9
+#: rhodecode/templates/data_table/_dt_elements.html:11
+#: rhodecode/templates/data_table/_dt_elements.html:13
+msgid "Summary"
+msgstr "Résumé"
+
+#: rhodecode/templates/base/base.html:174
+#: rhodecode/templates/base/base.html:176
+#: rhodecode/templates/base/base.html:178
 #: rhodecode/templates/changelog/changelog.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:23
-#: rhodecode/templates/data_table/_dt_elements.html:25
-#: rhodecode/templates/data_table/_dt_elements.html:27
+#: rhodecode/templates/data_table/_dt_elements.html:17
+#: rhodecode/templates/data_table/_dt_elements.html:19
+#: rhodecode/templates/data_table/_dt_elements.html:21
 msgid "Changelog"
 msgstr "Historique"
 
-#: rhodecode/templates/base/base.html:175
-#: rhodecode/templates/base/base.html:177
-#: rhodecode/templates/base/base.html:179
+#: rhodecode/templates/base/base.html:182
+#: rhodecode/templates/base/base.html:184
+#: rhodecode/templates/base/base.html:186
 msgid "Switch to"
 msgstr "Aller"
 
-#: rhodecode/templates/base/base.html:186
-#: rhodecode/templates/base/base.html:188
-#: rhodecode/templates/base/base.html:190
-#: rhodecode/templates/data_table/_dt_elements.html:31
-#: rhodecode/templates/data_table/_dt_elements.html:33
-#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/base/base.html:193
+#: rhodecode/templates/base/base.html:195
+#: rhodecode/templates/base/base.html:197
+#: rhodecode/templates/data_table/_dt_elements.html:25
+#: rhodecode/templates/data_table/_dt_elements.html:27
+#: rhodecode/templates/data_table/_dt_elements.html:29
 msgid "Files"
 msgstr "Fichiers"
 
-#: rhodecode/templates/base/base.html:195
-#: rhodecode/templates/base/base.html:199
+#: rhodecode/templates/base/base.html:201
+#: rhodecode/templates/base/base.html:205
 msgid "Options"
 msgstr "Options"
 
-#: rhodecode/templates/base/base.html:204
-#: rhodecode/templates/base/base.html:206
+#: rhodecode/templates/base/base.html:210
+#: rhodecode/templates/base/base.html:212
 msgid "repository settings"
 msgstr "Réglages de dépôt"
 
-#: rhodecode/templates/base/base.html:210
-#: rhodecode/templates/data_table/_dt_elements.html:80
+#: rhodecode/templates/base/base.html:216
+#: rhodecode/templates/data_table/_dt_elements.html:74
 #: rhodecode/templates/forks/fork.html:13
 msgid "fork"
 msgstr "Fork"
 
-#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50
+#: rhodecode/templates/base/base.html:218
 #: rhodecode/templates/changelog/changelog.html:43
-msgid "Open new pull request"
+#, fuzzy
+msgid "open new pull request"
 msgstr "Nouvelle requête de pull"
 
-#: rhodecode/templates/base/base.html:215
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
+#: rhodecode/templates/base/base.html:221
+#, fuzzy
+msgid "compare fork"
 msgstr "Comparer le fork"
 
-#: rhodecode/templates/base/base.html:217
-msgid "search"
-msgstr "Rechercher"
-
 #: rhodecode/templates/base/base.html:223
+msgid "search"
+msgstr "Rechercher"
+
+#: rhodecode/templates/base/base.html:229
 msgid "lock"
 msgstr "Verrouiller"
 
-#: rhodecode/templates/base/base.html:234
+#: rhodecode/templates/base/base.html:240
 msgid "repositories groups"
 msgstr "Groupes de dépôts"
 
-#: rhodecode/templates/base/base.html:236
+#: rhodecode/templates/base/base.html:242
 msgid "users groups"
 msgstr "Groupes d’utilisateurs"
 
-#: rhodecode/templates/base/base.html:237
+#: rhodecode/templates/base/base.html:243
 msgid "permissions"
 msgstr "Permissions"
 
-#: rhodecode/templates/base/base.html:239
+#: rhodecode/templates/base/base.html:245
 #, fuzzy
 msgid "defaults"
 msgstr "[Par défaut]"
 
-#: rhodecode/templates/base/base.html:240
+#: rhodecode/templates/base/base.html:246
 msgid "settings"
 msgstr "Réglages"
 
-#: rhodecode/templates/base/base.html:251
-#: rhodecode/templates/base/base.html:253
+#: rhodecode/templates/base/base.html:256
+#: rhodecode/templates/base/base.html:258
 msgid "Followers"
 msgstr "Followers"
 
-#: rhodecode/templates/base/base.html:259
-#: rhodecode/templates/base/base.html:261
+#: rhodecode/templates/base/base.html:264
+#: rhodecode/templates/base/base.html:266
 msgid "Forks"
 msgstr "Forks"
 
-#: rhodecode/templates/base/base.html:340
-#: rhodecode/templates/base/base.html:342
-#: rhodecode/templates/base/base.html:344
+#: rhodecode/templates/base/base.html:315
+#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:319
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "Rechercher"
@@ -3149,7 +3243,7 b' msgid "add another comment"'
 msgstr "Nouveau commentaire"
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:83
+#: rhodecode/templates/data_table/_dt_elements.html:140
 #: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr "Arrêter de suivre ce dépôt"
@@ -3171,6 +3265,10 b' msgstr "R\xc3\xa9sultats tronqu\xc3\xa9s"'
 msgid "no matching files"
 msgstr "Aucun fichier ne correspond"
 
+#: rhodecode/templates/base/root.html:50
+msgid "Open new pull request"
+msgstr "Nouvelle requête de pull"
+
 #: rhodecode/templates/base/root.html:51
 #, fuzzy
 msgid "Open new pull request for selected changesets"
@@ -3198,6 +3296,15 b' msgstr "Signets de %s"'
 msgid "Author"
 msgstr "Auteur"
 
+#: rhodecode/templates/bookmarks/bookmarks.html:40
+#: rhodecode/templates/bookmarks/bookmarks_data.html:9
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/tags/tags_data.html:9
+msgid "Revision"
+msgstr "Révision"
+
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
@@ -3266,8 +3373,9 b' msgstr "Statut du changeset"'
 
 #: rhodecode/templates/changelog/changelog.html:94
 #: rhodecode/templates/shortlog/shortlog_data.html:20
-msgid "Click to open associated pull request"
-msgstr "Cliquez ici pour ouvrir la requête de pull associée."
+#, python-format
+msgid "Click to open associated pull request #%s"
+msgstr "Cliquez ici pour ouvrir la requête de pull associée #%s."
 
 #: rhodecode/templates/changelog/changelog.html:104
 msgid "Parent"
@@ -3305,7 +3413,7 b' msgstr "Signet"'
 msgid "tag"
 msgstr "Tag"
 
-#: rhodecode/templates/changelog/changelog.html:301
+#: rhodecode/templates/changelog/changelog.html:302
 msgid "There are no changes yet"
 msgstr "Il n’y a aucun changement pour le moment"
 
@@ -3364,7 +3472,7 b' msgid "download diff"'
 msgstr "Télécharger le diff"
 
 #: rhodecode/templates/changeset/changeset.html:76
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -3372,7 +3480,7 b' msgstr[0] "%d commentaire"'
 msgstr[1] "%d commentaires"
 
 #: rhodecode/templates/changeset/changeset.html:76
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
@@ -3381,7 +3489,7 b' msgstr[1] "(et %d en ligne)"'
 
 #: rhodecode/templates/changeset/changeset.html:122
 #: rhodecode/templates/compare/compare_diff.html:44
-#: rhodecode/templates/pullrequests/pullrequest_show.html:76
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
 #, fuzzy, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
@@ -3390,67 +3498,77 b' msgstr[1] "%s fichi\xc3\xa9 modifi\xc3\xa9"'
 
 #: rhodecode/templates/changeset/changeset.html:124
 #: rhodecode/templates/compare/compare_diff.html:46
-#: rhodecode/templates/pullrequests/pullrequest_show.html:78
+#: rhodecode/templates/pullrequests/pullrequest_show.html:96
 #, fuzzy, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
 msgstr[0] "%s fichiers affectés avec %s insertions et %s suppressions"
 msgstr[1] "%s fichiers affectés avec %s insertions et %s suppressions"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:42
+#: rhodecode/templates/changeset/changeset_file_comment.html:30
+#, python-format
+msgid "Status from pull request %s"
+msgstr "Requêtes de pull %s"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:32
+#, python-format
+msgid "Comment from pull request %s"
+msgstr "[a commenté] la requête de pull pour %s"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:57
 msgid "Submitting..."
 msgstr "Envoi…"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:45
+#: rhodecode/templates/changeset/changeset_file_comment.html:60
 msgid "Commenting on line {1}."
 msgstr "Commentaire sur la ligne {1}."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:46
-#: rhodecode/templates/changeset/changeset_file_comment.html:121
+#: rhodecode/templates/changeset/changeset_file_comment.html:61
+#: rhodecode/templates/changeset/changeset_file_comment.html:140
 #, 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:48
-#: rhodecode/templates/changeset/changeset_file_comment.html:123
+#: rhodecode/templates/changeset/changeset_file_comment.html:63
+#: rhodecode/templates/changeset/changeset_file_comment.html:142
 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:59
-#: rhodecode/templates/changeset/changeset_file_comment.html:143
+#: rhodecode/templates/changeset/changeset_file_comment.html:74
+#: rhodecode/templates/changeset/changeset_file_comment.html:162
 msgid "Comment"
 msgstr "Commentaire"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:60
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
+#: rhodecode/templates/changeset/changeset_file_comment.html:75
+#: rhodecode/templates/changeset/changeset_file_comment.html:86
 msgid "Hide"
 msgstr "Masquer"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 msgid "You need to be logged in to comment."
 msgstr "Vous devez être connecté pour poster des commentaires."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 msgid "Login now"
 msgstr "Se connecter maintenant"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:118
+#: rhodecode/templates/changeset/changeset_file_comment.html:137
 msgid "Leave a comment"
 msgstr "Laisser un commentaire"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:125
+#: rhodecode/templates/changeset/changeset_file_comment.html:144
 msgid "Check this to change current status of code-review for this changeset"
 msgstr "Cochez pour changer le statut de la relecture de code pour ce changeset"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:125
+#: rhodecode/templates/changeset/changeset_file_comment.html:144
 msgid "change status"
 msgstr "Modifier le statut"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:145
+#: rhodecode/templates/changeset/changeset_file_comment.html:164
 msgid "Comment and close"
 msgstr "Commenter et fermer"
 
@@ -3486,7 +3604,7 b' msgid "No changesets"'
 msgstr "Aucun changeset"
 
 #: rhodecode/templates/compare/compare_diff.html:37
-#: rhodecode/templates/pullrequests/pullrequest_show.html:69
+#: rhodecode/templates/pullrequests/pullrequest_show.html:87
 #, fuzzy, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
@@ -3494,59 +3612,61 b' msgstr[0] "Afficher %s les commentaires"'
 msgstr[1] "Afficher %s les commentaires"
 
 #: rhodecode/templates/compare/compare_diff.html:52
-#: rhodecode/templates/pullrequests/pullrequest_show.html:84
+#: rhodecode/templates/pullrequests/pullrequest_show.html:102
 #, fuzzy
 msgid "No files"
 msgstr "Fichiers"
 
-#: rhodecode/templates/data_table/_dt_elements.html:39
-#: rhodecode/templates/data_table/_dt_elements.html:41
-#: rhodecode/templates/data_table/_dt_elements.html:43
+#: rhodecode/templates/data_table/_dt_elements.html:33
+#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/data_table/_dt_elements.html:37
 msgid "Fork"
 msgstr "Fork"
 
-#: rhodecode/templates/data_table/_dt_elements.html:60
-#: rhodecode/templates/journal/journal.html:89
+#: rhodecode/templates/data_table/_dt_elements.html:54
 #: rhodecode/templates/summary/summary.html:77
 msgid "Mercurial repository"
 msgstr "Dépôt Mercurial"
 
-#: rhodecode/templates/data_table/_dt_elements.html:62
-#: rhodecode/templates/journal/journal.html:91
+#: rhodecode/templates/data_table/_dt_elements.html:56
 #: rhodecode/templates/summary/summary.html:80
 msgid "Git repository"
 msgstr "Dépôt Git"
 
-#: rhodecode/templates/data_table/_dt_elements.html:69
-#: rhodecode/templates/journal/journal.html:97
+#: rhodecode/templates/data_table/_dt_elements.html:63
 #: rhodecode/templates/summary/summary.html:87
 msgid "public repository"
 msgstr "Dépôt public"
 
-#: rhodecode/templates/data_table/_dt_elements.html:80
+#: rhodecode/templates/data_table/_dt_elements.html:74
 #: rhodecode/templates/summary/summary.html:96
 #: rhodecode/templates/summary/summary.html:97
 msgid "Fork of"
 msgstr "Fork de"
 
-#: rhodecode/templates/data_table/_dt_elements.html:94
+#: rhodecode/templates/data_table/_dt_elements.html:88
 msgid "No changesets yet"
 msgstr "Dépôt vide"
 
-#: rhodecode/templates/data_table/_dt_elements.html:101
-#: rhodecode/templates/data_table/_dt_elements.html:103
+#: 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 "S’abonner au flux RSS de %s"
 
-#: rhodecode/templates/data_table/_dt_elements.html:109
-#: rhodecode/templates/data_table/_dt_elements.html:111
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:105
 #, 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:131
+#, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?"
 
@@ -3593,15 +3713,15 b' msgstr "Titre"'
 msgid "description"
 msgstr "Description"
 
-#: rhodecode/templates/email_templates/pull_request.html:11
-msgid "revisions for reviewing"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request.html:18
+#: rhodecode/templates/email_templates/pull_request.html:7
 #, fuzzy
 msgid "View this pull request here"
 msgstr "Ajouter un relecteur à cette requête de pull."
 
+#: rhodecode/templates/email_templates/pull_request.html:12
+msgid "revisions for reviewing"
+msgstr ""
+
 #: rhodecode/templates/email_templates/pull_request_comment.html:4
 #, fuzzy, python-format
 msgid "User %s commented on pull request #%s for repository %s"
@@ -3763,7 +3883,7 b' msgstr "Afficher les annotations"'
 
 #: rhodecode/templates/files/files_edit.html:50
 #: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:53
+#: rhodecode/templates/files/files_source.html:55
 msgid "show as raw"
 msgstr "montrer le fichier brut"
 
@@ -3813,12 +3933,25 b' msgstr "Chargement de la liste des fichiers\xe2\x80\xa6"'
 msgid "show source"
 msgstr "montrer les sources"
 
-#: rhodecode/templates/files/files_source.html:44
+#: rhodecode/templates/files/files_source.html:29
+#, fuzzy, python-format
+msgid "edit on branch:%s"
+msgstr "Dépôt %s supprimé"
+
+#: rhodecode/templates/files/files_source.html:31
+msgid "edit on branch:?"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:31
+msgid "Editing files allowed only when on branch head revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:46
 #, python-format
 msgid "Binary file (%s)"
 msgstr "Fichier binaire (%s)"
 
-#: rhodecode/templates/files/files_source.html:53
+#: rhodecode/templates/files/files_source.html:55
 msgid "File is too big to display"
 msgstr "Ce fichier est trop gros pour être affiché."
 
@@ -3893,6 +4026,10 b' msgstr "forks"'
 msgid "forked"
 msgstr "forké"
 
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
+msgstr "Comparer le fork"
+
 #: rhodecode/templates/forks/forks_data.html:42
 msgid "There are no forks yet"
 msgstr "Il n’y a pas encore de forks."
@@ -3920,26 +4057,10 b' msgstr "Flux RSS"'
 msgid "ATOM feed"
 msgstr "Flux ATOM"
 
-#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:54
 msgid "Watched"
 msgstr "Surveillé"
 
-#: rhodecode/templates/journal/journal.html:54
-msgid "ADD"
-msgstr "AJOUTER"
-
-#: rhodecode/templates/journal/journal.html:77
-msgid "following user"
-msgstr "utilisateur suivant"
-
-#: rhodecode/templates/journal/journal.html:77
-msgid "user"
-msgstr "utilisateur"
-
-#: rhodecode/templates/journal/journal.html:110
-msgid "You are not following any users or repositories"
-msgstr "Vous ne suivez aucun utilisateur ou dépôt"
-
 #: rhodecode/templates/journal/journal_data.html:55
 msgid "No entries yet"
 msgstr "Aucune entrée pour le moment"
@@ -3970,17 +4091,17 b' msgid "Detailed compare view"'
 msgstr "Comparaison détaillée"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:100
+#: rhodecode/templates/pullrequests/pullrequest_show.html:118
 msgid "Pull request reviewers"
 msgstr "Relecteurs de la requête de pull"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:130
 msgid "owner"
 msgstr "Propriétaire"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:127
+#: rhodecode/templates/pullrequests/pullrequest_show.html:145
 msgid "Add reviewer to this pull request."
 msgstr "Ajouter un relecteur à cette requête de pull."
 
@@ -4031,15 +4152,20 b' msgstr[1] "%d relecteurs"'
 msgid "pull request was reviewed by all reviewers"
 msgstr "La requête de pull a été relue par tous les relecteurs."
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:58
+#: rhodecode/templates/pullrequests/pullrequest_show.html:56
+#, fuzzy
+msgid "Origin repository"
+msgstr "Dépôt Git"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:76
 msgid "Created on"
 msgstr "Créé le"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:83
 msgid "Compare view"
 msgstr "Vue de comparaison"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:130
 #, fuzzy
 msgid "reviewer"
 msgstr "%d relecteur"
@@ -4321,29 +4447,3 b' msgstr "Tags de %s"'
 msgid "Compare tags"
 msgstr "Comparer"
 
-#~ msgid ""
-#~ "%s repository is not mapped to db"
-#~ " perhaps it was created or renamed"
-#~ " from the file system please run "
-#~ "the application again in order to "
-#~ "rescan repositories"
-#~ msgstr ""
-#~ "Le dépôt %s n’est pas représenté "
-#~ "dans la base de données. Il a "
-#~ "probablement été créé ou renommé "
-#~ "manuellement. Veuillez relancer l’application "
-#~ "pour rescanner les dépôts."
-
-#~ msgid ""
-#~ "%s repository is not mapped to db"
-#~ " perhaps it was moved or renamed  "
-#~ "from the filesystem please run the "
-#~ "application again in order to rescan "
-#~ "repositories"
-#~ msgstr ""
-#~ "Le dépôt %s n’est pas représenté "
-#~ "dans la base de données. Il a "
-#~ "probablement été déplacé ou renommé "
-#~ "manuellement. Veuillez relancer l’application "
-#~ "pour rescanner les dépôts."
-

rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po

@@ -12,7 +12,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode 1.2.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-12-14 04:19+0100\n"
+"POT-Creation-Date: 2013-01-28 00:24+0100\n"
 "PO-Revision-Date: 2013-01-02 01:39+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ja <[e-mail]>\n"
@@ -39,15 +39,15 b' msgstr "\xe7\xa9\xba\xe7\x99\xbd\xe3\x82\x92\xe7\x84\xa1\xe8\xa6\x96"'
 msgid "%s line context"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:314
-#: rhodecode/controllers/pullrequests.py:417
+#: rhodecode/controllers/changeset.py:329
+#: rhodecode/controllers/pullrequests.py:416
 #, python-format
 msgid "Status change -> %s"
 msgstr "ステータス変更 -> %s"
 
-#: rhodecode/controllers/changeset.py:345
+#: rhodecode/controllers/changeset.py:360
 msgid ""
-"Changing status on a changeset associated witha closed pull request is "
+"Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr ""
 
@@ -98,8 +98,8 b' msgstr "%s %s \xe3\x83\x95\xe3\x82\xa3\xe3\x83\xbc\xe3\x83\x89"'
 #: rhodecode/templates/changeset/changeset.html:149
 #: rhodecode/templates/compare/compare_diff.html:62
 #: rhodecode/templates/compare/compare_diff.html:73
-#: rhodecode/templates/pullrequests/pullrequest_show.html:94
-#: rhodecode/templates/pullrequests/pullrequest_show.html:153
+#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:171
 msgid "Changeset was too big and was cut off..."
 msgstr "チェンジセットが大きすぎるため、省略しました"
 
@@ -116,110 +116,114 b' msgstr "\xe6\x96\xb0\xe3\x81\x97\xe3\x81\x84\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x82\x92\xe8\xbf\xbd\xe5\x8a\xa0"'
 msgid "There are no files yet %s"
 msgstr "まだファイルがありません %s"
 
-#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325
+#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr "このリポジトリは %s によって %s にロックされました"
 
-#: rhodecode/controllers/files.py:292
-#, python-format
-msgid "Edited %s via RhodeCode"
+#: rhodecode/controllers/files.py:281
+msgid "You can only edit files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:295
+#, fuzzy, python-format
+msgid "Edited file %s via RhodeCode"
 msgstr "RhodeCode経由で %s を変更"
 
-#: rhodecode/controllers/files.py:297
+#: rhodecode/controllers/files.py:311
 msgid "No changes"
 msgstr "変更点なし"
 
-#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372
+#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "%s へのコミットが成功しました"
 
-#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378
+#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390
 msgid "Error occurred during commit"
 msgstr "コミット中にエラーが発生しました"
 
-#: rhodecode/controllers/files.py:344
-#, python-format
-msgid "Added %s via RhodeCode"
+#: rhodecode/controllers/files.py:350
+#, fuzzy
+msgid "Added file via RhodeCode"
 msgstr "RhodeCode経由で %s を追加"
 
-#: rhodecode/controllers/files.py:358
+#: rhodecode/controllers/files.py:370
 msgid "No content"
 msgstr "内容がありません"
 
-#: rhodecode/controllers/files.py:362
+#: rhodecode/controllers/files.py:374
 msgid "No filename"
 msgstr "ファイル名がありません"
 
-#: rhodecode/controllers/files.py:404
+#: rhodecode/controllers/files.py:416
 msgid "downloads disabled"
 msgstr "ダウンロードは無効化されています"
 
-#: rhodecode/controllers/files.py:415
+#: rhodecode/controllers/files.py:427
 #, python-format
 msgid "Unknown revision %s"
 msgstr "%s は未知のリビジョンです"
 
-#: rhodecode/controllers/files.py:417
+#: rhodecode/controllers/files.py:429
 msgid "Empty repository"
 msgstr "空のリポジトリ"
 
-#: rhodecode/controllers/files.py:419
+#: rhodecode/controllers/files.py:431
 msgid "Unknown archive type"
 msgstr "未知のアーカイブ種別です"
 
-#: rhodecode/controllers/files.py:564
+#: rhodecode/controllers/files.py:576
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr "チェンジセット"
 
-#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74
-#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550
+#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74
+#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564
 msgid "Branches"
 msgstr "ブランチ"
 
-#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78
-#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561
+#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78
+#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575
 msgid "Tags"
 msgstr "タグ"
 
-#: rhodecode/controllers/forks.py:158
+#: rhodecode/controllers/forks.py:165
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "リポジトリ %s を %s としてフォーク"
 
-#: rhodecode/controllers/forks.py:172
+#: rhodecode/controllers/forks.py:179
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "リポジトリ %s のフォーク中にエラーが発生しました"
 
-#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261
+#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318
 msgid "public journal"
 msgstr "公開ジャーナル"
 
-#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322
+#: rhodecode/templates/base/base.html:238
 #: rhodecode/templates/journal/journal.html:12
 msgid "journal"
 msgstr "ジャーナル"
 
-#: rhodecode/controllers/login.py:143
+#: rhodecode/controllers/login.py:142
 msgid "You have successfully registered into rhodecode"
 msgstr "rhodecodeへの登録を受け付けました"
 
-#: rhodecode/controllers/login.py:164
+#: rhodecode/controllers/login.py:163
 msgid "Your password reset link was sent"
 msgstr "パスワードリセットのリンクを送信しました"
 
-#: rhodecode/controllers/login.py:184
+#: rhodecode/controllers/login.py:183
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
 msgstr "パスワードをリセットしました。新しいパスワードをあなたのメールアドレスに送りました"
 
-#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556
+#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
@@ -243,7 +247,7 b' msgstr "\xe3\x83\x97\xe3\x83\xab\xe3\x83\xaa\xe3\x82\xaf\xe3\x82\xa8\xe3\x82\xb9\xe3\x83\x88\xe3\x81\xae\xe4\xbd\x9c\xe6\x88\x90\xe4\xb8\xad\xe3\x81\xab\xe3\x82\xa8\xe3\x83\xa9\xe3\x83\xbc\xe3\x81\x8c\xe7\x99\xba\xe7\x94\x9f\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x97\xe3\x81\x9f"'
 msgid "Successfully deleted pull request"
 msgstr "プルリクエストを削除しました"
 
-#: rhodecode/controllers/pullrequests.py:452
+#: rhodecode/controllers/pullrequests.py:451
 msgid "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr ""
 
@@ -259,46 +263,46 b' msgstr "\xe6\xa4\x9c\xe7\xb4\xa2\xe3\x81\x99\xe3\x82\x8b\xe3\x81\x9f\xe3\x82\x81\xe3\x81\xae\xe3\x82\xa4\xe3\x83\xb3\xe3\x83\x87\xe3\x83\x83\xe3\x82\xaf\xe3\x82\xb9\xe3\x81\x8c\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93\xe3\x80\x82whoosh\xe3\x81\xa7\xe3\x82\xa4\xe3\x83\xb3\xe3\x83\x87\xe3\x83\x83\xe3\x82\xaf\xe3\x82\xb9\xe3\x82\x92\xe4\xbd\x9c\xe6\x88\x90\xe3\x81\x97\xe3\x81\xa6\xe4\xb8\x8b\xe3\x81\x95\xe3\x81\x84"'
 msgid "An error occurred during this search operation"
 msgstr "検索を実行する際にエラーがおきました"
 
-#: rhodecode/controllers/settings.py:119
-#: rhodecode/controllers/admin/repos.py:272
+#: rhodecode/controllers/settings.py:120
+#: rhodecode/controllers/admin/repos.py:254
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "リポジトリ %s の更新に成功しました"
 
-#: rhodecode/controllers/settings.py:137
-#: rhodecode/controllers/admin/repos.py:290
+#: rhodecode/controllers/settings.py:138
+#: rhodecode/controllers/admin/repos.py:272
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr "リポジトリ %s の更新中にエラーが発生しました"
 
-#: rhodecode/controllers/settings.py:162
-#: rhodecode/controllers/admin/repos.py:315
+#: rhodecode/controllers/settings.py:163
+#: rhodecode/controllers/admin/repos.py:297
 #, python-format
 msgid "deleted repository %s"
 msgstr "リポジトリ %s を削除しました"
 
-#: rhodecode/controllers/settings.py:166
-#: rhodecode/controllers/admin/repos.py:325
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/settings.py:167
+#: rhodecode/controllers/admin/repos.py:307
+#: rhodecode/controllers/admin/repos.py:313
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "リポジトリ %s の削除中にエラーが発生しました"
 
-#: rhodecode/controllers/settings.py:185
+#: rhodecode/controllers/settings.py:186
 msgid "unlocked"
 msgstr "アンロック"
 
-#: rhodecode/controllers/settings.py:188
+#: rhodecode/controllers/settings.py:189
 msgid "locked"
 msgstr "ロック"
 
-#: rhodecode/controllers/settings.py:190
+#: rhodecode/controllers/settings.py:191
 #, python-format
 msgid "Repository has been %s"
 msgstr "リポジトリは %s されています"
 
-#: rhodecode/controllers/settings.py:194
-#: rhodecode/controllers/admin/repos.py:423
+#: rhodecode/controllers/settings.py:195
+#: rhodecode/controllers/admin/repos.py:405
 msgid "An error occurred during unlocking"
 msgstr "アンロック時にエラーが発生しました"
 
@@ -375,23 +379,23 b' msgstr "LDAP\xe3\x82\x92\xe6\x9c\x89\xe5\x8a\xb9\xe3\x81\xab\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93\xe3\x81\xa7\xe3\x81\x97\xe3\x81\x9f\xe3\x80\x82\\"python-ldap\\"\xe3\x83\xa9\xe3\x82\xa4\xe3\x83\x96\xe3\x83\xa9\xe3\x83\xaa\xe3\x81\x8c\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93\xe3\x80\x82"'
 msgid "error occurred during update of ldap settings"
 msgstr "LDAP設定の更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/permissions.py:59
-#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:60
+#: rhodecode/controllers/admin/permissions.py:64
 msgid "None"
 msgstr "なし"
 
-#: rhodecode/controllers/admin/permissions.py:60
-#: rhodecode/controllers/admin/permissions.py:64
-msgid "Read"
-msgstr "読込"
-
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
-msgid "Write"
-msgstr "書込"
+msgid "Read"
+msgstr "読込"
 
 #: rhodecode/controllers/admin/permissions.py:62
 #: rhodecode/controllers/admin/permissions.py:66
+msgid "Write"
+msgstr "書込"
+
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
 #: rhodecode/templates/admin/defaults/defaults.html:9
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
@@ -405,225 +409,225 b' msgstr "\xe6\x9b\xb8\xe8\xbe\xbc"'
 #: 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:126
+#: rhodecode/templates/admin/users/user_edit.html:130
 #: rhodecode/templates/admin/users/users.html:9
 #: rhodecode/templates/admin/users_groups/users_group_add.html:8
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:197
-#: rhodecode/templates/base/base.html:350
-#: rhodecode/templates/base/base.html:352
-#: rhodecode/templates/base/base.html:354
+#: rhodecode/templates/base/base.html:203
+#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:328
 msgid "Admin"
 msgstr "管理"
 
-#: rhodecode/controllers/admin/permissions.py:69
+#: rhodecode/controllers/admin/permissions.py:70
 msgid "disabled"
 msgstr "無効にする"
 
-#: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/controllers/admin/permissions.py:72
 msgid "allowed with manual account activation"
 msgstr "手動でアカウントを有効にする"
 
-#: rhodecode/controllers/admin/permissions.py:73
+#: rhodecode/controllers/admin/permissions.py:74
 msgid "allowed with automatic account activation"
 msgstr "自動でアカウントを有効にする"
 
-#: rhodecode/controllers/admin/permissions.py:75
-#: rhodecode/controllers/admin/permissions.py:78
-msgid "Disabled"
-msgstr "無効"
-
 #: rhodecode/controllers/admin/permissions.py:76
 #: rhodecode/controllers/admin/permissions.py:79
+msgid "Disabled"
+msgstr "無効"
+
+#: rhodecode/controllers/admin/permissions.py:77
+#: rhodecode/controllers/admin/permissions.py:80
 msgid "Enabled"
 msgstr "有効"
 
-#: rhodecode/controllers/admin/permissions.py:122
+#: rhodecode/controllers/admin/permissions.py:128
 msgid "Default permissions updated successfully"
 msgstr "デフォルトの権限を更新しました"
 
-#: rhodecode/controllers/admin/permissions.py:136
+#: rhodecode/controllers/admin/permissions.py:142
 msgid "error occurred during update of permissions"
 msgstr "権限の更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:121
+#: rhodecode/controllers/admin/repos.py:123
 msgid "--REMOVE FORK--"
 msgstr "--フォーク元を削除--"
 
-#: rhodecode/controllers/admin/repos.py:190
+#: rhodecode/controllers/admin/repos.py:162
 #, python-format
 msgid "created repository %s from %s"
 msgstr "リポジトリ %s を %s から作成"
 
-#: rhodecode/controllers/admin/repos.py:194
+#: rhodecode/controllers/admin/repos.py:166
 #, python-format
 msgid "created repository %s"
 msgstr "リポジトリ %s を作成しました"
 
-#: rhodecode/controllers/admin/repos.py:225
+#: rhodecode/controllers/admin/repos.py:197
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr "リポジトリ %s を作成中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:320
+#: rhodecode/controllers/admin/repos.py:302
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr "フォークしたリポジトリが存在するため、 %s は削除できません"
 
-#: rhodecode/controllers/admin/repos.py:349
+#: rhodecode/controllers/admin/repos.py:331
 msgid "An error occurred during deletion of repository user"
 msgstr "リポジトリユーザーの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:368
+#: rhodecode/controllers/admin/repos.py:350
 msgid "An error occurred during deletion of repository users groups"
 msgstr "リポジトリユーザーグループの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:386
+#: rhodecode/controllers/admin/repos.py:368
 msgid "An error occurred during deletion of repository stats"
 msgstr "リポジトリステートの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:403
+#: rhodecode/controllers/admin/repos.py:385
 msgid "An error occurred during cache invalidation"
 msgstr "キャッシュの無効化時にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:443
+#: rhodecode/controllers/admin/repos.py:425
 msgid "Updated repository visibility in public journal"
 msgstr "公開ジャーナルでのリポジトリの可視性を更新しました"
 
+#: rhodecode/controllers/admin/repos.py:429
+msgid "An error occurred during setting this repository in public journal"
+msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました"
+
+#: rhodecode/controllers/admin/repos.py:434 rhodecode/model/validators.py:301
+msgid "Token mismatch"
+msgstr "トークンが合いません"
+
 #: rhodecode/controllers/admin/repos.py:447
-msgid "An error occurred during setting this repository in public journal"
-msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました"
-
-#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300
-msgid "Token mismatch"
-msgstr "トークンが合いません"
-
-#: rhodecode/controllers/admin/repos.py:465
 msgid "Pulled from remote location"
 msgstr "リモートから取得"
 
-#: rhodecode/controllers/admin/repos.py:467
+#: rhodecode/controllers/admin/repos.py:449
 msgid "An error occurred during pull from remote location"
 msgstr "リモートから取得中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos.py:483
+#: rhodecode/controllers/admin/repos.py:465
 msgid "Nothing"
 msgstr "ありません"
 
-#: rhodecode/controllers/admin/repos.py:485
+#: rhodecode/controllers/admin/repos.py:467
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "%s リポジトリを %s のフォークとして印をつける"
 
-#: rhodecode/controllers/admin/repos.py:489
+#: rhodecode/controllers/admin/repos.py:471
 msgid "An error occurred during this operation"
 msgstr "操作中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:120
+#: rhodecode/controllers/admin/repos_groups.py:136
 #, python-format
 msgid "created repos group %s"
 msgstr "リポジトリグループ %s を作成しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:133
+#: rhodecode/controllers/admin/repos_groups.py:148
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr "リポジトリグループ %s を作成中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:167
+#: rhodecode/controllers/admin/repos_groups.py:205
 #, python-format
 msgid "updated repos group %s"
 msgstr "リポジトリグループ %s を更新しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:180
+#: rhodecode/controllers/admin/repos_groups.py:220
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr "リポジトリグループ %s を更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:198
+#: rhodecode/controllers/admin/repos_groups.py:238
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr "このグループは %s リポジトリを含んでいるため削除出来ません"
 
-#: rhodecode/controllers/admin/repos_groups.py:206
+#: rhodecode/controllers/admin/repos_groups.py:246
 #, python-format
 msgid "removed repos group %s"
 msgstr "リポジトリグループ %s を削除しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:212
+#: rhodecode/controllers/admin/repos_groups.py:252
 msgid "Cannot delete this group it still contains subgroups"
 msgstr "サブグループを含んでいるため、このグループを削除できません"
 
-#: rhodecode/controllers/admin/repos_groups.py:217
-#: rhodecode/controllers/admin/repos_groups.py:222
+#: rhodecode/controllers/admin/repos_groups.py:257
+#: rhodecode/controllers/admin/repos_groups.py:262
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr "リポジトリグループ %s の削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:243
+#: rhodecode/controllers/admin/repos_groups.py:283
 msgid "An error occurred during deletion of group user"
 msgstr "グループユーザーを削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/repos_groups.py:264
+#: rhodecode/controllers/admin/repos_groups.py:304
 msgid "An error occurred during deletion of group users groups"
 msgstr "グループユーザーのグループを削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/settings.py:123
-#, python-format
-msgid "Repositories successfully rescanned added: %s,removed: %s"
+#: rhodecode/controllers/admin/settings.py:124
+#, fuzzy, python-format
+msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr "リポジトリを再度スキャンしました。 追加: %s 削除: %s"
 
-#: rhodecode/controllers/admin/settings.py:131
+#: rhodecode/controllers/admin/settings.py:133
 msgid "Whoosh reindex task scheduled"
 msgstr "Whooshの再インデックスタスクを予定に入れました"
 
-#: rhodecode/controllers/admin/settings.py:162
+#: rhodecode/controllers/admin/settings.py:164
 msgid "Updated application settings"
 msgstr "アプリケーション設定を更新しました"
 
-#: rhodecode/controllers/admin/settings.py:166
-#: rhodecode/controllers/admin/settings.py:299
+#: rhodecode/controllers/admin/settings.py:168
+#: rhodecode/controllers/admin/settings.py:301
 msgid "error occurred during updating application settings"
 msgstr "アプリケーション設定を更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/settings.py:207
+#: rhodecode/controllers/admin/settings.py:209
 msgid "Updated visualisation settings"
 msgstr "表示の設定を更新しました"
 
-#: rhodecode/controllers/admin/settings.py:212
+#: rhodecode/controllers/admin/settings.py:214
 msgid "error occurred during updating visualisation settings"
 msgstr "表示の設定を更新中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/settings.py:295
+#: rhodecode/controllers/admin/settings.py:297
 msgid "Updated VCS settings"
 msgstr "VCSの設定を更新しました"
 
-#: rhodecode/controllers/admin/settings.py:309
+#: rhodecode/controllers/admin/settings.py:311
 msgid "Added new hook"
 msgstr "新しいフックを追加しました"
 
-#: rhodecode/controllers/admin/settings.py:321
+#: rhodecode/controllers/admin/settings.py:323
 msgid "Updated hooks"
 msgstr "フックを更新しました"
 
-#: rhodecode/controllers/admin/settings.py:325
+#: rhodecode/controllers/admin/settings.py:327
 msgid "error occurred during hook creation"
 msgstr "フックの作成時にエラーが発生しました"
 
-#: rhodecode/controllers/admin/settings.py:344
+#: rhodecode/controllers/admin/settings.py:346
 msgid "Email task created"
 msgstr "メールのタスクを作成しました"
 
-#: rhodecode/controllers/admin/settings.py:399
+#: rhodecode/controllers/admin/settings.py:408
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr "このユーザーを編集出来ません。このユーザーはアプリケーションにとって必要不可欠です。"
 
-#: rhodecode/controllers/admin/settings.py:430
+#: rhodecode/controllers/admin/settings.py:448
 msgid "Your account was updated successfully"
 msgstr "アカウントを更新しました"
 
-#: rhodecode/controllers/admin/settings.py:445
-#: rhodecode/controllers/admin/users.py:196
+#: rhodecode/controllers/admin/settings.py:463
+#: rhodecode/controllers/admin/users.py:198
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr "ユーザー %s の更新中にエラーが発生しました"
@@ -642,52 +646,67 b' msgstr "\xe3\x83\xa6\xe3\x83\xbc\xe3\x82\xb6\xe3\x83\xbc %s \xe3\x81\xae\xe4\xbd\x9c\xe6\x88\x90\xe4\xb8\xad\xe3\x81\xab\xe3\x82\xa8\xe3\x83\xa9\xe3\x83\xbc\xe3\x81\x8c\xe7\x99\xba\xe7\x94\x9f\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x97\xe3\x81\x9f"'
 msgid "User updated successfully"
 msgstr "ユーザーの更新に成功しました"
 
-#: rhodecode/controllers/admin/users.py:212
+#: rhodecode/controllers/admin/users.py:214
 msgid "successfully deleted user"
 msgstr "ユーザーの削除に成功しました"
 
-#: rhodecode/controllers/admin/users.py:217
+#: rhodecode/controllers/admin/users.py:219
 msgid "An error occurred during deletion of user"
 msgstr "ユーザーの削除中にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:231
+#: rhodecode/controllers/admin/users.py:233
 msgid "You can't edit this user"
 msgstr "このユーザーは編集できません"
 
-#: rhodecode/controllers/admin/users.py:272
+#: rhodecode/controllers/admin/users.py:276
 msgid "Granted 'repository create' permission to user"
 msgstr "ユーザーに 'リポジトリ作成' 権限を与えました"
 
-#: rhodecode/controllers/admin/users.py:277
+#: rhodecode/controllers/admin/users.py:281
 msgid "Revoked 'repository create' permission to user"
 msgstr "ユーザーの 'リポジトリ作成' 権限を取り消しました"
 
-#: rhodecode/controllers/admin/users.py:283
+#: rhodecode/controllers/admin/users.py:287
 msgid "Granted 'repository fork' permission to user"
 msgstr "ユーザーに 'リポジトリフォーク' 権限を与えました"
 
-#: rhodecode/controllers/admin/users.py:288
+#: rhodecode/controllers/admin/users.py:292
 msgid "Revoked 'repository fork' permission to user"
 msgstr "ユーザーの 'リポジトリフォーク' 権限を取り消しました"
 
-#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users.py:298
 #: rhodecode/controllers/admin/users_groups.py:279
 msgid "An error occurred during permissions saving"
 msgstr "権限の保存時にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:309
+#: rhodecode/controllers/admin/users.py:312
 #, python-format
 msgid "Added email %s to user"
 msgstr "ユーザーにメール %s を追加しました"
 
-#: rhodecode/controllers/admin/users.py:315
+#: rhodecode/controllers/admin/users.py:318
 msgid "An error occurred during email saving"
 msgstr "メールの保存時にエラーが発生しました"
 
-#: rhodecode/controllers/admin/users.py:325
+#: rhodecode/controllers/admin/users.py:328
 msgid "Removed email from user"
 msgstr "ユーザーからメールを削除しました"
 
+#: rhodecode/controllers/admin/users.py:341
+#, fuzzy, python-format
+msgid "Added ip %s to user"
+msgstr "ユーザーにメール %s を追加しました"
+
+#: rhodecode/controllers/admin/users.py:347
+#, fuzzy
+msgid "An error occurred during ip saving"
+msgstr "メールの保存時にエラーが発生しました"
+
+#: rhodecode/controllers/admin/users.py:359
+#, fuzzy
+msgid "Removed ip from user"
+msgstr "ユーザーからメールを削除しました"
+
 #: rhodecode/controllers/admin/users_groups.py:86
 #, python-format
 msgid "created users group %s"
@@ -732,11 +751,16 b' msgstr "\xe3\x83\xa6\xe3\x83\xbc\xe3\x82\xb6\xe3\x83\xbc\xe3\x82\xb0\xe3\x83\xab\xe3\x83\xbc\xe3\x83\x97\xe3\x81\xab \'\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x83\x95\xe3\x82\xa9\xe3\x83\xbc\xe3\x82\xaf\' \xe6\xa8\xa9\xe9\x99\x90\xe3\x82\x92\xe4\xb8\x8e\xe3\x81\x88\xe3\x81\xbe\xe3\x81\x97\xe3\x81\x9f"'
 msgid "Revoked 'repository fork' permission to users group"
 msgstr "ユーザーグループの 'リポジトリフォーク' 権限を取り消しました"
 
-#: rhodecode/lib/auth.py:499
+#: rhodecode/lib/auth.py:509
+#, fuzzy, python-format
+msgid "IP %s not allowed"
+msgstr "%s フォロワー"
+
+#: rhodecode/lib/auth.py:558
 msgid "You need to be a registered user to perform this action"
 msgstr "このアクションを実行するためには登録ユーザーである必要があります"
 
-#: rhodecode/lib/auth.py:540
+#: rhodecode/lib/auth.py:599
 msgid "You need to be a signed in to view this page"
 msgstr "このページを閲覧するためにはサインインが必要です"
 
@@ -889,16 +913,16 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xae[\xe3\x83\x95\xe3\x82\xa9\xe3\x83\xad\xe3\x83\xbc\xe3\x82\x92\xe9\x96\x8b\xe5\xa7\x8b]"'
 msgid "[stopped following] repository"
 msgstr "リポジトリの[フォローを停止]"
 
-#: rhodecode/lib/helpers.py:883
+#: rhodecode/lib/helpers.py:884
 #, python-format
 msgid " and %s more"
 msgstr " と %s 以上"
 
-#: rhodecode/lib/helpers.py:887
+#: rhodecode/lib/helpers.py:888
 msgid "No Files"
 msgstr "ファイルなし"
 
-#: rhodecode/lib/helpers.py:1163
+#: rhodecode/lib/helpers.py:1164
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -972,92 +996,112 b' msgstr "\xe3\x81\xa1\xe3\x82\x87\xe3\x81\x86\xe3\x81\xa9\xe3\x81\x84\xe3\x81\xbe"'
 msgid "password reset link"
 msgstr "パスワードリセットのリンク"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313
 msgid "Repository no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314
 msgid "Repository read access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315
 msgid "Repository write access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316
 msgid "Repository admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318
 msgid "Repositories Group no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319
 msgid "Repositories Group read access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320
 msgid "Repositories Group write access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321
 msgid "Repositories Group admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323
 msgid "RhodeCode Administrator"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324
 msgid "Repository creation disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325
 msgid "Repository creation enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326
 msgid "Repository forking disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327
 msgid "Repository forking enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328
 msgid "Register disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776
 msgid "Not Reviewed"
 msgstr "未レビュー"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777
 msgid "Approved"
 msgstr "承認"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778
 msgid "Rejected"
 msgstr "却下"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779
 msgid "Under Review"
 msgstr "レビュー中"
 
-#: rhodecode/model/comment.py:110
+#: rhodecode/model/comment.py:109
 #, python-format
 msgid "on line %s"
 msgstr ""
 
-#: rhodecode/model/comment.py:173
+#: rhodecode/model/comment.py:176
 msgid "[Mention]"
 msgstr "[Mention]"
 
@@ -1109,70 +1153,69 b' msgstr "\xe6\x96\xb0\xe3\x81\x97\xe3\x81\x84\xe3\x83\x97\xe3\x83\xab\xe3\x83\xaa\xe3\x82\xaf\xe3\x82\xa8\xe3\x82\xb9\xe3\x83\x88\xe3\x82\x92\xe4\xbd\x9c\xe6\x88\x90 %(when)s"'
 msgid "commented on pull request at %(when)s"
 msgstr "プルリクエストにコメント %(when)s"
 
-#: rhodecode/model/pull_request.py:90
+#: rhodecode/model/pull_request.py:100
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr "%(user)s がプリリクエスト #%(pr_id)s のレビューを求めています"
 
-#: rhodecode/model/scm.py:542
+#: rhodecode/model/scm.py:556
 msgid "latest tip"
 msgstr "最新のtip"
 
-#: rhodecode/model/user.py:232
+#: rhodecode/model/user.py:231
 msgid "new user registration"
 msgstr "新規ユーザー登録"
 
-#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
-#: rhodecode/model/user.py:303
+#: rhodecode/model/user.py:256 rhodecode/model/user.py:280
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr "アプリケーション全体にとって重要なユーザなため、編集出来ません"
 
-#: rhodecode/model/user.py:327
+#: rhodecode/model/user.py:302
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr "アプリケーション全体にとって重要なユーザなため、削除できません"
 
-#: rhodecode/model/user.py:333
+#: rhodecode/model/user.py:308
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories. %s"
 msgstr ""
 
-#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37
+#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38
 msgid "Value cannot be an empty list"
 msgstr "空のリストには出来ません"
 
-#: rhodecode/model/validators.py:83
+#: rhodecode/model/validators.py:84
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "ユーザー名 \"%(username)s\" はすでに使われています"
 
-#: rhodecode/model/validators.py:85
+#: rhodecode/model/validators.py:86
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr "ユーザー名 \"%(username)s\" は許可されていません"
 
-#: rhodecode/model/validators.py:87
+#: rhodecode/model/validators.py:88
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
 msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります"
 
-#: rhodecode/model/validators.py:115
+#: rhodecode/model/validators.py:116
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr "ユーザー名 %(username)s は不正です"
 
-#: rhodecode/model/validators.py:134
+#: rhodecode/model/validators.py:135
 msgid "Invalid users group name"
 msgstr "不正なユーザーグループ名です"
 
-#: rhodecode/model/validators.py:135
+#: rhodecode/model/validators.py:136
 #, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr "ユーザーグループ \"%(usersgroup)s\" はすでに存在します"
 
-#: rhodecode/model/validators.py:137
+#: rhodecode/model/validators.py:138
 msgid ""
 "users group name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
@@ -1180,104 +1223,118 b' msgstr ""'
 "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります"
 " "
 
-#: rhodecode/model/validators.py:175
+#: rhodecode/model/validators.py:176
 msgid "Cannot assign this group as parent"
 msgstr "このグループは親にできません"
 
-#: rhodecode/model/validators.py:176
+#: rhodecode/model/validators.py:177
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "グループ \"%(group_name)s\" はすでに存在します"
 
-#: rhodecode/model/validators.py:178
+#: rhodecode/model/validators.py:179
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "グループ名 \"%(group_name)s\" を持つリポジトリはすでに存在します"
 
-#: rhodecode/model/validators.py:236
+#: rhodecode/model/validators.py:237
 msgid "Invalid characters (non-ascii) in password"
 msgstr "パスワードに利用出来ない文字列(non-ascii)です"
 
-#: rhodecode/model/validators.py:251
+#: rhodecode/model/validators.py:252
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: rhodecode/model/validators.py:268
+#: rhodecode/model/validators.py:269
 msgid "invalid password"
 msgstr "不正なパスワードです"
 
-#: rhodecode/model/validators.py:269
+#: rhodecode/model/validators.py:270
 msgid "invalid user name"
 msgstr "不正なユーザー名です"
 
-#: rhodecode/model/validators.py:270
+#: rhodecode/model/validators.py:271
 msgid "Your account is disabled"
 msgstr "アカウントは無効です"
 
-#: rhodecode/model/validators.py:314
+#: rhodecode/model/validators.py:315
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr "リポジトリ名 %(repo)s は許可されていません"
 
-#: rhodecode/model/validators.py:316
+#: rhodecode/model/validators.py:317
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "リポジトリ %(repo)s はすでに存在します"
 
-#: rhodecode/model/validators.py:317
+#: rhodecode/model/validators.py:318
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "リポジトリ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します"
 
-#: rhodecode/model/validators.py:319
+#: rhodecode/model/validators.py:320
 #, python-format
 msgid "Repositories group with name \"%(repo)s\" already exists"
 msgstr "リポジトリグループ名 \"%(repo)s\" はすでに存在します"
 
-#: rhodecode/model/validators.py:432
+#: rhodecode/model/validators.py:433
 msgid "invalid clone url"
 msgstr "無効なクローンURIです"
 
-#: rhodecode/model/validators.py:433
+#: rhodecode/model/validators.py:434
 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:458
+#: rhodecode/model/validators.py:459
 msgid "Fork have to be the same type as parent"
 msgstr "フォークは親と同じタイプの必要があります"
 
-#: rhodecode/model/validators.py:473
+#: rhodecode/model/validators.py:474
 msgid "You don't have permissions to create repository in this group"
 msgstr "このグループでリポジトリを作成する権限がありません"
 
-#: rhodecode/model/validators.py:498
+#: rhodecode/model/validators.py:501
+#, fuzzy
+msgid "You don't have permissions to create a group in this location"
+msgstr "このグループでリポジトリを作成する権限がありません"
+
+#: rhodecode/model/validators.py:540
 msgid "This username or users group name is not valid"
 msgstr "ユーザー名かユーザーグループが不正です"
 
-#: rhodecode/model/validators.py:591
+#: rhodecode/model/validators.py:636
 msgid "This is not a valid path"
 msgstr "不正なパスです"
 
-#: rhodecode/model/validators.py:606
+#: rhodecode/model/validators.py:651
 msgid "This e-mail address is already taken"
 msgstr "このメールアドレスはすでに取得されています"
 
-#: rhodecode/model/validators.py:626
+#: rhodecode/model/validators.py:671
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "メールアドレス \"%(email)s\" は存在しません"
 
-#: rhodecode/model/validators.py:663
+#: rhodecode/model/validators.py:708
 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:682
+#: rhodecode/model/validators.py:727
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
+#: rhodecode/model/validators.py:759
+msgid "Please enter a valid IPv4 or IpV6 address"
+msgstr ""
+
+#: rhodecode/model/validators.py:760
+#, python-format
+msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
+msgstr ""
+
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr "ダッシュボード"
@@ -1290,43 +1347,55 b' msgstr "\xe3\x83\x80\xe3\x83\x83\xe3\x82\xb7\xe3\x83\xa5\xe3\x83\x9c\xe3\x83\xbc\xe3\x83\x89"'
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 #: rhodecode/templates/branches/branches.html:9
 #: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:48
+#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:50
 #: rhodecode/templates/tags/tags.html:10
 msgid "quick filter..."
 msgstr "クイックフィルタ..."
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:233
+#: rhodecode/templates/base/base.html:239
 msgid "repositories"
 msgstr "リポジトリ"
 
-#: rhodecode/templates/index_base.html:13
-#: rhodecode/templates/index_base.html:15
+#: rhodecode/templates/index_base.html:14
+#: rhodecode/templates/index_base.html:17
+#: rhodecode/templates/admin/repos/repo_add.html:5
+#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
 #: rhodecode/templates/admin/repos/repos.html:21
-msgid "ADD REPOSITORY"
+msgid "Add repository"
 msgstr "リポジトリの追加"
 
-#: rhodecode/templates/index_base.html:29
-#: rhodecode/templates/index_base.html:136
+#: rhodecode/templates/index_base.html:23
+#, fuzzy
+msgid "Edit group"
+msgstr "リポジトリグループを編集"
+
+#: rhodecode/templates/index_base.html:23
+msgid "You have admin right to this group, and can edit it"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:36
+#: rhodecode/templates/index_base.html:140
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
 #: rhodecode/templates/admin/users_groups/users_group_add.html:32
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33
 msgid "Group name"
 msgstr "グループ名"
 
-#: rhodecode/templates/index_base.html:30
-#: rhodecode/templates/index_base.html:72
-#: rhodecode/templates/index_base.html:138
-#: rhodecode/templates/index_base.html:176
-#: rhodecode/templates/index_base.html:266
+#: rhodecode/templates/index_base.html:37
+#: rhodecode/templates/index_base.html:79
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/index_base.html:180
+#: rhodecode/templates/index_base.html:273
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
-#: rhodecode/templates/admin/repos/repos.html:72
+#: rhodecode/templates/admin/repos/repos.html:73
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
 #: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:66
@@ -1334,31 +1403,29 b' msgstr "\xe3\x82\xb0\xe3\x83\xab\xe3\x83\xbc\xe3\x83\x97\xe5\x90\x8d"'
 msgid "Description"
 msgstr "説明"
 
-#: rhodecode/templates/index_base.html:40
+#: rhodecode/templates/index_base.html:47
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47
 msgid "Repositories group"
 msgstr "リポジトリグループ"
 
-#: rhodecode/templates/index_base.html:71
-#: rhodecode/templates/index_base.html:174
-#: rhodecode/templates/index_base.html:264
+#: rhodecode/templates/index_base.html:78
+#: rhodecode/templates/index_base.html:178
+#: rhodecode/templates/index_base.html:271
+#: rhodecode/templates/admin/permissions/permissions.html:117
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
-#: rhodecode/templates/admin/repos/repos.html:70
-#: rhodecode/templates/admin/users/user_edit.html:196
-#: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:180
-#: rhodecode/templates/admin/users/user_edit_my_account.html:216
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
+#: rhodecode/templates/admin/repos/repos.html:71
+#: rhodecode/templates/admin/users/user_edit.html:200
+#: rhodecode/templates/admin/users/user_edit_my_account.html:60
+#: rhodecode/templates/admin/users/user_edit_my_account.html:211
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:184
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
 #: rhodecode/templates/branches/branches.html:50
 #: rhodecode/templates/branches/branches_data.html:6
 #: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:70
-#: rhodecode/templates/journal/journal.html:196
-#: rhodecode/templates/journal/journal_page_repos.html:7
+#: rhodecode/templates/journal/journal.html:201
+#: rhodecode/templates/journal/journal.html:305
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
 #: rhodecode/templates/summary/summary.html:132
@@ -1367,99 +1434,107 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x82\xb0\xe3\x83\xab\xe3\x83\xbc\xe3\x83\x97"'
 msgid "Name"
 msgstr "名前"
 
-#: rhodecode/templates/index_base.html:73
+#: rhodecode/templates/index_base.html:80
 msgid "Last change"
 msgstr "最後の変更時刻"
 
-#: rhodecode/templates/index_base.html:74
-#: rhodecode/templates/index_base.html:179
-#: rhodecode/templates/admin/users/user_edit_my_account.html:182
-#: rhodecode/templates/journal/journal.html:198
+#: rhodecode/templates/index_base.html:81
+#: rhodecode/templates/index_base.html:183
+#: rhodecode/templates/index_base.html:276
+#: rhodecode/templates/admin/repos/repos.html:74
+#: rhodecode/templates/admin/users/user_edit_my_account.html:213
+#: rhodecode/templates/journal/journal.html:203
+#: rhodecode/templates/journal/journal.html:307
 msgid "Tip"
 msgstr "Tip"
 
-#: rhodecode/templates/index_base.html:75
-#: rhodecode/templates/index_base.html:181
-#: rhodecode/templates/index_base.html:269
+#: rhodecode/templates/index_base.html:82
+#: rhodecode/templates/index_base.html:185
+#: rhodecode/templates/index_base.html:278
 #: rhodecode/templates/admin/repos/repo_edit.html:121
-#: rhodecode/templates/admin/repos/repos.html:73
+#: rhodecode/templates/admin/repos/repos.html:76
 msgid "Owner"
 msgstr "所有者"
 
-#: rhodecode/templates/index_base.html:76
+#: rhodecode/templates/index_base.html:83
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr "RSS"
 
-#: rhodecode/templates/index_base.html:77
+#: rhodecode/templates/index_base.html:84
 msgid "Atom"
 msgstr "Atom"
 
-#: rhodecode/templates/index_base.html:167
-#: rhodecode/templates/index_base.html:207
-#: rhodecode/templates/index_base.html:291
-#: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:202
+#: rhodecode/templates/index_base.html:171
+#: rhodecode/templates/index_base.html:211
+#: rhodecode/templates/index_base.html:300
+#: rhodecode/templates/admin/repos/repos.html:97
+#: rhodecode/templates/admin/users/user_edit_my_account.html:235
 #: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
 #: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:221
+#: rhodecode/templates/journal/journal.html:225
+#: rhodecode/templates/journal/journal.html:329
 #: rhodecode/templates/tags/tags.html:77
 msgid "Click to sort ascending"
 msgstr "昇順で並び換え"
 
-#: rhodecode/templates/index_base.html:168
-#: rhodecode/templates/index_base.html:208
-#: rhodecode/templates/index_base.html:292
-#: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:203
+#: rhodecode/templates/index_base.html:172
+#: rhodecode/templates/index_base.html:212
+#: rhodecode/templates/index_base.html:301
+#: rhodecode/templates/admin/repos/repos.html:98
+#: rhodecode/templates/admin/users/user_edit_my_account.html:236
 #: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:222
+#: rhodecode/templates/journal/journal.html:226
+#: rhodecode/templates/journal/journal.html:330
 #: rhodecode/templates/tags/tags.html:78
 msgid "Click to sort descending"
 msgstr "降順で並び替え"
 
-#: rhodecode/templates/index_base.html:177
-#: rhodecode/templates/index_base.html:267
+#: rhodecode/templates/index_base.html:181
+#: rhodecode/templates/index_base.html:274
 msgid "Last Change"
 msgstr "最後の変更点"
 
-#: rhodecode/templates/index_base.html:209
-#: rhodecode/templates/index_base.html:293
-#: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:204
+#: rhodecode/templates/index_base.html:213
+#: rhodecode/templates/index_base.html:302
+#: rhodecode/templates/admin/repos/repos.html:99
+#: rhodecode/templates/admin/users/user_edit_my_account.html:237
 #: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
 #: rhodecode/templates/branches/branches.html:78
-#: rhodecode/templates/journal/journal.html:223
+#: rhodecode/templates/journal/journal.html:227
+#: rhodecode/templates/journal/journal.html:331
 #: rhodecode/templates/tags/tags.html:79
 msgid "No records found."
 msgstr "レコードが見つかりません"
 
-#: rhodecode/templates/index_base.html:210
-#: rhodecode/templates/index_base.html:294
-#: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:205
+#: rhodecode/templates/index_base.html:214
+#: rhodecode/templates/index_base.html:303
+#: rhodecode/templates/admin/repos/repos.html:100
+#: rhodecode/templates/admin/users/user_edit_my_account.html:238
 #: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:79
-#: rhodecode/templates/journal/journal.html:224
+#: rhodecode/templates/journal/journal.html:228
+#: rhodecode/templates/journal/journal.html:332
 #: rhodecode/templates/tags/tags.html:80
 msgid "Data error."
 msgstr "データエラー"
 
-#: rhodecode/templates/index_base.html:211
-#: rhodecode/templates/index_base.html:295
-#: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:206
+#: rhodecode/templates/index_base.html:215
+#: rhodecode/templates/index_base.html:304
+#: rhodecode/templates/admin/repos/repos.html:101
+#: rhodecode/templates/admin/users/user_edit_my_account.html:105
+#: rhodecode/templates/admin/users/user_edit_my_account.html:239
 #: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:80
-#: rhodecode/templates/journal/journal.html:62
-#: rhodecode/templates/journal/journal.html:225
+#: rhodecode/templates/journal/journal.html:229
+#: rhodecode/templates/journal/journal.html:333
 #: rhodecode/templates/tags/tags.html:81
 msgid "Loading..."
 msgstr "読み込み中..."
@@ -1475,9 +1550,9 b' msgstr ""'
 #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
 #: rhodecode/templates/admin/admin_log.html:5
 #: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:50
+#: rhodecode/templates/admin/users/user_edit.html:54
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
-#: rhodecode/templates/base/base.html:83
+#: rhodecode/templates/base/base.html:89
 #: rhodecode/templates/summary/summary.html:131
 msgid "Username"
 msgstr "ユーザー名"
@@ -1485,7 +1560,7 b' msgstr "\xe3\x83\xa6\xe3\x83\xbc\xe3\x82\xb6\xe3\x83\xbc\xe5\x90\x8d"'
 #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
 #: rhodecode/templates/admin/ldap/ldap.html:46
 #: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:92
+#: rhodecode/templates/base/base.html:98
 msgid "Password"
 msgstr "パスワード"
 
@@ -1497,7 +1572,7 b' msgstr "\xe6\xac\xa1\xe5\x9b\x9e\xe3\x81\x8b\xe3\x82\x89\xe8\x87\xaa\xe5\x8b\x95\xe7\x9a\x84\xe3\x81\xab\xe3\x82\xb5\xe3\x82\xa4\xe3\x83\xb3\xe3\x82\xa4\xe3\x83\xb3"'
 msgid "Forgot your password ?"
 msgstr "パスワードを忘れた場合はこちら"
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109
 msgid "Don't have an account ?"
 msgstr "アカウントを持っていない場合はこちら"
 
@@ -1535,22 +1610,22 b' msgstr "\xe3\x83\x91\xe3\x82\xb9\xe3\x83\xaf\xe3\x83\xbc\xe3\x83\x89\xe5\x86\x8d\xe5\x85\xa5\xe5\x8a\x9b"'
 
 #: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:90
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
+#: rhodecode/templates/admin/users/user_edit.html:94
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57
 msgid "First Name"
 msgstr "名前"
 
 #: rhodecode/templates/register.html:56
 #: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:99
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
+#: rhodecode/templates/admin/users/user_edit.html:103
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66
 msgid "Last Name"
 msgstr "名字"
 
 #: rhodecode/templates/register.html:65
 #: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:108
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
+#: rhodecode/templates/admin/users/user_edit.html:112
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75
 #: rhodecode/templates/summary/summary.html:133
 msgid "Email"
 msgstr "メールアドレス"
@@ -1628,11 +1703,10 b' msgid_plural "%s entries"'
 msgstr[0] "%s エントリ"
 
 #: rhodecode/templates/admin/admin_log.html:6
-#: rhodecode/templates/admin/repos/repos.html:74
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:10
+#: rhodecode/templates/admin/repos/repos.html:77
+#: rhodecode/templates/admin/users/user_edit_my_account.html:215
+#: rhodecode/templates/journal/journal.html:205
+#: rhodecode/templates/journal/journal.html:309
 msgid "Action"
 msgstr "アクション"
 
@@ -1706,7 +1780,7 b' msgstr "\xe6\xa6\x82\xe8\xa6\x81\xe3\x83\x9a\xe3\x83\xbc\xe3\x82\xb8\xe3\x81\xae\xe3\x83\x80\xe3\x82\xa6\xe3\x83\xb3\xe3\x83\xad\xe3\x83\xbc\xe3\x83\x89\xe3\x83\xa1\xe3\x83\x8b\xe3\x83\xa5\xe3\x83\xbc\xe3\x82\x92\xe6\x9c\x89\xe5\x8a\xb9\xe3\x81\xab\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99"'
 
 #: rhodecode/templates/admin/defaults/defaults.html:75
 #: rhodecode/templates/admin/repos/repo_edit.html:112
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71
 msgid "Enable locking"
 msgstr "ロックを有効にする"
 
@@ -1717,12 +1791,13 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xaepull\xe3\x81\xae\xe3\x83\xad\xe3\x83\x83\xe3\x82\xaf\xe3\x82\x92\xe6\x9c\x89\xe5\x8a\xb9\xe3\x81\xab\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99"'
 
 #: rhodecode/templates/admin/defaults/defaults.html:84
 #: rhodecode/templates/admin/ldap/ldap.html:89
+#: rhodecode/templates/admin/permissions/permissions.html:92
 #: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79
 #: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_edit.html:133
-#: rhodecode/templates/admin/users/user_edit.html:178
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
+#: rhodecode/templates/admin/users/user_edit.html:137
+#: rhodecode/templates/admin/users/user_edit.html:182
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135
 #: rhodecode/templates/settings/repo_settings.html:94
 msgid "Save"
@@ -1814,8 +1889,8 b' msgid "Comments"'
 msgstr "コメント"
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:267
-#: rhodecode/templates/base/base.html:269
+#: rhodecode/templates/base/base.html:272
+#: rhodecode/templates/base/base.html:274
 msgid "Pull requests"
 msgstr "プルリクエスト"
 
@@ -1842,8 +1917,8 b' msgstr "\xe6\xa8\xa9\xe9\x99\x90\xe7\xae\xa1\xe7\x90\x86"'
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:134
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
-#: rhodecode/templates/admin/users/user_edit.html:143
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63
+#: rhodecode/templates/admin/users/user_edit.html:147
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
 #: rhodecode/templates/settings/repo_settings.html:86
 msgid "Permissions"
@@ -1897,19 +1972,110 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe4\xbd\x9c\xe6\x88\x90"'
 msgid "Repository forking"
 msgstr "リポジトリフォーク"
 
-#: rhodecode/templates/admin/permissions/permissions.html:92
-#: rhodecode/templates/admin/repos/repo_edit.html:264
-msgid "set"
-msgstr "保存"
-
-#: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
-msgid "Add repository"
-msgstr "リポジトリの追加"
+#: rhodecode/templates/admin/permissions/permissions.html:93
+#: rhodecode/templates/admin/permissions/permissions.html:209
+#: rhodecode/templates/admin/repos/repo_edit.html:142
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80
+#: rhodecode/templates/admin/settings/settings.html:113
+#: rhodecode/templates/admin/settings/settings.html:179
+#: rhodecode/templates/admin/settings/settings.html:269
+#: rhodecode/templates/admin/users/user_edit.html:138
+#: rhodecode/templates/admin/users/user_edit.html:183
+#: rhodecode/templates/admin/users/user_edit.html:286
+#: rhodecode/templates/admin/users/user_edit.html:334
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
+#: rhodecode/templates/files/files_add.html:82
+#: rhodecode/templates/files/files_edit.html:68
+#: rhodecode/templates/pullrequests/pullrequest.html:124
+#: rhodecode/templates/settings/repo_settings.html:95
+msgid "Reset"
+msgstr "リセット"
+
+#: rhodecode/templates/admin/permissions/permissions.html:103
+#, fuzzy
+msgid "Default User Permissions"
+msgstr "デフォルトの権限"
+
+#: rhodecode/templates/admin/permissions/permissions.html:111
+#: rhodecode/templates/admin/users/user_edit.html:194
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
+msgid "Nothing here yet"
+msgstr "まだありません"
+
+#: rhodecode/templates/admin/permissions/permissions.html:118
+#: rhodecode/templates/admin/users/user_edit.html:201
+#: rhodecode/templates/admin/users/user_edit_my_account.html:61
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
+msgid "Permission"
+msgstr "権限"
+
+#: rhodecode/templates/admin/permissions/permissions.html:119
+#: rhodecode/templates/admin/users/user_edit.html:202
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
+msgid "Edit Permission"
+msgstr "権限の編集"
+
+#: rhodecode/templates/admin/permissions/permissions.html:149
+#: rhodecode/templates/admin/permissions/permissions.html:151
+#: rhodecode/templates/admin/repos/repo_edit.html:13
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/users/user_edit.html:13
+#: rhodecode/templates/admin/users/user_edit.html:232
+#: rhodecode/templates/admin/users/user_edit.html:234
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
+#: rhodecode/templates/data_table/_dt_elements.html:116
+#: rhodecode/templates/data_table/_dt_elements.html:117
+msgid "edit"
+msgstr "編集"
+
+#: rhodecode/templates/admin/permissions/permissions.html:168
+#: rhodecode/templates/admin/users/user_edit.html:295
+#, fuzzy
+msgid "Allowed IP addresses"
+msgstr "メールアドレス"
+
+#: rhodecode/templates/admin/permissions/permissions.html:182
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
+#: rhodecode/templates/admin/users/user_edit.html:263
+#: rhodecode/templates/admin/users/user_edit.html:308
+#: rhodecode/templates/admin/users_groups/users_groups.html:44
+#: rhodecode/templates/data_table/_dt_elements.html:122
+#: rhodecode/templates/data_table/_dt_elements.html:130
+msgid "delete"
+msgstr "削除"
+
+#: rhodecode/templates/admin/permissions/permissions.html:183
+#: rhodecode/templates/admin/users/user_edit.html:309
+#, fuzzy, python-format
+msgid "Confirm to delete this ip: %s"
+msgstr "このメールを削除してよろしいですか: %s"
+
+#: rhodecode/templates/admin/permissions/permissions.html:189
+#: rhodecode/templates/admin/users/user_edit.html:315
+msgid "All IP addresses are allowed"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:200
+#: rhodecode/templates/admin/users/user_edit.html:326
+#, fuzzy
+msgid "New ip address"
+msgstr "新しいメールアドレス"
+
+#: rhodecode/templates/admin/permissions/permissions.html:208
+#: rhodecode/templates/admin/users/user_edit.html:285
+#: rhodecode/templates/admin/users/user_edit.html:333
+msgid "Add"
+msgstr "追加"
 
 #: rhodecode/templates/admin/repos/repo_add.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:11
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
+#: rhodecode/templates/base/base.html:154
 msgid "Repositories"
 msgstr "リポジトリ"
 
@@ -1971,19 +2137,6 b' msgstr "\xe6\x96\xb0\xe3\x81\x97\xe3\x81\x84\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xae\xe8\xbf\xbd\xe5\x8a\xa0"'
 msgid "Edit repository"
 msgstr "リポジトリを編集"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:228
-#: rhodecode/templates/admin/users/user_edit.html:230
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
-#: rhodecode/templates/files/files_source.html:29
-#: rhodecode/templates/journal/journal_page_repos.html:29
-msgid "edit"
-msgstr "編集"
-
 #: rhodecode/templates/admin/repos/repo_edit.html:40
 #: rhodecode/templates/settings/repo_settings.html:39
 msgid "Clone uri"
@@ -1998,23 +2151,6 b' msgstr "\xe3\x82\xaa\xe3\x83\x97\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3: \xe3\x81\x93\xe3\x81\xae\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x82\x92\xe9\x85\x8d\xe7\xbd\xae\xe3\x81\x99\xe3\x82\x8b\xe3\x82\xb0\xe3\x83\xab\xe3\x83\xbc\xe3\x83\x97\xe3\x82\x92\xe9\x81\xb8\xe6\x8a\x9e\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99"'
 msgid "Change owner of this repository."
 msgstr "リポジトリの所有者を変更"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
-#: rhodecode/templates/admin/settings/settings.html:113
-#: rhodecode/templates/admin/settings/settings.html:179
-#: rhodecode/templates/admin/settings/settings.html:269
-#: rhodecode/templates/admin/users/user_edit.html:134
-#: rhodecode/templates/admin/users/user_edit.html:179
-#: rhodecode/templates/admin/users/user_edit.html:282
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/files/files_add.html:82
-#: rhodecode/templates/files/files_edit.html:68
-#: rhodecode/templates/pullrequests/pullrequest.html:124
-#: rhodecode/templates/settings/repo_settings.html:95
-msgid "Reset"
-msgstr "リセット"
-
 #: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr "管理"
@@ -2083,16 +2219,16 b' msgstr "\xe3\x82\xad\xe3\x83\xbc"'
 
 #: rhodecode/templates/admin/repos/repo_edit.html:203
 #: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:117
+#: rhodecode/templates/admin/users/user_edit.html:121
 #: rhodecode/templates/admin/users_groups/users_group_add.html:41
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42
 msgid "Active"
 msgstr "アクティブ"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:218
-#: rhodecode/templates/base/base.html:331
-#: rhodecode/templates/base/base.html:333
-#: rhodecode/templates/base/base.html:335
+#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/base/base.html:308
+#: rhodecode/templates/base/base.html:310
 msgid "Public journal"
 msgstr "公開ジャーナル"
 
@@ -2142,12 +2278,16 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x82\x92\xe5\xbc\xb7\xe5\x88\xb6\xe3\x83\xad\xe3\x83\x83\xe3\x82\xaf\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99\xe3\x80\x82\xe5\x8c\xbf\xe5\x90\x8d\xe3\x82\xa2\xe3\x82\xaf\xe3\x82\xbb\xe3\x82\xb9\xe3\x81\x8c\xe7\x84\xa1\xe5\x8a\xb9\xe3\x81\xab\xe3\x81\xaa\xe3\x81\xa3\xe3\x81\xa6\xe3\x81\x84\xe3\x82\x8b\xe5\xa0\xb4\xe5\x90\x88\xe3\x81\xae\xe3\x81\xbf\xe5\x8b\x95\xe4\xbd\x9c\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99\xe3\x80\x82"'
 msgid "Set as fork of"
 msgstr "フォーク元の設定"
 
+#: rhodecode/templates/admin/repos/repo_edit.html:264
+msgid "set"
+msgstr "保存"
+
 #: rhodecode/templates/admin/repos/repo_edit.html:268
 msgid "Manually set this repository as a fork of another from the list"
 msgstr "このリポジトリをリスト中の他のリポジトリのフォークとして、手動で設定します"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:274
-#: rhodecode/templates/changeset/changeset_file_comment.html:26
+#: rhodecode/templates/changeset/changeset_file_comment.html:41
 msgid "Delete"
 msgstr "削除"
 
@@ -2189,7 +2329,7 b' msgstr "\xe6\x9b\xb8\xe8\xbe\xbc"'
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:6
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
 #: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/base/base.html:229
+#: rhodecode/templates/base/base.html:235
 msgid "admin"
 msgstr "管理"
 
@@ -2199,8 +2339,7 b' msgid "member"'
 msgstr "メンバー"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-#: rhodecode/templates/data_table/_dt_elements.html:67
-#: rhodecode/templates/journal/journal.html:95
+#: rhodecode/templates/data_table/_dt_elements.html:61
 #: rhodecode/templates/summary/summary.html:85
 msgid "private repository"
 msgstr "非公開リポジトリ"
@@ -2243,15 +2382,12 b' msgstr "\xe5\xad\x90\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xab\xe3\x82\x82\xe9\x81\xa9\xe7\x94\xa8"'
 
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74
 msgid ""
-"Set or revoke permission to all children of that group, including "
-"repositories and other groups"
+"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:9
-#: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:313
-#: rhodecode/templates/base/base.html:315
-#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:128
 #: rhodecode/templates/bookmarks/bookmarks.html:11
 #: rhodecode/templates/branches/branches.html:10
 #: rhodecode/templates/changelog/changelog.html:10
@@ -2292,7 +2428,7 b' msgid "add new repos group"'
 msgstr "新しいリポジトリグループを追加"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55
 msgid "Group parent"
 msgstr "親グループ"
 
@@ -2300,7 +2436,7 b' msgstr "\xe8\xa6\xaa\xe3\x82\xb0\xe3\x83\xab\xe3\x83\xbc\xe3\x83\x97"'
 #: rhodecode/templates/admin/users/user_add.html:94
 #: rhodecode/templates/admin/users_groups/users_group_add.html:49
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "save"
 msgstr "保存"
 
@@ -2312,7 +2448,12 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x82\xb0\xe3\x83\xab\xe3\x83\xbc\xe3\x83\x97\xe3\x82\x92\xe7\xb7\xa8\xe9\x9b\x86"'
 msgid "edit repos group"
 msgstr "リポジトリグループを編集"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26
+#, fuzzy
+msgid "Add new child group"
+msgstr "新しいユーザーグループを追加"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
 msgid ""
 "Enable lock-by-pulling on group. This option will be applied to all other"
 " groups and repositories inside"
@@ -2323,8 +2464,9 b' msgid "Repositories groups administratio'
 msgstr "リポジトリグループ管理"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
-msgid "ADD NEW GROUP"
-msgstr "新しいグループを追加"
+#, fuzzy
+msgid "Add new group"
+msgstr "新しいユーザーグループを追加"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
 msgid "Number of toplevel repositories"
@@ -2336,21 +2478,13 b' msgstr "\xe3\x83\x88\xe3\x83\x83\xe3\x83\x97\xe3\x83\xac\xe3\x83\x99\xe3\x83\xab\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xae\xe6\x95\xb0"'
 msgid "action"
 msgstr "アクション"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
-#: rhodecode/templates/admin/users/user_edit.html:259
-#: rhodecode/templates/admin/users_groups/users_groups.html:44
-#: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/data_table/_dt_elements.html:121
-msgid "delete"
-msgstr "削除"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
 #, 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:63
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68
 msgid "There are no repositories groups yet"
 msgstr "まだリポジトリグループがありません"
 
@@ -2496,7 +2630,9 b' msgstr "VCS\xe3\x81\xae\xe6\x93\x8d\xe4\xbd\x9c\xe3\x81\xabSSL\xe3\x82\x92\xe5\xbf\x85\xe9\xa0\x88\xe3\x81\xa8\xe3\x81\x99\xe3\x82\x8b"'
 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を返します"
+msgstr ""
+"RhodeCodeはPushとPullにSSLを要求します。もしSSLでない場合、HTTP Error 406: Not "
+"Acceptalbeを返します"
 
 #: rhodecode/templates/admin/settings/settings.html:209
 msgid "Hooks"
@@ -2549,13 +2685,10 b' msgid ""'
 "This a crucial application setting. If you are really sure you need to "
 "change this, you must restart application in order to make this setting "
 "take effect. Click this label to unlock."
-msgstr ""
-"これはアプリケーションの重要な設定です。本当に変更が必要でしょうか。"
-"もし、変更した場合、変更を反映さ競るためにアプリケーションを再起動する必要があります。"
-"アンロックにするにはこのラベルをクリックして下さい"
+msgstr "これはアプリケーションの重要な設定です。本当に変更が必要でしょうか。もし、変更した場合、変更を反映さ競るためにアプリケーションを再起動する必要があります。アンロックにするにはこのラベルをクリックして下さい"
 
 #: rhodecode/templates/admin/settings/settings.html:262
-#: rhodecode/templates/base/base.html:221
+#: rhodecode/templates/base/base.html:227
 msgid "unlock"
 msgstr "アンロック"
 
@@ -2621,26 +2754,30 b' msgstr "\xe3\x83\xa1\xe3\x83\xbc\xe3\x83\xab\xe3\x82\xa2\xe3\x83\x89\xe3\x83\xac\xe3\x82\xb9:"'
 msgid "API key"
 msgstr "APIキー"
 
-#: rhodecode/templates/admin/users/user_edit.html:63
+#: rhodecode/templates/admin/users/user_edit.html:48
+msgid "Your IP"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:67
 msgid "LDAP DN"
 msgstr "LDAP DN"
 
-#: rhodecode/templates/admin/users/user_edit.html:72
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:35
+#: rhodecode/templates/admin/users/user_edit.html:76
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: rhodecode/templates/admin/users/user_edit.html:81
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
+#: rhodecode/templates/admin/users/user_edit.html:85
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48
 msgid "New password confirmation"
 msgstr "新しいパスワード 再入力"
 
-#: rhodecode/templates/admin/users/user_edit.html:151
+#: rhodecode/templates/admin/users/user_edit.html:155
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
 msgid "Inherit default permissions"
 msgstr "デフォルトの権限を継承する"
 
-#: rhodecode/templates/admin/users/user_edit.html:156
+#: rhodecode/templates/admin/users/user_edit.html:160
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113
 #, python-format
 msgid ""
@@ -2648,53 +2785,31 b' msgid ""'
 "options does not have any action"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:162
+#: rhodecode/templates/admin/users/user_edit.html:166
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr "リポジトリを作成する"
 
-#: rhodecode/templates/admin/users/user_edit.html:170
+#: rhodecode/templates/admin/users/user_edit.html:174
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127
 msgid "Fork repositories"
 msgstr "リポジトリをフォークする"
 
-#: rhodecode/templates/admin/users/user_edit.html:190
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
-msgid "Nothing here yet"
-msgstr "まだありません"
-
-#: rhodecode/templates/admin/users/user_edit.html:197
-#: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:217
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
-msgid "Permission"
-msgstr "権限"
-
-#: rhodecode/templates/admin/users/user_edit.html:198
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
-msgid "Edit Permission"
-msgstr "権限の編集"
-
-#: rhodecode/templates/admin/users/user_edit.html:247
+#: rhodecode/templates/admin/users/user_edit.html:251
 msgid "Email addresses"
 msgstr "メールアドレス"
 
-#: rhodecode/templates/admin/users/user_edit.html:260
+#: rhodecode/templates/admin/users/user_edit.html:264
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr "このメールを削除してよろしいですか: %s"
 
-#: rhodecode/templates/admin/users/user_edit.html:274
+#: rhodecode/templates/admin/users/user_edit.html:278
 msgid "New email address"
 msgstr "新しいメールアドレス"
 
-#: rhodecode/templates/admin/users/user_edit.html:281
-msgid "Add"
-msgstr "追加"
-
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:124
+#: rhodecode/templates/base/base.html:130
 msgid "My account"
 msgstr "アカウント"
 
@@ -2707,7 +2822,7 b' msgid "My permissions"'
 msgstr "権限"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:57
 msgid "My repos"
 msgstr "リポジトリ"
 
@@ -2716,6 +2831,7 b' msgid "My pull requests"'
 msgstr "プルリクエスト"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:45
+#: rhodecode/templates/journal/journal.html:61
 msgid "Add repo"
 msgstr "リポジトリの追加"
 
@@ -2742,50 +2858,18 b' msgstr "\xe3\x83\xac\xe3\x83\x93\xe3\x83\xa5\xe3\x82\xa2\xe3\x83\xbc\xe3\x81\xa8\xe3\x81\x97\xe3\x81\xa6\xe5\x8f\x82\xe5\x8a\xa0"'
 msgid "Pull request #%s opened by %s on %s"
 msgstr "プルリクエスト #%s %s によって %s に作成"
 
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7
-#: rhodecode/templates/bookmarks/bookmarks.html:40
-#: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:54
-#: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:8
-#: rhodecode/templates/tags/tags.html:55
-#: rhodecode/templates/tags/tags_data.html:9
-msgid "Revision"
-msgstr "リビジョン"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/journal/journal_page_repos.html:29
-msgid "private"
-msgstr "非公開"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31
-#: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/journal/journal_page_repos.html:32
-#, python-format
-msgid "Confirm to delete this repository: %s"
-msgstr "このリポジトリを削除しますか？ : %s"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38
-#: rhodecode/templates/journal/journal_page_repos.html:42
-msgid "No repositories yet"
-msgstr "まだリポジトリがありません"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40
-#: rhodecode/templates/journal/journal_page_repos.html:44
-msgid "create one now"
-msgstr "今すぐ作成する"
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "ユーザー管理"
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:235
+#: rhodecode/templates/base/base.html:241
 msgid "users"
 msgstr "ユーザー"
 
 #: rhodecode/templates/admin/users/users.html:23
-msgid "ADD NEW USER"
+#, fuzzy
+msgid "Add new user"
 msgstr "新しいユーザーを追加"
 
 #: rhodecode/templates/admin/users/users.html:77
@@ -2810,7 +2894,7 b' msgid "active"'
 msgstr "アクティブ"
 
 #: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:238
+#: rhodecode/templates/base/base.html:244
 msgid "ldap"
 msgstr "LDAP"
 
@@ -2876,7 +2960,8 b' msgid "Users groups administration"'
 msgstr "ユーザーグループ管理"
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:23
-msgid "ADD NEW USER GROUP"
+#, fuzzy
+msgid "Add new user group"
 msgstr "新しいユーザーグループを追加"
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:32
@@ -2897,149 +2982,155 b' msgstr "\xe3\x83\xa6\xe3\x83\xbc\xe3\x82\xb6\xe3\x82\xb0\xe3\x83\xab\xe3\x83\xbc\xe3\x83\x97\xe3\x82\x92\xe5\x89\x8a\xe9\x99\xa4\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99\xe3\x81\x8b\xef\xbc\x9f: %s"'
 msgid "Submit a bug"
 msgstr "バグレポート"
 
-#: rhodecode/templates/base/base.html:77
+#: rhodecode/templates/base/base.html:76
+#, fuzzy
+msgid "Not logged in"
+msgstr "最終ログイン日"
+
+#: rhodecode/templates/base/base.html:83
 msgid "Login to your account"
 msgstr "ログイン"
 
-#: rhodecode/templates/base/base.html:100
+#: rhodecode/templates/base/base.html:106
 msgid "Forgot password ?"
 msgstr "パスワードを忘れた場合はこちら"
 
-#: rhodecode/templates/base/base.html:107
+#: rhodecode/templates/base/base.html:113
 msgid "Log In"
 msgstr "ログイン"
 
-#: rhodecode/templates/base/base.html:118
+#: rhodecode/templates/base/base.html:124
 msgid "Inbox"
 msgstr "受信箱"
 
-#: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:322
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:129
+#: rhodecode/templates/base/base.html:297
+#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:301
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/public_journal.html:4
 msgid "Journal"
 msgstr "ジャーナル"
 
-#: rhodecode/templates/base/base.html:125
+#: rhodecode/templates/base/base.html:131
 msgid "Log Out"
 msgstr "ログアウト"
 
-#: rhodecode/templates/base/base.html:144
+#: rhodecode/templates/base/base.html:150
 msgid "Switch repository"
 msgstr "リポジトリの切り替え"
 
-#: rhodecode/templates/base/base.html:146
-msgid "Products"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:152
-#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47
-msgid "loading..."
-msgstr "読み込み中..."
+msgid "Products"
+msgstr ""
 
 #: rhodecode/templates/base/base.html:158
-#: rhodecode/templates/base/base.html:160
-#: rhodecode/templates/base/base.html:162
-#: rhodecode/templates/data_table/_dt_elements.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:17
-#: rhodecode/templates/data_table/_dt_elements.html:19
-msgid "Summary"
-msgstr "要約"
+#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47
+msgid "loading..."
+msgstr "読み込み中..."
 
 #: rhodecode/templates/base/base.html:166
 #: rhodecode/templates/base/base.html:168
 #: rhodecode/templates/base/base.html:170
+#: rhodecode/templates/data_table/_dt_elements.html:9
+#: rhodecode/templates/data_table/_dt_elements.html:11
+#: rhodecode/templates/data_table/_dt_elements.html:13
+msgid "Summary"
+msgstr "要約"
+
+#: rhodecode/templates/base/base.html:174
+#: rhodecode/templates/base/base.html:176
+#: rhodecode/templates/base/base.html:178
 #: rhodecode/templates/changelog/changelog.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:23
-#: rhodecode/templates/data_table/_dt_elements.html:25
-#: rhodecode/templates/data_table/_dt_elements.html:27
+#: 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:175
-#: rhodecode/templates/base/base.html:177
-#: rhodecode/templates/base/base.html:179
+#: rhodecode/templates/base/base.html:182
+#: rhodecode/templates/base/base.html:184
+#: rhodecode/templates/base/base.html:186
 msgid "Switch to"
 msgstr "ブランチの切り替え"
 
-#: rhodecode/templates/base/base.html:186
-#: rhodecode/templates/base/base.html:188
-#: rhodecode/templates/base/base.html:190
-#: rhodecode/templates/data_table/_dt_elements.html:31
-#: rhodecode/templates/data_table/_dt_elements.html:33
-#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/base/base.html:193
+#: rhodecode/templates/base/base.html:195
+#: rhodecode/templates/base/base.html:197
+#: rhodecode/templates/data_table/_dt_elements.html:25
+#: rhodecode/templates/data_table/_dt_elements.html:27
+#: rhodecode/templates/data_table/_dt_elements.html:29
 msgid "Files"
 msgstr "ファイル"
 
-#: rhodecode/templates/base/base.html:195
-#: rhodecode/templates/base/base.html:199
+#: rhodecode/templates/base/base.html:201
+#: rhodecode/templates/base/base.html:205
 msgid "Options"
 msgstr "オプション"
 
-#: rhodecode/templates/base/base.html:204
-#: rhodecode/templates/base/base.html:206
+#: rhodecode/templates/base/base.html:210
+#: rhodecode/templates/base/base.html:212
 msgid "repository settings"
 msgstr "リポジトリ設定"
 
-#: rhodecode/templates/base/base.html:210
-#: rhodecode/templates/data_table/_dt_elements.html:80
+#: rhodecode/templates/base/base.html:216
+#: rhodecode/templates/data_table/_dt_elements.html:74
 #: rhodecode/templates/forks/fork.html:13
 msgid "fork"
 msgstr "フォーク"
 
-#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50
+#: rhodecode/templates/base/base.html:218
 #: rhodecode/templates/changelog/changelog.html:43
-msgid "Open new pull request"
+#, fuzzy
+msgid "open new pull request"
 msgstr "新しいプルリクエストを作成"
 
-#: rhodecode/templates/base/base.html:215
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
+#: rhodecode/templates/base/base.html:221
+#, fuzzy
+msgid "compare fork"
 msgstr "フォークを比較"
 
-#: rhodecode/templates/base/base.html:217
+#: rhodecode/templates/base/base.html:223
 msgid "search"
 msgstr "検索"
 
-#: rhodecode/templates/base/base.html:223
+#: rhodecode/templates/base/base.html:229
 msgid "lock"
 msgstr "ロック"
 
-#: rhodecode/templates/base/base.html:234
+#: rhodecode/templates/base/base.html:240
 msgid "repositories groups"
 msgstr "リポジトリグループ"
 
-#: rhodecode/templates/base/base.html:236
+#: rhodecode/templates/base/base.html:242
 msgid "users groups"
 msgstr "ユーザーグループ"
 
-#: rhodecode/templates/base/base.html:237
+#: rhodecode/templates/base/base.html:243
 msgid "permissions"
 msgstr "権限"
 
-#: rhodecode/templates/base/base.html:239
+#: rhodecode/templates/base/base.html:245
 msgid "defaults"
 msgstr "デフォルト設定"
 
-#: rhodecode/templates/base/base.html:240
+#: rhodecode/templates/base/base.html:246
 msgid "settings"
 msgstr "設定"
 
-#: rhodecode/templates/base/base.html:251
-#: rhodecode/templates/base/base.html:253
+#: rhodecode/templates/base/base.html:256
+#: rhodecode/templates/base/base.html:258
 msgid "Followers"
 msgstr "フォロワー"
 
-#: rhodecode/templates/base/base.html:259
-#: rhodecode/templates/base/base.html:261
+#: rhodecode/templates/base/base.html:264
+#: rhodecode/templates/base/base.html:266
 msgid "Forks"
 msgstr "フォーク"
 
-#: rhodecode/templates/base/base.html:340
-#: rhodecode/templates/base/base.html:342
-#: rhodecode/templates/base/base.html:344
+#: rhodecode/templates/base/base.html:315
+#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:319
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "検索"
@@ -3049,7 +3140,7 b' msgid "add another comment"'
 msgstr "別のコメントを追加"
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:83
+#: rhodecode/templates/data_table/_dt_elements.html:140
 #: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr "このリポジトリのフォローをやめる"
@@ -3071,6 +3162,10 b' msgstr "\xe6\xa4\x9c\xe7\xb4\xa2\xe7\xb5\x90\xe6\x9e\x9c\xe3\x81\xaf\xe7\x9c\x81\xe7\x95\xa5\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xa6\xe3\x81\x84\xe3\x81\xbe\xe3\x81\x99"'
 msgid "no matching files"
 msgstr "マッチするファイルはありません"
 
+#: rhodecode/templates/base/root.html:50
+msgid "Open new pull request"
+msgstr "新しいプルリクエストを作成"
+
 #: rhodecode/templates/base/root.html:51
 msgid "Open new pull request for selected changesets"
 msgstr "選択したチェンジセットから新しいプルリクエストを作成"
@@ -3097,6 +3192,15 b' msgstr "%s \xe3\x83\x96\xe3\x83\x83\xe3\x82\xaf\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xaf"'
 msgid "Author"
 msgstr "作成者"
 
+#: rhodecode/templates/bookmarks/bookmarks.html:40
+#: rhodecode/templates/bookmarks/bookmarks_data.html:9
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/tags/tags_data.html:9
+msgid "Revision"
+msgstr "リビジョン"
+
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
@@ -3162,7 +3266,8 b' msgstr "\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x82\xb9\xe3\x83\x86\xe3\x83\xbc\xe3\x82\xbf\xe3\x82\xb9"'
 
 #: rhodecode/templates/changelog/changelog.html:94
 #: rhodecode/templates/shortlog/shortlog_data.html:20
-msgid "Click to open associated pull request"
+#, fuzzy, python-format
+msgid "Click to open associated pull request #%s"
 msgstr "関連するプルリクエストを開く"
 
 #: rhodecode/templates/changelog/changelog.html:104
@@ -3201,7 +3306,7 b' msgstr "\xe3\x83\x96\xe3\x83\x83\xe3\x82\xaf\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xaf"'
 msgid "tag"
 msgstr "タグ"
 
-#: rhodecode/templates/changelog/changelog.html:301
+#: rhodecode/templates/changelog/changelog.html:302
 msgid "There are no changes yet"
 msgstr "まだ変更がありません"
 
@@ -3258,14 +3363,14 b' msgid "download diff"'
 msgstr "差分をダウンロード"
 
 #: rhodecode/templates/changeset/changeset.html:76
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d コメント"
 
 #: rhodecode/templates/changeset/changeset.html:76
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
@@ -3273,7 +3378,7 b' msgstr[0] "(%d \xe3\x82\xa4\xe3\x83\xb3\xe3\x83\xa9\xe3\x82\xa4\xe3\x83\xb3)"'
 
 #: rhodecode/templates/changeset/changeset.html:122
 #: rhodecode/templates/compare/compare_diff.html:44
-#: rhodecode/templates/pullrequests/pullrequest_show.html:76
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
 #, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
@@ -3281,62 +3386,72 b' msgstr[0] "%s \xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xab\xe5\xbd\xb1\xe9\x9f\xbf"'
 
 #: rhodecode/templates/changeset/changeset.html:124
 #: rhodecode/templates/compare/compare_diff.html:46
-#: rhodecode/templates/pullrequests/pullrequest_show.html:78
+#: rhodecode/templates/pullrequests/pullrequest_show.html:96
 #, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
 msgstr[0] "%s ファイルに影響。 %s 個の追加と %s 個の削除"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:42
+#: rhodecode/templates/changeset/changeset_file_comment.html:30
+#, fuzzy, python-format
+msgid "Status from pull request %s"
+msgstr "すべてのプルリクエスト"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:32
+#, fuzzy, python-format
+msgid "Comment from pull request %s"
+msgstr "プルリクエストに[コメント]"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:57
 msgid "Submitting..."
 msgstr "サブミット中..."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:45
+#: rhodecode/templates/changeset/changeset_file_comment.html:60
 msgid "Commenting on line {1}."
 msgstr "{1} 行目にコメント"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:46
-#: rhodecode/templates/changeset/changeset_file_comment.html:121
+#: rhodecode/templates/changeset/changeset_file_comment.html:61
+#: rhodecode/templates/changeset/changeset_file_comment.html:140
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
 msgstr "コメントには %s 構文 ( %s サポートつき ) が利用出来ます"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:48
-#: rhodecode/templates/changeset/changeset_file_comment.html:123
+#: rhodecode/templates/changeset/changeset_file_comment.html:63
+#: rhodecode/templates/changeset/changeset_file_comment.html:142
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr "テキスト内で @username を使うと、この RhodeCode のユーザーに通知を送信します"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:59
-#: rhodecode/templates/changeset/changeset_file_comment.html:143
+#: rhodecode/templates/changeset/changeset_file_comment.html:74
+#: rhodecode/templates/changeset/changeset_file_comment.html:162
 msgid "Comment"
 msgstr "コメント"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:60
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
+#: rhodecode/templates/changeset/changeset_file_comment.html:75
+#: rhodecode/templates/changeset/changeset_file_comment.html:86
 msgid "Hide"
 msgstr "隠す"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 msgid "You need to be logged in to comment."
 msgstr "コメントするにはログインが必要です"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 msgid "Login now"
 msgstr "今すぐログインする"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:118
+#: rhodecode/templates/changeset/changeset_file_comment.html:137
 msgid "Leave a comment"
 msgstr "コメントを残す"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:125
+#: rhodecode/templates/changeset/changeset_file_comment.html:144
 msgid "Check this to change current status of code-review for this changeset"
 msgstr "チェックするとチェンジセットの現在のコードレビューステータスを変更出来ます"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:125
+#: rhodecode/templates/changeset/changeset_file_comment.html:144
 msgid "change status"
 msgstr "ステータスを変更する"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:145
+#: rhodecode/templates/changeset/changeset_file_comment.html:164
 msgid "Comment and close"
 msgstr "コメントしてクローズ"
 
@@ -3371,65 +3486,67 b' msgid "No changesets"'
 msgstr "チェンジセットはありません"
 
 #: rhodecode/templates/compare/compare_diff.html:37
-#: rhodecode/templates/pullrequests/pullrequest_show.html:69
+#: rhodecode/templates/pullrequests/pullrequest_show.html:87
 #, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
 msgstr[0] "%s コミットを表示"
 
 #: rhodecode/templates/compare/compare_diff.html:52
-#: rhodecode/templates/pullrequests/pullrequest_show.html:84
+#: rhodecode/templates/pullrequests/pullrequest_show.html:102
 msgid "No files"
 msgstr "ファイルはありません"
 
-#: rhodecode/templates/data_table/_dt_elements.html:39
-#: rhodecode/templates/data_table/_dt_elements.html:41
-#: rhodecode/templates/data_table/_dt_elements.html:43
+#: rhodecode/templates/data_table/_dt_elements.html:33
+#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/data_table/_dt_elements.html:37
 msgid "Fork"
 msgstr "フォーク"
 
-#: rhodecode/templates/data_table/_dt_elements.html:60
-#: rhodecode/templates/journal/journal.html:89
+#: rhodecode/templates/data_table/_dt_elements.html:54
 #: rhodecode/templates/summary/summary.html:77
 msgid "Mercurial repository"
 msgstr "Mercurialリポジトリ"
 
-#: rhodecode/templates/data_table/_dt_elements.html:62
-#: rhodecode/templates/journal/journal.html:91
+#: rhodecode/templates/data_table/_dt_elements.html:56
 #: rhodecode/templates/summary/summary.html:80
 msgid "Git repository"
 msgstr "Gitリポジトリ"
 
-#: rhodecode/templates/data_table/_dt_elements.html:69
-#: rhodecode/templates/journal/journal.html:97
+#: rhodecode/templates/data_table/_dt_elements.html:63
 #: rhodecode/templates/summary/summary.html:87
 msgid "public repository"
 msgstr "公開リポジトリ"
 
-#: rhodecode/templates/data_table/_dt_elements.html:80
+#: rhodecode/templates/data_table/_dt_elements.html:74
 #: rhodecode/templates/summary/summary.html:96
 #: rhodecode/templates/summary/summary.html:97
 msgid "Fork of"
 msgstr "フォーク元: "
 
-#: rhodecode/templates/data_table/_dt_elements.html:94
+#: rhodecode/templates/data_table/_dt_elements.html:88
 msgid "No changesets yet"
 msgstr "まだチェンジセットがありません"
 
-#: rhodecode/templates/data_table/_dt_elements.html:101
-#: rhodecode/templates/data_table/_dt_elements.html:103
+#: 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 "%s の RSS フィードを購読"
 
-#: rhodecode/templates/data_table/_dt_elements.html:109
-#: rhodecode/templates/data_table/_dt_elements.html:111
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:105
 #, 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:131
+#, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "このユーザーを本当に削除してよろしいですか？: %s"
 
@@ -3473,14 +3590,14 b' msgstr "\xe3\x82\xbf\xe3\x82\xa4\xe3\x83\x88\xe3\x83\xab"'
 msgid "description"
 msgstr "説明"
 
-#: rhodecode/templates/email_templates/pull_request.html:11
+#: rhodecode/templates/email_templates/pull_request.html:7
+msgid "View this pull request here"
+msgstr "このプルリクエストを閲覧する"
+
+#: rhodecode/templates/email_templates/pull_request.html:12
 msgid "revisions for reviewing"
 msgstr "レビュー対象のリビジョン"
 
-#: rhodecode/templates/email_templates/pull_request.html:18
-msgid "View this pull request here"
-msgstr "このプルリクエストを閲覧する"
-
 #: rhodecode/templates/email_templates/pull_request_comment.html:4
 #, python-format
 msgid "User %s commented on pull request #%s for repository %s"
@@ -3640,7 +3757,7 b' msgstr "\xe3\x82\xa2\xe3\x83\x8e\xe3\x83\x86\xe3\x83\xbc\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3\xe3\x82\x92\xe8\xa1\xa8\xe7\xa4\xba"'
 
 #: rhodecode/templates/files/files_edit.html:50
 #: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:53
+#: rhodecode/templates/files/files_source.html:55
 msgid "show as raw"
 msgstr "元のファイルを表示"
 
@@ -3687,12 +3804,25 b' msgstr "\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xae\xe5\xb1\xa5\xe6\xad\xb4\xe3\x82\x92\xe8\xaa\xad\xe3\x81\xbf\xe8\xbe\xbc\xe3\x82\x80"'
 msgid "show source"
 msgstr "ソースを表示"
 
-#: rhodecode/templates/files/files_source.html:44
+#: rhodecode/templates/files/files_source.html:29
+#, fuzzy, 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
+msgid "Editing files allowed only when on branch head revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:46
 #, python-format
 msgid "Binary file (%s)"
 msgstr "バイナリファイル (%s)"
 
-#: rhodecode/templates/files/files_source.html:53
+#: rhodecode/templates/files/files_source.html:55
 msgid "File is too big to display"
 msgstr "表示するには大きすぎるファイルです"
 
@@ -3767,6 +3897,10 b' msgstr "\xe3\x83\x95\xe3\x82\xa9\xe3\x83\xbc\xe3\x82\xaf"'
 msgid "forked"
 msgstr "フォークしました"
 
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
+msgstr "フォークを比較"
+
 #: rhodecode/templates/forks/forks_data.html:42
 msgid "There are no forks yet"
 msgstr "まだフォークがありません"
@@ -3794,26 +3928,10 b' msgstr "RSS\xe3\x83\x95\xe3\x82\xa3\xe3\x83\xbc\xe3\x83\x89"'
 msgid "ATOM feed"
 msgstr "ATOMフィード"
 
-#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:54
 msgid "Watched"
 msgstr "ウォッチ"
 
-#: rhodecode/templates/journal/journal.html:54
-msgid "ADD"
-msgstr "追加"
-
-#: rhodecode/templates/journal/journal.html:77
-msgid "following user"
-msgstr "フォローしているユーザー"
-
-#: rhodecode/templates/journal/journal.html:77
-msgid "user"
-msgstr "ユーザー"
-
-#: rhodecode/templates/journal/journal.html:110
-msgid "You are not following any users or repositories"
-msgstr "まだどのユーザーもリポジトリもフォローしていません"
-
 #: rhodecode/templates/journal/journal_data.html:55
 msgid "No entries yet"
 msgstr "まだエントリがありません"
@@ -3844,17 +3962,17 b' msgid "Detailed compare view"'
 msgstr "比較ビュー詳細"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:100
+#: rhodecode/templates/pullrequests/pullrequest_show.html:118
 msgid "Pull request reviewers"
 msgstr "プルリクエストレビュアー"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:130
 msgid "owner"
 msgstr "所有者"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:127
+#: rhodecode/templates/pullrequests/pullrequest_show.html:145
 msgid "Add reviewer to this pull request."
 msgstr "このプルリクエストにレビュアーを追加"
 
@@ -3904,15 +4022,20 b' msgstr[0] "%d \xe3\x83\xac\xe3\x83\x93\xe3\x83\xa5\xe3\x82\xa2\xe3\x83\xbc"'
 msgid "pull request was reviewed by all reviewers"
 msgstr "プルリクエストはすべてのレビュアーにレビューされました"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:58
+#: rhodecode/templates/pullrequests/pullrequest_show.html:56
+#, fuzzy
+msgid "Origin repository"
+msgstr "Gitリポジトリ"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:76
 msgid "Created on"
 msgstr "作成日"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:83
 msgid "Compare view"
 msgstr "比較ビュー"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:130
 msgid "reviewer"
 msgstr "レビュアー"
 
@@ -4189,23 +4312,3 b' msgstr "%s \xe3\x82\xbf\xe3\x82\xb0"'
 msgid "Compare tags"
 msgstr "タグの比較"
 
-#~ msgid ""
-#~ "%s repository is not mapped to db"
-#~ " perhaps it was created or renamed"
-#~ " from the file system please run "
-#~ "the application again in order to "
-#~ "rescan repositories"
-#~ msgstr ""
-#~ "%s "
-#~ "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。"
-
-#~ msgid ""
-#~ "%s repository is not mapped to db"
-#~ " perhaps it was moved or renamed  "
-#~ "from the filesystem please run the "
-#~ "application again in order to rescan "
-#~ "repositories"
-#~ msgstr ""
-#~ "%s "
-#~ "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。"
-

rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po

@@ -8,16 +8,15 b' msgid ""'
 msgstr ""
 "Project-Id-Version: rhodecode 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-12-14 04:19+0100\n"
-"PO-Revision-Date: 2013-01-18 18:12+0100\n"
+"POT-Creation-Date: 2013-01-28 00:24+0100\n"
+"PO-Revision-Date: 2013-01-20 03:44+0100\n"
 "Last-Translator: Nemcio <[e-mail]>\n"
 "Language-Team: Test\n"
-"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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Virtaal 0.7.1\n"
 "Generated-By: Babel 0.9.6\n"
 
 #: rhodecode/controllers/changelog.py:95
@@ -28,8 +27,7 b' msgstr "Wszystkie ga\xc5\x82\xc4\x99zie"'
 msgid "show white space"
 msgstr "pokazuj spacje"
 
-#: rhodecode/controllers/changeset.py:90
-#: rhodecode/controllers/changeset.py:97
+#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
 msgid "ignore white space"
 msgstr "ignoruj pokazywanie spacji"
 
@@ -38,15 +36,19 b' msgstr "ignoruj pokazywanie spacji"'
 msgid "%s line context"
 msgstr "%s linia w kontekście"
 
-#: rhodecode/controllers/changeset.py:314
-#: rhodecode/controllers/pullrequests.py:417
+#: rhodecode/controllers/changeset.py:329
+#: rhodecode/controllers/pullrequests.py:416
 #, python-format
 msgid "Status change -> %s"
 msgstr "Zmiana statusu -> %s"
 
-#: rhodecode/controllers/changeset.py:345
-msgid "Changing status on a changeset associated witha closed pull request is not allowed"
-msgstr "Zmiana statusu na grupy zmian powiązania łączy zamkniętego wniosku jest niedozwolona"
+#: rhodecode/controllers/changeset.py:360
+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:75
 #: rhodecode/controllers/pullrequests.py:121
@@ -60,7 +62,9 b' msgstr "Strona g\xc5\x82\xc3\xb3wna"'
 
 #: rhodecode/controllers/error.py:98
 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."
+msgstr ""
+"Wniosek nie może być rozumiany przez serwer z powodu zniekształconej "
+"składni."
 
 #: rhodecode/controllers/error.py:101
 msgid "Unauthorized access to resource"
@@ -75,8 +79,12 b' msgid "The resource could not be found"'
 msgstr "Zasób nie został znaleziony"
 
 #: rhodecode/controllers/error.py:107
-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."
+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
 #, python-format
@@ -93,8 +101,8 b' msgstr "%s %s zasila\xc4\x87"'
 #: rhodecode/templates/changeset/changeset.html:149
 #: rhodecode/templates/compare/compare_diff.html:62
 #: rhodecode/templates/compare/compare_diff.html:73
-#: rhodecode/templates/pullrequests/pullrequest_show.html:94
-#: rhodecode/templates/pullrequests/pullrequest_show.html:153
+#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:171
 msgid "Changeset was too big and was cut off..."
 msgstr "Lista zmian była zbyt duża i została ucięta..."
 
@@ -111,118 +119,114 b' msgstr "Kliknij tutaj, by doda\xc4\x87 nowy plik"'
 msgid "There are no files yet %s"
 msgstr "Brak plików %s"
 
-#: rhodecode/controllers/files.py:265
-#: rhodecode/controllers/files.py:325
+#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338
 #, 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:292
-#, python-format
-msgid "Edited %s via RhodeCode"
+#: rhodecode/controllers/files.py:281
+msgid "You can only edit files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:295
+#, fuzzy, python-format
+msgid "Edited file %s via RhodeCode"
 msgstr "Edytowanie %s w RhodeCode"
 
-#: rhodecode/controllers/files.py:297
+#: rhodecode/controllers/files.py:311
 msgid "No changes"
 msgstr "Bez zmian"
 
-#: rhodecode/controllers/files.py:308
-#: rhodecode/controllers/files.py:372
+#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Committ wykonany do %s"
 
-#: rhodecode/controllers/files.py:313
-#: rhodecode/controllers/files.py:378
+#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390
 msgid "Error occurred during commit"
 msgstr "Wystąpił błąd w trakcie zatwierdzania"
 
-#: rhodecode/controllers/files.py:344
-#, python-format
-msgid "Added %s via RhodeCode"
+#: rhodecode/controllers/files.py:350
+#, fuzzy
+msgid "Added file via RhodeCode"
 msgstr "Dodano %s poprzez RhodeCode"
 
-#: rhodecode/controllers/files.py:358
+#: rhodecode/controllers/files.py:370
 msgid "No content"
 msgstr "Brak treści"
 
-#: rhodecode/controllers/files.py:362
+#: rhodecode/controllers/files.py:374
 msgid "No filename"
 msgstr "Brak nazwy pliku"
 
-#: rhodecode/controllers/files.py:404
+#: rhodecode/controllers/files.py:416
 msgid "downloads disabled"
 msgstr "Pobieranie wyłączone"
 
-#: rhodecode/controllers/files.py:415
+#: rhodecode/controllers/files.py:427
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Nieznana wersja %s"
 
-#: rhodecode/controllers/files.py:417
+#: rhodecode/controllers/files.py:429
 msgid "Empty repository"
 msgstr "Puste repozytorium"
 
-#: rhodecode/controllers/files.py:419
+#: rhodecode/controllers/files.py:431
 msgid "Unknown archive type"
 msgstr "Nieznany typ archiwum"
 
-#: rhodecode/controllers/files.py:564
+#: rhodecode/controllers/files.py:576
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr "Różnice"
 
-#: rhodecode/controllers/files.py:565
-#: rhodecode/controllers/pullrequests.py:74
-#: rhodecode/controllers/summary.py:236
-#: rhodecode/model/scm.py:550
+#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74
+#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564
 msgid "Branches"
 msgstr "Gałęzie"
 
-#: rhodecode/controllers/files.py:566
-#: rhodecode/controllers/pullrequests.py:78
-#: rhodecode/controllers/summary.py:237
-#: rhodecode/model/scm.py:561
+#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78
+#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575
 msgid "Tags"
 msgstr "Etykiety"
 
-#: rhodecode/controllers/forks.py:158
+#: rhodecode/controllers/forks.py:165
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "gałęzi %s w repozytorium %s"
 
-#: rhodecode/controllers/forks.py:172
+#: rhodecode/controllers/forks.py:179
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium"
 
-#: rhodecode/controllers/journal.py:218
-#: rhodecode/controllers/journal.py:261
+#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318
 msgid "public journal"
 msgstr "Dziennik publiczny"
 
-#: rhodecode/controllers/journal.py:222
-#: rhodecode/controllers/journal.py:265
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322
+#: rhodecode/templates/base/base.html:238
 #: rhodecode/templates/journal/journal.html:12
 msgid "journal"
 msgstr "dziennik"
 
-#: rhodecode/controllers/login.py:143
+#: rhodecode/controllers/login.py:142
 msgid "You have successfully registered into rhodecode"
 msgstr "Udało Ci się zarejestrować na stronie"
 
-#: rhodecode/controllers/login.py:164
+#: rhodecode/controllers/login.py:163
 msgid "Your password reset link was sent"
 msgstr "Twój link zresetowania hasła został wysłany"
 
-#: rhodecode/controllers/login.py:184
-msgid "Your password reset was successful, new password has been sent to your email"
+#: rhodecode/controllers/login.py:183
+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:76
-#: rhodecode/model/scm.py:556
+#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570
 msgid "Bookmarks"
 msgstr "Zakładki"
 
@@ -246,10 +250,12 b' msgstr "Wyst\xc4\x85pi\xc5\x82 b\xc5\x82\xc4\x85d podczas pro\xc5\x9bby o po\xc5\x82\xc4\x85czenie ga\xc5\x82\xc4\x99zi"'
 msgid "Successfully deleted pull request"
 msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo"
 
-#: rhodecode/controllers/pullrequests.py:452
+#: rhodecode/controllers/pullrequests.py:451
 #, fuzzy
 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"
+msgstr ""
+"Zamknij wszystkie wnioski połączenia gałęzi innych stanów niż odrzucony, "
+"zatwierdzony lub zabroniony"
 
 #: rhodecode/controllers/search.py:134
 msgid "Invalid search query. Try quoting it."
@@ -263,46 +269,46 b' msgstr "Nie ma szukanego indeksu. Prosz\xc4\x99 uruchomi\xc4\x87 indeksowanie whoosh"'
 msgid "An error occurred during this search operation"
 msgstr "Wystąpił błąd podczas wyszukiwania tej operacji"
 
-#: rhodecode/controllers/settings.py:119
-#: rhodecode/controllers/admin/repos.py:272
+#: rhodecode/controllers/settings.py:120
+#: rhodecode/controllers/admin/repos.py:254
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "Repozytorium %s zostało pomyślnie zaktualizowane"
 
-#: rhodecode/controllers/settings.py:137
-#: rhodecode/controllers/admin/repos.py:290
+#: rhodecode/controllers/settings.py:138
+#: rhodecode/controllers/admin/repos.py:272
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr "wystąpił błąd podczas aktualizacji repozytorium %s"
 
-#: rhodecode/controllers/settings.py:162
-#: rhodecode/controllers/admin/repos.py:315
+#: rhodecode/controllers/settings.py:163
+#: rhodecode/controllers/admin/repos.py:297
 #, python-format
 msgid "deleted repository %s"
 msgstr "usunięte repozytorium %s"
 
-#: rhodecode/controllers/settings.py:166
-#: rhodecode/controllers/admin/repos.py:325
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/settings.py:167
+#: rhodecode/controllers/admin/repos.py:307
+#: rhodecode/controllers/admin/repos.py:313
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "Wystąpił błąd podczas usuwania %s"
 
-#: rhodecode/controllers/settings.py:185
+#: rhodecode/controllers/settings.py:186
 msgid "unlocked"
 msgstr "Odblokowany"
 
-#: rhodecode/controllers/settings.py:188
+#: rhodecode/controllers/settings.py:189
 msgid "locked"
 msgstr "zablokowany"
 
-#: rhodecode/controllers/settings.py:190
+#: rhodecode/controllers/settings.py:191
 #, python-format
 msgid "Repository has been %s"
 msgstr "Repozytoriów jest %s"
 
-#: rhodecode/controllers/settings.py:194
-#: rhodecode/controllers/admin/repos.py:423
+#: rhodecode/controllers/settings.py:195
+#: rhodecode/controllers/admin/repos.py:405
 msgid "An error occurred during unlocking"
 msgstr "Wystąpił błąd podczas odblokowywania"
 
@@ -379,23 +385,23 b' msgstr "Nie mo\xc5\xbcna uaktywni\xc4\x87 ldap.\\"Python-ldap\\" brakuje library."'
 msgid "error occurred during update of ldap settings"
 msgstr "Wystąpił błąd podczas aktualizacji ustawień ldap"
 
-#: rhodecode/controllers/admin/permissions.py:59
-#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:60
+#: rhodecode/controllers/admin/permissions.py:64
 msgid "None"
 msgstr "Brak"
 
-#: rhodecode/controllers/admin/permissions.py:60
-#: rhodecode/controllers/admin/permissions.py:64
-msgid "Read"
-msgstr "Odczyt"
-
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
-msgid "Write"
-msgstr "Zapis"
+msgid "Read"
+msgstr "Odczyt"
 
 #: rhodecode/controllers/admin/permissions.py:62
 #: rhodecode/controllers/admin/permissions.py:66
+msgid "Write"
+msgstr "Zapis"
+
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
 #: rhodecode/templates/admin/defaults/defaults.html:9
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
@@ -409,226 +415,229 b' msgstr "Zapis"'
 #: 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:126
+#: rhodecode/templates/admin/users/user_edit.html:130
 #: rhodecode/templates/admin/users/users.html:9
 #: rhodecode/templates/admin/users_groups/users_group_add.html:8
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:197
-#: rhodecode/templates/base/base.html:350
-#: rhodecode/templates/base/base.html:352
-#: rhodecode/templates/base/base.html:354
+#: rhodecode/templates/base/base.html:203
+#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:328
 msgid "Admin"
 msgstr "Administracja"
 
-#: rhodecode/controllers/admin/permissions.py:69
+#: rhodecode/controllers/admin/permissions.py:70
 msgid "disabled"
 msgstr "wyłączona"
 
-#: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/controllers/admin/permissions.py:72
 msgid "allowed with manual account activation"
 msgstr "dozwolona z ręczną aktywacją konta"
 
-#: rhodecode/controllers/admin/permissions.py:73
+#: rhodecode/controllers/admin/permissions.py:74
 msgid "allowed with automatic account activation"
 msgstr "dozwolona z automatyczną aktywacją konta"
 
-#: rhodecode/controllers/admin/permissions.py:75
-#: rhodecode/controllers/admin/permissions.py:78
-msgid "Disabled"
-msgstr "Wyłączone"
-
 #: rhodecode/controllers/admin/permissions.py:76
 #: rhodecode/controllers/admin/permissions.py:79
+msgid "Disabled"
+msgstr "Wyłączone"
+
+#: rhodecode/controllers/admin/permissions.py:77
+#: rhodecode/controllers/admin/permissions.py:80
 msgid "Enabled"
 msgstr "Włączone"
 
-#: rhodecode/controllers/admin/permissions.py:122
+#: rhodecode/controllers/admin/permissions.py:128
 msgid "Default permissions updated successfully"
 msgstr "Domyślne uprawnienia zaktualizowane pomyślnie"
 
-#: rhodecode/controllers/admin/permissions.py:136
+#: rhodecode/controllers/admin/permissions.py:142
 msgid "error occurred during update of permissions"
 msgstr "wystąpił błąd podczas aktualizacji uprawnień"
 
-#: rhodecode/controllers/admin/repos.py:121
+#: rhodecode/controllers/admin/repos.py:123
 msgid "--REMOVE FORK--"
 msgstr "--USUŃ ROZGAŁĘZIENIE--"
 
-#: rhodecode/controllers/admin/repos.py:190
+#: rhodecode/controllers/admin/repos.py:162
 #, python-format
 msgid "created repository %s from %s"
 msgstr "utworzone repozytorium %s z %s"
 
-#: rhodecode/controllers/admin/repos.py:194
+#: rhodecode/controllers/admin/repos.py:166
 #, python-format
 msgid "created repository %s"
 msgstr "utworzone repozytorium %s"
 
-#: rhodecode/controllers/admin/repos.py:225
+#: rhodecode/controllers/admin/repos.py:197
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr "wystąpił błąd podczas tworzenia repozytorium %s"
 
-#: rhodecode/controllers/admin/repos.py:320
+#: rhodecode/controllers/admin/repos.py:302
 #, 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:349
+#: rhodecode/controllers/admin/repos.py:331
 msgid "An error occurred during deletion of repository user"
 msgstr "Wystąpił błąd podczas usunięcia użytkownika z repozytorium"
 
-#: rhodecode/controllers/admin/repos.py:368
+#: rhodecode/controllers/admin/repos.py:350
 msgid "An error occurred during deletion of repository users groups"
 msgstr "Wystąpił błąd podczas usunięcia grupy użytkowników z repozytorium"
 
-#: rhodecode/controllers/admin/repos.py:386
+#: rhodecode/controllers/admin/repos.py:368
 msgid "An error occurred during deletion of repository stats"
 msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk"
 
-#: rhodecode/controllers/admin/repos.py:403
+#: rhodecode/controllers/admin/repos.py:385
 msgid "An error occurred during cache invalidation"
 msgstr "Wystąpił błąd podczas unieważniania cache"
 
-#: rhodecode/controllers/admin/repos.py:443
+#: rhodecode/controllers/admin/repos.py:425
 msgid "Updated repository visibility in public journal"
 msgstr "Zaktualizowano widoczność stron w publicznym dzienniku"
 
+#: rhodecode/controllers/admin/repos.py:429
+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:434 rhodecode/model/validators.py:301
+msgid "Token mismatch"
+msgstr "Niezgodność tokenu"
+
 #: rhodecode/controllers/admin/repos.py:447
-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:452
-#: rhodecode/model/validators.py:300
-msgid "Token mismatch"
-msgstr "Niezgodność tokenu"
-
-#: rhodecode/controllers/admin/repos.py:465
 msgid "Pulled from remote location"
 msgstr "Pobieranie z lokalizacji zdalnej"
 
-#: rhodecode/controllers/admin/repos.py:467
+#: rhodecode/controllers/admin/repos.py:449
 msgid "An error occurred during pull from remote location"
 msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej"
 
-#: rhodecode/controllers/admin/repos.py:483
+#: rhodecode/controllers/admin/repos.py:465
 msgid "Nothing"
 msgstr "Brak"
 
-#: rhodecode/controllers/admin/repos.py:485
+#: rhodecode/controllers/admin/repos.py:467
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "Oznaczono %s repo jako rozwidlenie %s"
 
-#: rhodecode/controllers/admin/repos.py:489
+#: rhodecode/controllers/admin/repos.py:471
 msgid "An error occurred during this operation"
 msgstr "Wystąpił błąd podczas tej operacji"
 
-#: rhodecode/controllers/admin/repos_groups.py:120
+#: rhodecode/controllers/admin/repos_groups.py:136
 #, python-format
 msgid "created repos group %s"
 msgstr "utworzono grupę repo %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:133
+#: rhodecode/controllers/admin/repos_groups.py:148
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr "Wystąpił błąd podczas tworzenia grupy repo %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:167
+#: rhodecode/controllers/admin/repos_groups.py:205
 #, python-format
 msgid "updated repos group %s"
 msgstr "zaktualizowano grupę repo %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:180
+#: rhodecode/controllers/admin/repos_groups.py:220
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr "wystąpił błąd podczas aktualizacji grupy repo %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:198
+#: rhodecode/controllers/admin/repos_groups.py:238
 #, 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:206
+#: rhodecode/controllers/admin/repos_groups.py:246
 #, python-format
 msgid "removed repos group %s"
 msgstr "usunięto grupę repo %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:212
+#: rhodecode/controllers/admin/repos_groups.py:252
 msgid "Cannot delete this group it still contains subgroups"
 msgstr "Nie można usunąć tej grupy ponieważ nadal zawiera podgrupy"
 
-#: rhodecode/controllers/admin/repos_groups.py:217
-#: rhodecode/controllers/admin/repos_groups.py:222
+#: rhodecode/controllers/admin/repos_groups.py:257
+#: rhodecode/controllers/admin/repos_groups.py:262
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr "wystąpił błąd podczas kasowania grupy repo %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:243
+#: rhodecode/controllers/admin/repos_groups.py:283
 msgid "An error occurred during deletion of group user"
 msgstr "Wystąpił błąd podczas usunięcia grupy użytkowników"
 
-#: rhodecode/controllers/admin/repos_groups.py:264
+#: rhodecode/controllers/admin/repos_groups.py:304
 msgid "An error occurred during deletion of group users groups"
 msgstr "Wystąpił błąd podczas usuwania grup i grup użytkowników"
 
-#: rhodecode/controllers/admin/settings.py:123
-#, 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:131
+#: rhodecode/controllers/admin/settings.py:124
+#, fuzzy, 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:133
 msgid "Whoosh reindex task scheduled"
 msgstr "Zadanie ponownej indeksacji whoosh zostało zaplanowane"
 
-#: rhodecode/controllers/admin/settings.py:162
+#: rhodecode/controllers/admin/settings.py:164
 msgid "Updated application settings"
 msgstr "Aktualizacja ustawień aplikacji"
 
-#: rhodecode/controllers/admin/settings.py:166
-#: rhodecode/controllers/admin/settings.py:299
+#: rhodecode/controllers/admin/settings.py:168
+#: rhodecode/controllers/admin/settings.py:301
 msgid "error occurred during updating application settings"
 msgstr "wystąpił błąd podczas aktualizacji ustawień aplikacji"
 
-#: rhodecode/controllers/admin/settings.py:207
+#: rhodecode/controllers/admin/settings.py:209
 msgid "Updated visualisation settings"
 msgstr "Aktualizacja ustawień wizualizacji"
 
-#: rhodecode/controllers/admin/settings.py:212
+#: rhodecode/controllers/admin/settings.py:214
 msgid "error occurred during updating visualisation settings"
 msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji"
 
-#: rhodecode/controllers/admin/settings.py:295
+#: rhodecode/controllers/admin/settings.py:297
 msgid "Updated VCS settings"
 msgstr "Aktualizacja ustawień VCS"
 
-#: rhodecode/controllers/admin/settings.py:309
+#: rhodecode/controllers/admin/settings.py:311
 msgid "Added new hook"
 msgstr "Dodano nowy hook"
 
-#: rhodecode/controllers/admin/settings.py:321
+#: rhodecode/controllers/admin/settings.py:323
 msgid "Updated hooks"
 msgstr "Aktualizacja hooku"
 
-#: rhodecode/controllers/admin/settings.py:325
+#: rhodecode/controllers/admin/settings.py:327
 msgid "error occurred during hook creation"
 msgstr "Wystąpił błąd podczas tworzenia hooku"
 
-#: rhodecode/controllers/admin/settings.py:344
+#: rhodecode/controllers/admin/settings.py:346
 msgid "Email task created"
 msgstr "E-mail został wysłany"
 
-#: rhodecode/controllers/admin/settings.py:399
+#: rhodecode/controllers/admin/settings.py:408
 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:430
+msgstr ""
+"Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej "
+"aplikacji"
+
+#: rhodecode/controllers/admin/settings.py:448
 msgid "Your account was updated successfully"
 msgstr "Twoje konto zostało pomyślnie zaktualizowane"
 
-#: rhodecode/controllers/admin/settings.py:445
-#: rhodecode/controllers/admin/users.py:196
+#: rhodecode/controllers/admin/settings.py:463
+#: 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"
@@ -647,52 +656,67 b' msgstr "wyst\xc4\x85pi\xc5\x82 b\xc5\x82\xc4\x85d podczas tworzenia u\xc5\xbcytkownika %s"'
 msgid "User updated successfully"
 msgstr "Użytkownik został zaktualizowany"
 
-#: rhodecode/controllers/admin/users.py:212
+#: rhodecode/controllers/admin/users.py:214
 msgid "successfully deleted user"
 msgstr "użytkownik został usunięty"
 
-#: rhodecode/controllers/admin/users.py:217
+#: rhodecode/controllers/admin/users.py:219
 msgid "An error occurred during deletion of user"
 msgstr "Wystąpił błąd podczas usuwania użytkownika"
 
-#: rhodecode/controllers/admin/users.py:231
+#: rhodecode/controllers/admin/users.py:233
 msgid "You can't edit this user"
 msgstr "Nie możesz edytować tego użytkownika"
 
-#: rhodecode/controllers/admin/users.py:272
+#: rhodecode/controllers/admin/users.py:276
 msgid "Granted 'repository create' permission to user"
 msgstr "Przyznano użytkownikowi uprawnienie do 'tworzenia repozytorium'"
 
-#: rhodecode/controllers/admin/users.py:277
+#: rhodecode/controllers/admin/users.py:281
 msgid "Revoked 'repository create' permission to user"
 msgstr "Cofnięto użytkownikowi uprawnienie do 'tworzenia repozytorium'"
 
-#: rhodecode/controllers/admin/users.py:283
+#: rhodecode/controllers/admin/users.py:287
 msgid "Granted 'repository fork' permission to user"
 msgstr "Przyznano użytkownikowi uprawnienie do 'tworzenia rozgałęzień'"
 
-#: rhodecode/controllers/admin/users.py:288
+#: rhodecode/controllers/admin/users.py:292
 msgid "Revoked 'repository fork' permission to user"
 msgstr "Cofnięto użytkownikowi uprawnienie do 'tworzenia rozgałęzień'"
 
-#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users.py:298
 #: rhodecode/controllers/admin/users_groups.py:279
 msgid "An error occurred during permissions saving"
 msgstr "Wystąpił błąd podczas zapisywania uprawnień"
 
-#: rhodecode/controllers/admin/users.py:309
+#: rhodecode/controllers/admin/users.py:312
 #, python-format
 msgid "Added email %s to user"
 msgstr "Dodano e-mail %s do użytkownika"
 
-#: rhodecode/controllers/admin/users.py:315
+#: rhodecode/controllers/admin/users.py:318
 msgid "An error occurred during email saving"
 msgstr "Wystąpił błąd podczas zapisywania e-maila"
 
-#: rhodecode/controllers/admin/users.py:325
+#: rhodecode/controllers/admin/users.py:328
 msgid "Removed email from user"
 msgstr "Usunięto e-mail użytkownikowi"
 
+#: rhodecode/controllers/admin/users.py:341
+#, fuzzy, python-format
+msgid "Added ip %s to user"
+msgstr "Dodano e-mail %s do użytkownika"
+
+#: rhodecode/controllers/admin/users.py:347
+#, fuzzy
+msgid "An error occurred during ip saving"
+msgstr "Wystąpił błąd podczas zapisywania e-maila"
+
+#: rhodecode/controllers/admin/users.py:359
+#, fuzzy
+msgid "Removed ip from user"
+msgstr "Usunięto e-mail użytkownikowi"
+
 #: rhodecode/controllers/admin/users_groups.py:86
 #, python-format
 msgid "created users group %s"
@@ -737,11 +761,16 b' msgstr "Przyznano grupie u\xc5\xbcytkownik\xc3\xb3w uprawnienia do \'tworzenia rozga\xc5\x82\xc4\x99zie\xc5\x84\'"'
 msgid "Revoked 'repository fork' permission to users group"
 msgstr "Cofnięto grupie użytkowników uprawnienia do 'tworzenia rozgałęzień'"
 
-#: rhodecode/lib/auth.py:499
+#: rhodecode/lib/auth.py:509
+#, fuzzy, python-format
+msgid "IP %s not allowed"
+msgstr "Obserwatorzy %s"
+
+#: rhodecode/lib/auth.py:558
 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:540
+#: rhodecode/lib/auth.py:599
 msgid "You need to be a signed in to view this page"
 msgstr "Musisz być zalogowany, żeby oglądać stronę"
 
@@ -751,7 +780,9 b' msgstr "plik binarny"'
 
 #: rhodecode/lib/diffs.py:90
 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"
+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:100
 msgid "No changes detected"
@@ -802,8 +833,7 b' msgstr "i"'
 msgid "%s more"
 msgstr "%s więcej"
 
-#: rhodecode/lib/helpers.py:617
-#: rhodecode/templates/changelog/changelog.html:51
+#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51
 msgid "revisions"
 msgstr "rewizja"
 
@@ -823,8 +853,7 b' msgstr "Po\xc5\x82\xc4\x85czonych ga\xc5\x82\xc4\x99zi #%s"'
 msgid "[deleted] repository"
 msgstr "[usunięte] repozytorium"
 
-#: rhodecode/lib/helpers.py:666
-#: rhodecode/lib/helpers.py:676
+#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676
 msgid "[created] repository"
 msgstr "[utworzone] repozytorium"
 
@@ -832,13 +861,11 b' msgstr "[utworzone] repozytorium"'
 msgid "[created] repository as fork"
 msgstr "[utworzone] repozytorium jako rozgałęzienie"
 
-#: rhodecode/lib/helpers.py:670
-#: rhodecode/lib/helpers.py:678
+#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678
 msgid "[forked] repository"
 msgstr "[rozgałęzione] repozytorium"
 
-#: rhodecode/lib/helpers.py:672
-#: rhodecode/lib/helpers.py:680
+#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680
 msgid "[updated] repository"
 msgstr "[zaktualizowane] repozytorium"
 
@@ -898,19 +925,25 b' msgstr "[start nast\xc4\x99pnego] repozytorium"'
 msgid "[stopped following] repository"
 msgstr "[zatrzymany po] repozytorium"
 
-#: rhodecode/lib/helpers.py:883
+#: rhodecode/lib/helpers.py:884
 #, python-format
 msgid " and %s more"
 msgstr "i %s więcej"
 
-#: rhodecode/lib/helpers.py:887
+#: rhodecode/lib/helpers.py:888
 msgid "No Files"
 msgstr "Brak Plików"
 
-#: rhodecode/lib/helpers.py:1163
+#: rhodecode/lib/helpers.py:1164
 #, 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"
+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/utils2.py:403
 #, python-format
@@ -989,111 +1022,111 b' msgid "password reset link"'
 msgstr "łącze resetowania hasła"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
-#: rhodecode/model/db.py:1183
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313
 msgid "Repository no access"
 msgstr "Brak dostępu do repozytorium"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
-#: rhodecode/model/db.py:1184
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314
 msgid "Repository read access"
 msgstr "Repozytorium do odczytu"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
-#: rhodecode/model/db.py:1185
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315
 msgid "Repository write access"
 msgstr "Repozytorium do zapisu"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
-#: rhodecode/model/db.py:1186
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316
 msgid "Repository admin access"
 msgstr "Administracja dostępu do repozytorium"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
-#: rhodecode/model/db.py:1188
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318
 msgid "Repositories Group no access"
 msgstr "Grupy repozytoriów brak dostępu"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
-#: rhodecode/model/db.py:1189
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319
 msgid "Repositories Group read access"
 msgstr "Grupy repozytoriów dostęp do odczytu"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
-#: rhodecode/model/db.py:1190
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320
 msgid "Repositories Group write access"
 msgstr "Grupy repozytoriów dostęp do zapisu"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
-#: rhodecode/model/db.py:1191
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321
 msgid "Repositories Group admin access"
 msgstr "Repozytoria Grupy dostęp administratora"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
-#: rhodecode/model/db.py:1193
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323
 msgid "RhodeCode Administrator"
 msgstr "Administrator Repo"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
-#: rhodecode/model/db.py:1194
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324
 msgid "Repository creation disabled"
 msgstr "Repozytorium wyłączone"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
-#: rhodecode/model/db.py:1195
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325
 msgid "Repository creation enabled"
 msgstr "Repozytorium włączone"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
-#: rhodecode/model/db.py:1196
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326
 msgid "Repository forking disabled"
 msgstr "Rozwidlenie repozytorium wyłączone"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
-#: rhodecode/model/db.py:1197
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327
 msgid "Repository forking enabled"
 msgstr "Rozwidlenie repozytorium włączone"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
-#: rhodecode/model/db.py:1198
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328
 msgid "Register disabled"
 msgstr "Rejestracja wyłączona"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
-#: rhodecode/model/db.py:1199
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329
 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/model/db.py:1202
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332
 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/model/db.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776
 msgid "Not Reviewed"
 msgstr "Brak Korekty"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
-#: rhodecode/model/db.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777
 msgid "Approved"
 msgstr "Zaakceptowano"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
-#: rhodecode/model/db.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778
 msgid "Rejected"
 msgstr "Odrzucono"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
-#: rhodecode/model/db.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779
 msgid "Under Review"
 msgstr "Objęty Przeglądem"
 
-#: rhodecode/model/comment.py:110
+#: rhodecode/model/comment.py:109
 #, python-format
 msgid "on line %s"
 msgstr "widziany %s"
 
-#: rhodecode/model/comment.py:173
+#: rhodecode/model/comment.py:176
 msgid "[Mention]"
 msgstr "[Wymieniony]"
 
@@ -1145,167 +1178,198 b' msgstr "otworzy\xc5\x82 nowe po\xc5\x82\xc4\x85czenie ga\xc5\x82\xc4\x99zi w %(when)s"'
 msgid "commented on pull request at %(when)s"
 msgstr "skomentował nowe połączenie gałęzi w %(when)s"
 
-#: rhodecode/model/pull_request.py:90
+#: rhodecode/model/pull_request.py:100
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s"
 
-#: rhodecode/model/scm.py:542
+#: rhodecode/model/scm.py:556
 msgid "latest tip"
 msgstr "ostatni tip"
 
-#: rhodecode/model/user.py:232
+#: rhodecode/model/user.py:231
 msgid "new user registration"
 msgstr "nowy użytkownik się zarejestrował"
 
-#: rhodecode/model/user.py:257
-#: rhodecode/model/user.py:281
-#: rhodecode/model/user.py:303
+#: rhodecode/model/user.py:256 rhodecode/model/user.py:280
 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:327
+msgstr ""
+"Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej "
+"aplikacji"
+
+#: rhodecode/model/user.py:302
 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:333
+msgstr ""
+"Nie możesz usunąć tego użytkownika ponieważ jest kluczowy dla całej "
+"aplikacji"
+
+#: rhodecode/model/user.py:308
 #, 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/validators.py:36
-#: rhodecode/model/validators.py:37
+msgid ""
+"user \"%s\" still owns %s repositories and cannot be removed. Switch "
+"owners or remove those repositories. %s"
+msgstr ""
+"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/validators.py:37 rhodecode/model/validators.py:38
 msgid "Value cannot be an empty list"
 msgstr "Wartość listy nie może być pusta"
 
-#: rhodecode/model/validators.py:83
+#: rhodecode/model/validators.py:84
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "Użytkownik \"%(username)s\" już istnieje"
 
-#: rhodecode/model/validators.py:85
+#: rhodecode/model/validators.py:86
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr "Nazwa użytkownika \"%(username)s\" jest zabroniona"
 
-#: rhodecode/model/validators.py:87
-msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character"
-msgstr "Nazwa użytkownika może zawierać tylko znaki alfanumeryczne, podkreślenia, kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym"
-
-#: rhodecode/model/validators.py:115
+#: rhodecode/model/validators.py:88
+msgid ""
+"Username may only contain alphanumeric characters underscores, periods or"
+" dashes and must begin with alphanumeric character"
+msgstr ""
+"Nazwa użytkownika może zawierać tylko znaki alfanumeryczne, podkreślenia,"
+" kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym"
+
+#: rhodecode/model/validators.py:116
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr "Nazwa użytkownika %(username)s jest nieprawidłowa"
 
-#: rhodecode/model/validators.py:134
+#: rhodecode/model/validators.py:135
 msgid "Invalid users group name"
 msgstr "Niewłaściwa nazwa grupy"
 
-#: rhodecode/model/validators.py:135
+#: rhodecode/model/validators.py:136
 #, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr "Nazwa grupy \"%(usersgroup)s\" już istnieje"
 
-#: rhodecode/model/validators.py:137
-msgid "users group name may only contain  alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character"
-msgstr "Nazwa grupy może zawierać tylko znaki alfanumeryczne, podkreślenia, kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym"
-
-#: rhodecode/model/validators.py:175
+#: rhodecode/model/validators.py:138
+msgid ""
+"users 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:176
 msgid "Cannot assign this group as parent"
 msgstr "Nie można przypisać do tej grupy jako rodzic"
 
-#: rhodecode/model/validators.py:176
+#: rhodecode/model/validators.py:177
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "Nazwa grupy \"%(group_name)s\" już istnieje"
 
-#: rhodecode/model/validators.py:178
+#: rhodecode/model/validators.py:179
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "Repozytorium o nazwie \"%(group_name)s\" już istnieje"
 
-#: rhodecode/model/validators.py:236
+#: rhodecode/model/validators.py:237
 msgid "Invalid characters (non-ascii) in password"
 msgstr "Nieprawidłowe znaki (nie-ascii) w haśle"
 
-#: rhodecode/model/validators.py:251
+#: rhodecode/model/validators.py:252
 msgid "Passwords do not match"
 msgstr "Hasła różnią się"
 
-#: rhodecode/model/validators.py:268
+#: rhodecode/model/validators.py:269
 msgid "invalid password"
 msgstr "nieprawidłowe hasło"
 
-#: rhodecode/model/validators.py:269
+#: rhodecode/model/validators.py:270
 msgid "invalid user name"
 msgstr "niepoprawna nazwa użytkownika"
 
-#: rhodecode/model/validators.py:270
+#: rhodecode/model/validators.py:271
 msgid "Your account is disabled"
 msgstr "Twoje konto jest wyłączone"
 
-#: rhodecode/model/validators.py:314
+#: rhodecode/model/validators.py:315
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr "Nazwa repozytorium  %(repo)s jest zabroniona"
 
-#: rhodecode/model/validators.py:316
+#: rhodecode/model/validators.py:317
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "Repozytorium o nazwie %(repo)s już istnieje"
 
-#: rhodecode/model/validators.py:317
+#: rhodecode/model/validators.py:318
 #, 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:319
+#: rhodecode/model/validators.py:320
 #, python-format
 msgid "Repositories group with name \"%(repo)s\" already exists"
 msgstr "Grupa repozytoriów z nazwą \"%(repo)s\" już istnieje"
 
-#: rhodecode/model/validators.py:432
+#: rhodecode/model/validators.py:433
 msgid "invalid clone url"
 msgstr "nieprawidłowe url klonowania"
 
-#: rhodecode/model/validators.py:433
+#: rhodecode/model/validators.py:434
 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:458
+#: rhodecode/model/validators.py:459
 msgid "Fork have to be the same type as parent"
 msgstr "Fork musi być tego samego typu, jak rodzic"
 
-#: rhodecode/model/validators.py:473
+#: rhodecode/model/validators.py:474
 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:498
+#: rhodecode/model/validators.py:501
+#, fuzzy
+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:540
 msgid "This username or users group name is not valid"
 msgstr "Ta nazwa użytkownika lub grupy użytkowników nie jest prawidłowa"
 
-#: rhodecode/model/validators.py:591
+#: rhodecode/model/validators.py:636
 msgid "This is not a valid path"
 msgstr "To nie jest prawidłowa ścieżka"
 
-#: rhodecode/model/validators.py:606
+#: rhodecode/model/validators.py:651
 msgid "This e-mail address is already taken"
 msgstr "Ten adres e-mail jest już zajęty"
 
-#: rhodecode/model/validators.py:626
+#: rhodecode/model/validators.py:671
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "e-mail \"%(email)s\" nie istnieje."
 
-#: rhodecode/model/validators.py:663
-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:682
+#: rhodecode/model/validators.py:708
+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:727
 #, 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:759
+msgid "Please enter a valid IPv4 or IpV6 address"
+msgstr ""
+
+#: rhodecode/model/validators.py:760
+#, python-format
+msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
+msgstr ""
+
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr "Repozytorium"
@@ -1318,43 +1382,55 b' msgstr "Repozytorium"'
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 #: rhodecode/templates/branches/branches.html:9
 #: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:48
+#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:50
 #: rhodecode/templates/tags/tags.html:10
 msgid "quick filter..."
 msgstr "szybki filtr..."
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:233
+#: rhodecode/templates/base/base.html:239
 msgid "repositories"
 msgstr "repozytoria"
 
-#: rhodecode/templates/index_base.html:13
-#: rhodecode/templates/index_base.html:15
+#: rhodecode/templates/index_base.html:14
+#: rhodecode/templates/index_base.html:17
+#: rhodecode/templates/admin/repos/repo_add.html:5
+#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
 #: rhodecode/templates/admin/repos/repos.html:21
-msgid "ADD REPOSITORY"
-msgstr "DODAJ REPOZYTORIUM"
-
-#: rhodecode/templates/index_base.html:29
-#: rhodecode/templates/index_base.html:136
+msgid "Add repository"
+msgstr "Dodaj repozytorium"
+
+#: rhodecode/templates/index_base.html:23
+#, fuzzy
+msgid "Edit group"
+msgstr "edytuj grupy repo"
+
+#: rhodecode/templates/index_base.html:23
+msgid "You have admin right to this group, and can edit it"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:36
+#: rhodecode/templates/index_base.html:140
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
 #: rhodecode/templates/admin/users_groups/users_group_add.html:32
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33
 msgid "Group name"
 msgstr "Nazwa grupy"
 
-#: rhodecode/templates/index_base.html:30
-#: rhodecode/templates/index_base.html:72
-#: rhodecode/templates/index_base.html:138
-#: rhodecode/templates/index_base.html:176
-#: rhodecode/templates/index_base.html:266
+#: rhodecode/templates/index_base.html:37
+#: rhodecode/templates/index_base.html:79
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/index_base.html:180
+#: rhodecode/templates/index_base.html:273
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
-#: rhodecode/templates/admin/repos/repos.html:72
+#: rhodecode/templates/admin/repos/repos.html:73
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
 #: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:66
@@ -1362,31 +1438,29 b' msgstr "Nazwa grupy"'
 msgid "Description"
 msgstr "Opis"
 
-#: rhodecode/templates/index_base.html:40
+#: rhodecode/templates/index_base.html:47
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47
 msgid "Repositories group"
 msgstr "Grupy w repozytorium"
 
-#: rhodecode/templates/index_base.html:71
-#: rhodecode/templates/index_base.html:174
-#: rhodecode/templates/index_base.html:264
+#: rhodecode/templates/index_base.html:78
+#: rhodecode/templates/index_base.html:178
+#: rhodecode/templates/index_base.html:271
+#: rhodecode/templates/admin/permissions/permissions.html:117
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
-#: rhodecode/templates/admin/repos/repos.html:70
-#: rhodecode/templates/admin/users/user_edit.html:196
-#: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:180
-#: rhodecode/templates/admin/users/user_edit_my_account.html:216
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
+#: rhodecode/templates/admin/repos/repos.html:71
+#: rhodecode/templates/admin/users/user_edit.html:200
+#: rhodecode/templates/admin/users/user_edit_my_account.html:60
+#: rhodecode/templates/admin/users/user_edit_my_account.html:211
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:184
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
 #: rhodecode/templates/branches/branches.html:50
 #: rhodecode/templates/branches/branches_data.html:6
 #: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:70
-#: rhodecode/templates/journal/journal.html:196
-#: rhodecode/templates/journal/journal_page_repos.html:7
+#: rhodecode/templates/journal/journal.html:201
+#: rhodecode/templates/journal/journal.html:305
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
 #: rhodecode/templates/summary/summary.html:132
@@ -1395,105 +1469,112 b' msgstr "Grupy w repozytorium"'
 msgid "Name"
 msgstr "Nazwa"
 
-#: rhodecode/templates/index_base.html:73
+#: rhodecode/templates/index_base.html:80
 msgid "Last change"
 msgstr "Ostatnia aktywność"
 
-#: rhodecode/templates/index_base.html:74
-#: rhodecode/templates/index_base.html:179
-#: rhodecode/templates/admin/users/user_edit_my_account.html:182
-#: rhodecode/templates/journal/journal.html:198
+#: rhodecode/templates/index_base.html:81
+#: rhodecode/templates/index_base.html:183
+#: rhodecode/templates/index_base.html:276
+#: rhodecode/templates/admin/repos/repos.html:74
+#: rhodecode/templates/admin/users/user_edit_my_account.html:213
+#: rhodecode/templates/journal/journal.html:203
+#: rhodecode/templates/journal/journal.html:307
 msgid "Tip"
 msgstr "Ostatnia zmiana"
 
-#: rhodecode/templates/index_base.html:75
-#: rhodecode/templates/index_base.html:181
-#: rhodecode/templates/index_base.html:269
+#: rhodecode/templates/index_base.html:82
+#: rhodecode/templates/index_base.html:185
+#: rhodecode/templates/index_base.html:278
 #: rhodecode/templates/admin/repos/repo_edit.html:121
-#: rhodecode/templates/admin/repos/repos.html:73
+#: rhodecode/templates/admin/repos/repos.html:76
 msgid "Owner"
 msgstr "Właściciel"
 
-#: rhodecode/templates/index_base.html:76
+#: rhodecode/templates/index_base.html:83
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr "RSS"
 
-#: rhodecode/templates/index_base.html:77
+#: rhodecode/templates/index_base.html:84
 msgid "Atom"
 msgstr "Atom"
 
-#: rhodecode/templates/index_base.html:167
-#: rhodecode/templates/index_base.html:207
-#: rhodecode/templates/index_base.html:291
-#: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:202
+#: rhodecode/templates/index_base.html:171
+#: rhodecode/templates/index_base.html:211
+#: rhodecode/templates/index_base.html:300
+#: rhodecode/templates/admin/repos/repos.html:97
+#: rhodecode/templates/admin/users/user_edit_my_account.html:235
 #: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
 #: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:221
+#: rhodecode/templates/journal/journal.html:225
+#: rhodecode/templates/journal/journal.html:329
 #: rhodecode/templates/tags/tags.html:77
 msgid "Click to sort ascending"
 msgstr "Kliknij, aby posortować rosnąco"
 
-#: rhodecode/templates/index_base.html:168
-#: rhodecode/templates/index_base.html:208
-#: rhodecode/templates/index_base.html:292
-#: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:203
+#: rhodecode/templates/index_base.html:172
+#: rhodecode/templates/index_base.html:212
+#: rhodecode/templates/index_base.html:301
+#: rhodecode/templates/admin/repos/repos.html:98
+#: rhodecode/templates/admin/users/user_edit_my_account.html:236
 #: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:222
+#: rhodecode/templates/journal/journal.html:226
+#: rhodecode/templates/journal/journal.html:330
 #: rhodecode/templates/tags/tags.html:78
 msgid "Click to sort descending"
 msgstr "Kliknij, aby posortować malejąco"
 
-#: rhodecode/templates/index_base.html:177
-#: rhodecode/templates/index_base.html:267
+#: rhodecode/templates/index_base.html:181
+#: rhodecode/templates/index_base.html:274
 msgid "Last Change"
 msgstr "Ostatnia akytwność"
 
-#: rhodecode/templates/index_base.html:209
-#: rhodecode/templates/index_base.html:293
-#: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:204
+#: rhodecode/templates/index_base.html:213
+#: rhodecode/templates/index_base.html:302
+#: rhodecode/templates/admin/repos/repos.html:99
+#: rhodecode/templates/admin/users/user_edit_my_account.html:237
 #: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
 #: rhodecode/templates/branches/branches.html:78
-#: rhodecode/templates/journal/journal.html:223
+#: rhodecode/templates/journal/journal.html:227
+#: rhodecode/templates/journal/journal.html:331
 #: rhodecode/templates/tags/tags.html:79
 msgid "No records found."
 msgstr "Nie znaleziono rekordów."
 
-#: rhodecode/templates/index_base.html:210
-#: rhodecode/templates/index_base.html:294
-#: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:205
+#: rhodecode/templates/index_base.html:214
+#: rhodecode/templates/index_base.html:303
+#: rhodecode/templates/admin/repos/repos.html:100
+#: rhodecode/templates/admin/users/user_edit_my_account.html:238
 #: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:79
-#: rhodecode/templates/journal/journal.html:224
+#: rhodecode/templates/journal/journal.html:228
+#: rhodecode/templates/journal/journal.html:332
 #: rhodecode/templates/tags/tags.html:80
 msgid "Data error."
 msgstr "Błąd danych."
 
-#: rhodecode/templates/index_base.html:211
-#: rhodecode/templates/index_base.html:295
-#: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:206
+#: rhodecode/templates/index_base.html:215
+#: rhodecode/templates/index_base.html:304
+#: rhodecode/templates/admin/repos/repos.html:101
+#: rhodecode/templates/admin/users/user_edit_my_account.html:105
+#: rhodecode/templates/admin/users/user_edit_my_account.html:239
 #: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:80
-#: rhodecode/templates/journal/journal.html:62
-#: rhodecode/templates/journal/journal.html:225
+#: rhodecode/templates/journal/journal.html:229
+#: rhodecode/templates/journal/journal.html:333
 #: rhodecode/templates/tags/tags.html:81
 msgid "Loading..."
 msgstr "Wczytywanie..."
 
-#: rhodecode/templates/login.html:5
-#: rhodecode/templates/login.html:54
+#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54
 msgid "Sign In"
 msgstr "Zaloguj się"
 
@@ -1501,22 +1582,20 b' msgstr "Zaloguj si\xc4\x99"'
 msgid "Sign In to"
 msgstr "Zarejestruj się"
 
-#: rhodecode/templates/login.html:31
-#: rhodecode/templates/register.html:20
+#: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
 #: rhodecode/templates/admin/admin_log.html:5
 #: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:50
+#: rhodecode/templates/admin/users/user_edit.html:54
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
-#: rhodecode/templates/base/base.html:83
+#: rhodecode/templates/base/base.html:89
 #: rhodecode/templates/summary/summary.html:131
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: rhodecode/templates/login.html:40
-#: rhodecode/templates/register.html:29
+#: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
 #: rhodecode/templates/admin/ldap/ldap.html:46
 #: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:92
+#: rhodecode/templates/base/base.html:98
 msgid "Password"
 msgstr "Hasło"
 
@@ -1528,8 +1607,7 b' msgstr "Zapami\xc4\x99taj mnie"'
 msgid "Forgot your password ?"
 msgstr "Zapomniałeś hasła?"
 
-#: rhodecode/templates/login.html:63
-#: rhodecode/templates/base/base.html:103
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109
 msgid "Don't have an account ?"
 msgstr "Nie masz konta?"
 
@@ -1553,8 +1631,7 b' msgstr "Zresetuj swoje has\xc5\x82o"'
 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:74
 msgid "Sign Up"
 msgstr "Zarejestruj się"
 
@@ -1568,22 +1645,22 b' msgstr "Ponownie wprowad\xc5\xba has\xc5\x82o"'
 
 #: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:90
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
+#: rhodecode/templates/admin/users/user_edit.html:94
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57
 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:99
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
+#: rhodecode/templates/admin/users/user_edit.html:103
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66
 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:108
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
+#: rhodecode/templates/admin/users/user_edit.html:112
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75
 #: rhodecode/templates/summary/summary.html:133
 msgid "Email"
 msgstr "E-mail"
@@ -1663,11 +1740,10 b' msgstr[1] "%s wej\xc5\x9b\xc4\x87"'
 msgstr[2] "%s wejść"
 
 #: rhodecode/templates/admin/admin_log.html:6
-#: rhodecode/templates/admin/repos/repos.html:74
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:10
+#: rhodecode/templates/admin/repos/repos.html:77
+#: rhodecode/templates/admin/users/user_edit_my_account.html:215
+#: rhodecode/templates/journal/journal.html:205
+#: rhodecode/templates/journal/journal.html:309
 msgid "Action"
 msgstr "Działanie"
 
@@ -1714,8 +1790,12 b' msgstr "Typ"'
 #: rhodecode/templates/admin/repos/repo_edit.html:89
 #: rhodecode/templates/forks/fork.html:72
 #: rhodecode/templates/settings/repo_settings.html:80
-msgid "Private repositories are only visible to people explicitly added as collaborators."
-msgstr "Prywatne repozytoria są widoczne tylko dla osób bezpośrednio dodanych jako współpracownicy."
+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:94
@@ -1739,7 +1819,7 b' msgstr "W\xc5\x82\xc4\x85cz menu pobierania na stronie podsumowania."'
 
 #: rhodecode/templates/admin/defaults/defaults.html:75
 #: rhodecode/templates/admin/repos/repo_edit.html:112
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71
 msgid "Enable locking"
 msgstr "Włącz blokowanie"
 
@@ -1750,12 +1830,13 b' msgstr "W\xc5\x82\xc4\x85cz blokowanie pobierania w repozytorium."'
 
 #: rhodecode/templates/admin/defaults/defaults.html:84
 #: rhodecode/templates/admin/ldap/ldap.html:89
+#: rhodecode/templates/admin/permissions/permissions.html:92
 #: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79
 #: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_edit.html:133
-#: rhodecode/templates/admin/users/user_edit.html:178
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
+#: rhodecode/templates/admin/users/user_edit.html:137
+#: rhodecode/templates/admin/users/user_edit.html:182
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135
 #: rhodecode/templates/settings/repo_settings.html:94
 msgid "Save"
@@ -1847,8 +1928,8 b' msgid "Comments"'
 msgstr "Komentarze"
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:267
-#: rhodecode/templates/base/base.html:269
+#: rhodecode/templates/base/base.html:272
+#: rhodecode/templates/base/base.html:274
 msgid "Pull requests"
 msgstr "Połączone gałęzie"
 
@@ -1875,8 +1956,8 b' msgstr "Uprawnienia administracji"'
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:134
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
-#: rhodecode/templates/admin/users/user_edit.html:143
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63
+#: rhodecode/templates/admin/users/user_edit.html:147
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
 #: rhodecode/templates/settings/repo_settings.html:86
 msgid "Permissions"
@@ -1891,8 +1972,14 b' msgid "Anonymous access"'
 msgstr "Dostęp anonimowy"
 
 #: rhodecode/templates/admin/permissions/permissions.html:49
-msgid "All default permissions on each repository will be reset to choosen permission, note that all custom default permission on repositories will be lost"
-msgstr "Wszystkie uprawnienia domyślne każdego repozytorium zostaną przywrócone. Wybrane uprawnienie zostaną skasowane. Pamiętaj, że wszystkie niestandardowe uprawnienia w repozytoriach zostaną utracone."
+msgid ""
+"All default permissions on each repository will be reset to choosen "
+"permission, note that all custom default permission on repositories will "
+"be lost"
+msgstr ""
+"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
@@ -1909,8 +1996,14 b' msgid "Repository group"'
 msgstr "Repozytorium grupy"
 
 #: rhodecode/templates/admin/permissions/permissions.html:62
-msgid "All default permissions on each repository group will be reset to choosen permission, note that all custom default permission on repositories group will be lost"
-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."
+msgid ""
+"All default permissions on each repository group will be reset to choosen"
+" permission, note that all custom default permission on repositories "
+"group will be lost"
+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
 msgid "Registration"
@@ -1924,19 +2017,110 b' msgstr "Tworzenie repozytorium"'
 msgid "Repository forking"
 msgstr "Rozwidlanie repozytorium"
 
-#: rhodecode/templates/admin/permissions/permissions.html:92
-#: rhodecode/templates/admin/repos/repo_edit.html:264
-msgid "set"
-msgstr "ustaw"
-
-#: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
-msgid "Add repository"
-msgstr "Dodaj repozytorium"
+#: rhodecode/templates/admin/permissions/permissions.html:93
+#: rhodecode/templates/admin/permissions/permissions.html:209
+#: rhodecode/templates/admin/repos/repo_edit.html:142
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80
+#: rhodecode/templates/admin/settings/settings.html:113
+#: rhodecode/templates/admin/settings/settings.html:179
+#: rhodecode/templates/admin/settings/settings.html:269
+#: rhodecode/templates/admin/users/user_edit.html:138
+#: rhodecode/templates/admin/users/user_edit.html:183
+#: rhodecode/templates/admin/users/user_edit.html:286
+#: rhodecode/templates/admin/users/user_edit.html:334
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
+#: rhodecode/templates/files/files_add.html:82
+#: rhodecode/templates/files/files_edit.html:68
+#: rhodecode/templates/pullrequests/pullrequest.html:124
+#: rhodecode/templates/settings/repo_settings.html:95
+msgid "Reset"
+msgstr "Zresetuj"
+
+#: rhodecode/templates/admin/permissions/permissions.html:103
+#, fuzzy
+msgid "Default User Permissions"
+msgstr "Domyślne uprawnienia"
+
+#: rhodecode/templates/admin/permissions/permissions.html:111
+#: rhodecode/templates/admin/users/user_edit.html:194
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
+msgid "Nothing here yet"
+msgstr "Nic tu nie ma jeszcze"
+
+#: rhodecode/templates/admin/permissions/permissions.html:118
+#: rhodecode/templates/admin/users/user_edit.html:201
+#: rhodecode/templates/admin/users/user_edit_my_account.html:61
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
+msgid "Permission"
+msgstr "Uprawnienia"
+
+#: rhodecode/templates/admin/permissions/permissions.html:119
+#: rhodecode/templates/admin/users/user_edit.html:202
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
+msgid "Edit Permission"
+msgstr "Edycja Uprawnień"
+
+#: rhodecode/templates/admin/permissions/permissions.html:149
+#: rhodecode/templates/admin/permissions/permissions.html:151
+#: rhodecode/templates/admin/repos/repo_edit.html:13
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/users/user_edit.html:13
+#: rhodecode/templates/admin/users/user_edit.html:232
+#: rhodecode/templates/admin/users/user_edit.html:234
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
+#: rhodecode/templates/data_table/_dt_elements.html:116
+#: rhodecode/templates/data_table/_dt_elements.html:117
+msgid "edit"
+msgstr "edycja"
+
+#: rhodecode/templates/admin/permissions/permissions.html:168
+#: rhodecode/templates/admin/users/user_edit.html:295
+#, fuzzy
+msgid "Allowed IP addresses"
+msgstr "Adresy e-mail"
+
+#: rhodecode/templates/admin/permissions/permissions.html:182
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
+#: rhodecode/templates/admin/users/user_edit.html:263
+#: rhodecode/templates/admin/users/user_edit.html:308
+#: rhodecode/templates/admin/users_groups/users_groups.html:44
+#: rhodecode/templates/data_table/_dt_elements.html:122
+#: rhodecode/templates/data_table/_dt_elements.html:130
+msgid "delete"
+msgstr "usuń"
+
+#: rhodecode/templates/admin/permissions/permissions.html:183
+#: rhodecode/templates/admin/users/user_edit.html:309
+#, fuzzy, python-format
+msgid "Confirm to delete this ip: %s"
+msgstr "Potwierdź, aby usunąć ten e-mail: %s"
+
+#: rhodecode/templates/admin/permissions/permissions.html:189
+#: rhodecode/templates/admin/users/user_edit.html:315
+msgid "All IP addresses are allowed"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:200
+#: rhodecode/templates/admin/users/user_edit.html:326
+#, fuzzy
+msgid "New ip address"
+msgstr "Nowy adres e-mail"
+
+#: rhodecode/templates/admin/permissions/permissions.html:208
+#: rhodecode/templates/admin/users/user_edit.html:285
+#: rhodecode/templates/admin/users/user_edit.html:333
+msgid "Add"
+msgstr "Dodaj"
 
 #: rhodecode/templates/admin/repos/repo_add.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:11
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
+#: rhodecode/templates/base/base.html:154
 msgid "Repositories"
 msgstr "Repozytoria"
 
@@ -1998,19 +2182,6 b' msgstr "dodaj nowe repozytorium"'
 msgid "Edit repository"
 msgstr "Edytuj repozytorium"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:228
-#: rhodecode/templates/admin/users/user_edit.html:230
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
-#: rhodecode/templates/files/files_source.html:29
-#: rhodecode/templates/journal/journal_page_repos.html:29
-msgid "edit"
-msgstr "edycja"
-
 #: rhodecode/templates/admin/repos/repo_edit.html:40
 #: rhodecode/templates/settings/repo_settings.html:39
 msgid "Clone uri"
@@ -2025,23 +2196,6 b' msgstr "Opcjonalnie wybierz grup\xc4\x99 do wprowadzenia tego repozytorium."'
 msgid "Change owner of this repository."
 msgstr "Zmiana właściciela tego repozytorium."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
-#: rhodecode/templates/admin/settings/settings.html:113
-#: rhodecode/templates/admin/settings/settings.html:179
-#: rhodecode/templates/admin/settings/settings.html:269
-#: rhodecode/templates/admin/users/user_edit.html:134
-#: rhodecode/templates/admin/users/user_edit.html:179
-#: rhodecode/templates/admin/users/user_edit.html:282
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/files/files_add.html:82
-#: rhodecode/templates/files/files_edit.html:68
-#: rhodecode/templates/pullrequests/pullrequest.html:124
-#: rhodecode/templates/settings/repo_settings.html:95
-msgid "Reset"
-msgstr "Zresetuj"
-
 #: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr "Administracja"
@@ -2072,7 +2226,7 b' msgstr "Zdalnie"'
 
 #: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Pull changes from remote location"
-msgstr "Prożba połączenia zmian z lokalizacji zdalnej"
+msgstr "Pobierz z zdalnej lokalizacji"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Confirm to pull changes from remote side"
@@ -2091,8 +2245,12 b' msgid "Confirm to invalidate repository '
 msgstr "Potwierdź unieważnienie pamięci podręcznej repozytorium"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:193
-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"
+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:198
 msgid "List of cached values"
@@ -2108,16 +2266,16 b' msgstr "Klucz"'
 
 #: rhodecode/templates/admin/repos/repo_edit.html:203
 #: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:117
+#: rhodecode/templates/admin/users/user_edit.html:121
 #: rhodecode/templates/admin/users_groups/users_group_add.html:41
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42
 msgid "Active"
 msgstr "Aktywny"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:218
-#: rhodecode/templates/base/base.html:331
-#: rhodecode/templates/base/base.html:333
-#: rhodecode/templates/base/base.html:335
+#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/base/base.html:308
+#: rhodecode/templates/base/base.html:310
 msgid "Public journal"
 msgstr "Dziennik publiczny"
 
@@ -2130,8 +2288,12 b' msgid "Add to public journal"'
 msgstr "Dodaj do dziennika publicznego"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:231
-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"
+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:238
 msgid "Locking"
@@ -2159,18 +2321,24 b' msgstr "Repozytorium nie jest zablokowan'
 
 #: rhodecode/templates/admin/repos/repo_edit.html:252
 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"
+msgstr ""
+"Wymuś blokowanie na repozytorium. Działa tylko wtedy, gdy dostęp "
+"anonimowy jest wyłączony"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:259
 msgid "Set as fork of"
 msgstr "Ustaw jako rozwidlenie"
 
+#: rhodecode/templates/admin/repos/repo_edit.html:264
+msgid "set"
+msgstr "ustaw"
+
 #: rhodecode/templates/admin/repos/repo_edit.html:268
 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:274
-#: rhodecode/templates/changeset/changeset_file_comment.html:26
+#: rhodecode/templates/changeset/changeset_file_comment.html:41
 msgid "Delete"
 msgstr "Usuń"
 
@@ -2186,8 +2354,14 b' msgstr "Potwierd\xc5\xba, aby usun\xc4\x85\xc4\x87 repozytorium"'
 
 #: rhodecode/templates/admin/repos/repo_edit.html:282
 #: rhodecode/templates/settings/repo_settings.html:119
-msgid "This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems. If you need fully delete it 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"
+msgid ""
+"This repository will be renamed in a special way in order to be "
+"unaccesible for RhodeCode and VCS systems. If you need fully delete it "
+"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_perms.html:3
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
@@ -2207,7 +2381,7 b' 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/users.html:85
-#: rhodecode/templates/base/base.html:229
+#: rhodecode/templates/base/base.html:235
 msgid "admin"
 msgstr "administracja"
 
@@ -2217,8 +2391,7 b' msgid "member"'
 msgstr "użytkownik"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-#: rhodecode/templates/data_table/_dt_elements.html:67
-#: rhodecode/templates/journal/journal.html:95
+#: rhodecode/templates/data_table/_dt_elements.html:61
 #: rhodecode/templates/summary/summary.html:85
 msgid "private repository"
 msgstr "prywatne repozytorium"
@@ -2262,14 +2435,15 b' msgstr "dotyczy dzieci"'
 
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74
 #, fuzzy
-msgid "Set or revoke permission to all children of that group, including repositories and other groups"
-msgstr "Ustawia lub cofa uprawnienia do wszystkich dzieci z tej grupy, w tym repozytoria oraz innych grup"
+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:9
-#: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:313
-#: rhodecode/templates/base/base.html:315
-#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:128
 #: rhodecode/templates/bookmarks/bookmarks.html:11
 #: rhodecode/templates/branches/branches.html:10
 #: rhodecode/templates/changelog/changelog.html:10
@@ -2281,8 +2455,7 b' msgstr "Ustawia lub cofa uprawnienia do '
 #: rhodecode/templates/files/files_add.html:15
 #: rhodecode/templates/files/files_edit.html:15
 #: rhodecode/templates/followers/followers.html:9
-#: rhodecode/templates/forks/fork.html:9
-#: rhodecode/templates/forks/forks.html:9
+#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9
 #: rhodecode/templates/pullrequests/pullrequest.html:8
 #: rhodecode/templates/pullrequests/pullrequest_show.html:8
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
@@ -2311,7 +2484,7 b' msgid "add new repos group"'
 msgstr "dodaj nową grupę repozytorium"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55
 msgid "Group parent"
 msgstr "Dominująca grupa"
 
@@ -2319,7 +2492,7 b' msgstr "Dominuj\xc4\x85ca grupa"'
 #: rhodecode/templates/admin/users/user_add.html:94
 #: rhodecode/templates/admin/users_groups/users_group_add.html:49
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "save"
 msgstr "zapisz"
 
@@ -2331,17 +2504,27 b' msgstr "Edytuj grupy repo"'
 msgid "edit repos group"
 msgstr "edytuj grupy repo"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
-msgid "Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside"
-msgstr "Włącz blokowanie pulling przez grupy. Opcja ta będzie stosowana do wszystkich innych grup i repozytoriów wewnątrz"
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26
+#, fuzzy
+msgid "Add new child group"
+msgstr "dodaj nową grupę użytkowników"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
+msgid ""
+"Enable lock-by-pulling on group. This option will be applied to all other"
+" groups and repositories inside"
+msgstr ""
+"Włącz blokowanie pulling 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 "Repositories groups administration"
 msgstr "Repozytoria grup administracyjnych"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
-msgid "ADD NEW GROUP"
-msgstr "DODAJ NOWĄ GRUPĘ"
+#, fuzzy
+msgid "Add new group"
+msgstr "dodaj nową grupę użytkowników"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
 msgid "Number of toplevel repositories"
@@ -2353,15 +2536,7 b' msgstr "Liczba najwy\xc5\xbcszego poziomu repozytorium"'
 msgid "action"
 msgstr "działanie"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
-#: rhodecode/templates/admin/users/user_edit.html:259
-#: rhodecode/templates/admin/users_groups/users_groups.html:44
-#: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/data_table/_dt_elements.html:121
-msgid "delete"
-msgstr "usuń"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
 #, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
@@ -2369,7 +2544,7 b' msgstr[0] "Potwierd\xc5\xba \xc5\xbceby usun\xc4\x85\xc4\x87 grup\xc4\x99 %s wraz z %s repozytorium"'
 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:63
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68
 msgid "There are no repositories groups yet"
 msgstr "Nie ma jeszcze grup repozytoriów"
 
@@ -2409,16 +2584,26 b' msgid "rescan option"'
 msgstr "ponowne skanowanie opcji"
 
 #: rhodecode/templates/admin/settings/settings.html:38
-msgid "In case a repository was deleted from filesystem and there are leftovers in the database check this option to scan obsolete data in database and remove it."
-msgstr "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 ""
+"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."
 
 #: rhodecode/templates/admin/settings/settings.html:39
 msgid "destroy old data"
 msgstr "zniszcz stare dane"
 
 #: rhodecode/templates/admin/settings/settings.html:41
-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 ""
+"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"
 
 #: rhodecode/templates/admin/settings/settings.html:46
 msgid "Rescan repositories"
@@ -2507,8 +2692,12 b' msgid "require ssl for vcs operations"'
 msgstr "wymagaj ssl dla operacji vcs"
 
 #: rhodecode/templates/admin/settings/settings.html:203
-msgid "RhodeCode will require SSL for pushing or pulling. If SSL is missing it will return HTTP Error 406: Not Acceptable"
-msgstr "RhodeCode wymaga SSL do wysłania zmian lub pobierania. Jeśli brakuje SSL zwróci błąd HTTP 406: Not Acceptable"
+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:209
 msgid "Hooks"
@@ -2547,25 +2736,39 b' msgid "hgsubversion extensions"'
 msgstr "rozszerzenia hgsubversion"
 
 #: rhodecode/templates/admin/settings/settings.html:246
-msgid "Requires hgsubversion library installed. Allows clonning from svn remote locations"
-msgstr "Wymaga biblioteki hgsubversion zainstalowanej. Umożliwia klonowanie z zdalnych lokalizacji svn"
+msgid ""
+"Requires hgsubversion library installed. Allows clonning from svn remote "
+"locations"
+msgstr ""
+"Wymaga biblioteki hgsubversion zainstalowanej. Umożliwia klonowanie z "
+"zdalnych lokalizacji svn"
 
 #: rhodecode/templates/admin/settings/settings.html:256
 msgid "Repositories location"
 msgstr "Położenie repozytorium"
 
 #: rhodecode/templates/admin/settings/settings.html:261
-msgid "This a crucial application setting. If you are really sure you need to change this, you must restart application in order to make this setting take effect. Click this label to unlock."
-msgstr "To kluczowe ustawienia aplikacji. Jeśli jesteś pewny, że chcesz to zmienić, należy ponownie uruchomić aplikację w celu zaktualizowania lokalizacji. Kliknij tą etykietę, żeby odblokować."
+msgid ""
+"This a crucial application setting. If you are really sure you need to "
+"change this, you must restart application in order to make this setting "
+"take effect. Click this label to unlock."
+msgstr ""
+"To kluczowe ustawienia aplikacji. Jeśli jesteś pewny, że chcesz to "
+"zmienić, należy ponownie uruchomić aplikację w celu zaktualizowania "
+"lokalizacji. Kliknij tą etykietę, żeby odblokować."
 
 #: rhodecode/templates/admin/settings/settings.html:262
-#: rhodecode/templates/base/base.html:221
+#: rhodecode/templates/base/base.html:227
 msgid "unlock"
 msgstr "odblokowany"
 
 #: rhodecode/templates/admin/settings/settings.html:263
-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"
+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:283
 msgid "Test Email"
@@ -2623,78 +2826,64 b' msgstr "U\xc5\xbcywa:"'
 msgid "API key"
 msgstr "Klucz API"
 
-#: rhodecode/templates/admin/users/user_edit.html:63
+#: rhodecode/templates/admin/users/user_edit.html:48
+msgid "Your IP"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:67
 msgid "LDAP DN"
 msgstr "LDAP DN"
 
-#: rhodecode/templates/admin/users/user_edit.html:72
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:35
+#: rhodecode/templates/admin/users/user_edit.html:76
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: rhodecode/templates/admin/users/user_edit.html:81
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
+#: rhodecode/templates/admin/users/user_edit.html:85
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48
 msgid "New password confirmation"
 msgstr "Potwierdzenie nowego hasła"
 
-#: rhodecode/templates/admin/users/user_edit.html:151
+#: rhodecode/templates/admin/users/user_edit.html:155
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
 msgid "Inherit default permissions"
 msgstr "Dziedziczą uprawnienia domyślne"
 
-#: rhodecode/templates/admin/users/user_edit.html:156
+#: rhodecode/templates/admin/users/user_edit.html:160
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113
 #, python-format
-msgid "Select to inherit permissions from %s settings. With this selected below options does not have any action"
-msgstr "Zaznacz, żeby dziedziczyć uprawnienia z %s ustawień. Po wybraniu tej opcji, poniżej nie ma żadnych działań"
-
-#: rhodecode/templates/admin/users/user_edit.html:162
+msgid ""
+"Select to inherit permissions from %s settings. With this selected below "
+"options does not have any action"
+msgstr ""
+"Zaznacz, żeby dziedziczyć uprawnienia z %s ustawień. Po wybraniu tej "
+"opcji, poniżej nie ma żadnych działań"
+
+#: rhodecode/templates/admin/users/user_edit.html:166
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr "Utwórz repozytorium"
 
-#: rhodecode/templates/admin/users/user_edit.html:170
+#: rhodecode/templates/admin/users/user_edit.html:174
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127
 msgid "Fork repositories"
 msgstr "Rozwidlenie repozytorium"
 
-#: rhodecode/templates/admin/users/user_edit.html:190
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
-msgid "Nothing here yet"
-msgstr "Nic tu nie ma jeszcze"
-
-#: rhodecode/templates/admin/users/user_edit.html:197
-#: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:217
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
-msgid "Permission"
-msgstr "Uprawnienia"
-
-#: rhodecode/templates/admin/users/user_edit.html:198
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
-msgid "Edit Permission"
-msgstr "Edycja Uprawnień"
-
-#: rhodecode/templates/admin/users/user_edit.html:247
+#: rhodecode/templates/admin/users/user_edit.html:251
 msgid "Email addresses"
 msgstr "Adresy e-mail"
 
-#: rhodecode/templates/admin/users/user_edit.html:260
+#: rhodecode/templates/admin/users/user_edit.html:264
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr "Potwierdź, aby usunąć ten e-mail: %s"
 
-#: rhodecode/templates/admin/users/user_edit.html:274
+#: rhodecode/templates/admin/users/user_edit.html:278
 msgid "New email address"
 msgstr "Nowy adres e-mail"
 
-#: rhodecode/templates/admin/users/user_edit.html:281
-msgid "Add"
-msgstr "Dodaj"
-
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:124
+#: rhodecode/templates/base/base.html:130
 msgid "My account"
 msgstr "Moje konto"
 
@@ -2707,7 +2896,7 b' msgid "My permissions"'
 msgstr "Moje uprawnienia"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:57
 msgid "My repos"
 msgstr "Moje repo"
 
@@ -2716,6 +2905,7 b' msgid "My pull requests"'
 msgstr "Moje prośby połączenia gałęzi"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:45
+#: rhodecode/templates/journal/journal.html:61
 msgid "Add repo"
 msgstr "Dodaj repo"
 
@@ -2742,51 +2932,19 b' msgstr "Bior\xc4\x99 udzia\xc5\x82 w"'
 msgid "Pull request #%s opened by %s on %s"
 msgstr "Wniosek połączenia gałęzi #%s otwarty %s dnia %s"
 
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7
-#: rhodecode/templates/bookmarks/bookmarks.html:40
-#: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:54
-#: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:8
-#: rhodecode/templates/tags/tags.html:55
-#: rhodecode/templates/tags/tags_data.html:9
-msgid "Revision"
-msgstr "Rewizja"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/journal/journal_page_repos.html:29
-msgid "private"
-msgstr "prywatny"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31
-#: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/journal/journal_page_repos.html:32
-#, python-format
-msgid "Confirm to delete this repository: %s"
-msgstr "Potwierdź usunięcie repozytorium: %s"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38
-#: rhodecode/templates/journal/journal_page_repos.html:42
-msgid "No repositories yet"
-msgstr "Nie ma jeszcze repozytoriów"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40
-#: rhodecode/templates/journal/journal_page_repos.html:44
-msgid "create one now"
-msgstr "utwórz je teraz"
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "Administracja użytkownikami"
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:235
+#: rhodecode/templates/base/base.html:241
 msgid "users"
 msgstr "użytkownicy"
 
 #: rhodecode/templates/admin/users/users.html:23
-msgid "ADD NEW USER"
-msgstr "DODAJ NOWEGO UŻYTKOWNIKA"
+#, fuzzy
+msgid "Add new user"
+msgstr "dodaj nowego użytkownika"
 
 #: rhodecode/templates/admin/users/users.html:77
 msgid "username"
@@ -2810,7 +2968,7 b' msgid "active"'
 msgstr "aktywny"
 
 #: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:238
+#: rhodecode/templates/base/base.html:244
 msgid "ldap"
 msgstr "ldap"
 
@@ -2876,8 +3034,9 b' msgid "Users groups administration"'
 msgstr "Użytkownicy grupy administracji"
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:23
-msgid "ADD NEW USER GROUP"
-msgstr "DODAJ NOWĄ GRUPĘ UŻYTKOWNIKÓW"
+#, fuzzy
+msgid "Add new user group"
+msgstr "dodaj nową grupę użytkowników"
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:32
 msgid "group name"
@@ -2897,151 +3056,155 b' msgstr "Potwierd\xc5\xba usuni\xc4\x99cie grupy u\xc5\xbcytkownik\xc3\xb3w: %s"'
 msgid "Submit a bug"
 msgstr "Prześlij błąd"
 
-#: rhodecode/templates/base/base.html:77
+#: rhodecode/templates/base/base.html:76
+#, fuzzy
+msgid "Not logged in"
+msgstr "ostatnio zalogowany"
+
+#: rhodecode/templates/base/base.html:83
 msgid "Login to your account"
 msgstr "Zaloguj się do swojego konta"
 
-#: rhodecode/templates/base/base.html:100
+#: rhodecode/templates/base/base.html:106
 msgid "Forgot password ?"
 msgstr "Nie pamiętasz hasła?"
 
-#: rhodecode/templates/base/base.html:107
+#: rhodecode/templates/base/base.html:113
 msgid "Log In"
 msgstr "Zaloguj się"
 
-#: rhodecode/templates/base/base.html:118
+#: rhodecode/templates/base/base.html:124
 msgid "Inbox"
 msgstr "Odebrana poczta"
 
-#: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:322
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:129
+#: rhodecode/templates/base/base.html:297
+#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:301
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/public_journal.html:4
 msgid "Journal"
 msgstr "Dziennik"
 
-#: rhodecode/templates/base/base.html:125
+#: rhodecode/templates/base/base.html:131
 msgid "Log Out"
 msgstr "Wyloguj się"
 
-#: rhodecode/templates/base/base.html:144
+#: rhodecode/templates/base/base.html:150
 msgid "Switch repository"
 msgstr "Przełącz repozytorium"
 
-#: rhodecode/templates/base/base.html:146
-msgid "Products"
-msgstr "Produkty"
-
 #: rhodecode/templates/base/base.html:152
-#: rhodecode/templates/base/base.html:182
-#: rhodecode/templates/base/root.html:47
-msgid "loading..."
-msgstr "wczytywanie..."
+msgid "Products"
+msgstr "Produkty"
 
 #: rhodecode/templates/base/base.html:158
-#: rhodecode/templates/base/base.html:160
-#: rhodecode/templates/base/base.html:162
-#: rhodecode/templates/data_table/_dt_elements.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:17
-#: rhodecode/templates/data_table/_dt_elements.html:19
-msgid "Summary"
-msgstr "Podsumowanie"
+#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47
+msgid "loading..."
+msgstr "wczytywanie..."
 
 #: rhodecode/templates/base/base.html:166
 #: rhodecode/templates/base/base.html:168
 #: rhodecode/templates/base/base.html:170
+#: rhodecode/templates/data_table/_dt_elements.html:9
+#: rhodecode/templates/data_table/_dt_elements.html:11
+#: rhodecode/templates/data_table/_dt_elements.html:13
+msgid "Summary"
+msgstr "Podsumowanie"
+
+#: rhodecode/templates/base/base.html:174
+#: rhodecode/templates/base/base.html:176
+#: rhodecode/templates/base/base.html:178
 #: rhodecode/templates/changelog/changelog.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:23
-#: rhodecode/templates/data_table/_dt_elements.html:25
-#: rhodecode/templates/data_table/_dt_elements.html:27
+#: 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 "Dziennik zmian"
 
-#: rhodecode/templates/base/base.html:175
-#: rhodecode/templates/base/base.html:177
-#: rhodecode/templates/base/base.html:179
+#: rhodecode/templates/base/base.html:182
+#: rhodecode/templates/base/base.html:184
+#: rhodecode/templates/base/base.html:186
 msgid "Switch to"
 msgstr "Przełącz do"
 
-#: rhodecode/templates/base/base.html:186
-#: rhodecode/templates/base/base.html:188
-#: rhodecode/templates/base/base.html:190
-#: rhodecode/templates/data_table/_dt_elements.html:31
-#: rhodecode/templates/data_table/_dt_elements.html:33
-#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/base/base.html:193
+#: rhodecode/templates/base/base.html:195
+#: rhodecode/templates/base/base.html:197
+#: rhodecode/templates/data_table/_dt_elements.html:25
+#: rhodecode/templates/data_table/_dt_elements.html:27
+#: rhodecode/templates/data_table/_dt_elements.html:29
 msgid "Files"
 msgstr "Pliki"
 
-#: rhodecode/templates/base/base.html:195
-#: rhodecode/templates/base/base.html:199
+#: rhodecode/templates/base/base.html:201
+#: rhodecode/templates/base/base.html:205
 msgid "Options"
 msgstr "Opcje"
 
-#: rhodecode/templates/base/base.html:204
-#: rhodecode/templates/base/base.html:206
+#: rhodecode/templates/base/base.html:210
+#: rhodecode/templates/base/base.html:212
 msgid "repository settings"
 msgstr "ustawienia repozytorium"
 
-#: rhodecode/templates/base/base.html:210
-#: rhodecode/templates/data_table/_dt_elements.html:80
+#: rhodecode/templates/base/base.html:216
+#: rhodecode/templates/data_table/_dt_elements.html:74
 #: rhodecode/templates/forks/fork.html:13
 msgid "fork"
 msgstr "gałąż"
 
-#: rhodecode/templates/base/base.html:212
-#: rhodecode/templates/base/root.html:50
+#: rhodecode/templates/base/base.html:218
 #: rhodecode/templates/changelog/changelog.html:43
-msgid "Open new pull request"
+#, fuzzy
+msgid "open new pull request"
 msgstr "Otwórz nową prośbę o połączenie gałęzi"
 
-#: rhodecode/templates/base/base.html:215
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
+#: rhodecode/templates/base/base.html:221
+#, fuzzy
+msgid "compare fork"
 msgstr "Porównaj rozwidlenie"
 
-#: rhodecode/templates/base/base.html:217
+#: rhodecode/templates/base/base.html:223
 msgid "search"
 msgstr "szukaj"
 
-#: rhodecode/templates/base/base.html:223
+#: rhodecode/templates/base/base.html:229
 msgid "lock"
 msgstr "zablokowane"
 
-#: rhodecode/templates/base/base.html:234
+#: rhodecode/templates/base/base.html:240
 msgid "repositories groups"
 msgstr "grupy w repozytorium"
 
-#: rhodecode/templates/base/base.html:236
+#: rhodecode/templates/base/base.html:242
 msgid "users groups"
 msgstr "grupy użytkowników"
 
-#: rhodecode/templates/base/base.html:237
+#: rhodecode/templates/base/base.html:243
 msgid "permissions"
 msgstr "uprawnienia"
 
-#: rhodecode/templates/base/base.html:239
+#: rhodecode/templates/base/base.html:245
 msgid "defaults"
 msgstr "domyślne"
 
-#: rhodecode/templates/base/base.html:240
+#: rhodecode/templates/base/base.html:246
 msgid "settings"
 msgstr "ustawienia"
 
-#: rhodecode/templates/base/base.html:251
-#: rhodecode/templates/base/base.html:253
+#: rhodecode/templates/base/base.html:256
+#: rhodecode/templates/base/base.html:258
 msgid "Followers"
 msgstr "Obserwowane"
 
-#: rhodecode/templates/base/base.html:259
-#: rhodecode/templates/base/base.html:261
+#: rhodecode/templates/base/base.html:264
+#: rhodecode/templates/base/base.html:266
 msgid "Forks"
 msgstr "Gałęzie"
 
-#: rhodecode/templates/base/base.html:340
-#: rhodecode/templates/base/base.html:342
-#: rhodecode/templates/base/base.html:344
+#: rhodecode/templates/base/base.html:315
+#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:319
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "Szukaj"
@@ -3051,7 +3214,7 b' msgid "add another comment"'
 msgstr "dodaj kolejny komentarz"
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:83
+#: rhodecode/templates/data_table/_dt_elements.html:140
 #: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr "Zakończyć obserwację tego repozytorium"
@@ -3073,6 +3236,10 b' msgstr "wyszukaj obci\xc4\x99te"'
 msgid "no matching files"
 msgstr "nie ma plików pasujących"
 
+#: rhodecode/templates/base/root.html:50
+msgid "Open new pull request"
+msgstr "Otwórz nową prośbę o połączenie gałęzi"
+
 #: rhodecode/templates/base/root.html:51
 msgid "Open new pull request for selected changesets"
 msgstr "Otwórz nową prośbę o połączenie gałęzi w zestawieniu zmian"
@@ -3099,6 +3266,15 b' msgstr "%s Zak\xc5\x82adki"'
 msgid "Author"
 msgstr "Autor"
 
+#: rhodecode/templates/bookmarks/bookmarks.html:40
+#: rhodecode/templates/bookmarks/bookmarks_data.html:9
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/tags/tags_data.html:9
+msgid "Revision"
+msgstr "Rewizja"
+
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
@@ -3166,8 +3342,9 b' msgstr "Status grupy zmian"'
 
 #: rhodecode/templates/changelog/changelog.html:94
 #: rhodecode/templates/shortlog/shortlog_data.html:20
-msgid "Click to open associated pull request"
-msgstr "Kliknij żeby otworzyć prośbę o połączenie gałęzi"
+#, fuzzy, 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:104
 msgid "Parent"
@@ -3205,7 +3382,7 b' msgstr "zak\xc5\x82adka"'
 msgid "tag"
 msgstr "etykieta"
 
-#: rhodecode/templates/changelog/changelog.html:301
+#: rhodecode/templates/changelog/changelog.html:302
 msgid "There are no changes yet"
 msgstr "Nie ma jeszcze zmian"
 
@@ -3263,7 +3440,7 b' msgid "download diff"'
 msgstr "pobierz różnice"
 
 #: rhodecode/templates/changeset/changeset.html:76
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -3272,7 +3449,7 b' msgstr[1] "%d komentarzy"'
 msgstr[2] "%d komentarzy"
 
 #: rhodecode/templates/changeset/changeset.html:76
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
@@ -3282,7 +3459,7 b' msgstr[2] "(%d linii)"'
 
 #: rhodecode/templates/changeset/changeset.html:122
 #: rhodecode/templates/compare/compare_diff.html:44
-#: rhodecode/templates/pullrequests/pullrequest_show.html:76
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
 #, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
@@ -3292,7 +3469,7 b' msgstr[2] "%s plik\xc3\xb3w zosta\xc5\x82o zmienionych"'
 
 #: rhodecode/templates/changeset/changeset.html:124
 #: rhodecode/templates/compare/compare_diff.html:46
-#: rhodecode/templates/pullrequests/pullrequest_show.html:78
+#: rhodecode/templates/pullrequests/pullrequest_show.html:96
 #, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
@@ -3300,56 +3477,68 b' msgstr[0] "%s plik zosta\xc5\x82 zmieniony z %s inercjami i %s usuni\xc4\x99ciami"'
 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_file_comment.html:42
+#: rhodecode/templates/changeset/changeset_file_comment.html:30
+#, python-format
+msgid "Status from pull request %s"
+msgstr "wszystkie prośby połączenia gałęzi %s"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:32
+#, python-format
+msgid "Comment from pull request %s"
+msgstr "[komentarz] wniosek o połączenie gałęzi %s"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:57
 msgid "Submitting..."
 msgstr "Przesyłanie..."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:45
+#: rhodecode/templates/changeset/changeset_file_comment.html:60
 msgid "Commenting on line {1}."
 msgstr "Komentując linię {1}."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:46
-#: rhodecode/templates/changeset/changeset_file_comment.html:121
+#: rhodecode/templates/changeset/changeset_file_comment.html:61
+#: rhodecode/templates/changeset/changeset_file_comment.html:140
 #, 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:48
-#: rhodecode/templates/changeset/changeset_file_comment.html:123
+#: rhodecode/templates/changeset/changeset_file_comment.html:63
+#: rhodecode/templates/changeset/changeset_file_comment.html:142
 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:59
-#: rhodecode/templates/changeset/changeset_file_comment.html:143
+msgstr ""
+"Użyj @username wewnątrz tego tekstu, aby wysłać powiadomienie do "
+"użytkownika strony"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:74
+#: rhodecode/templates/changeset/changeset_file_comment.html:162
 msgid "Comment"
 msgstr "Komentarz"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:60
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
+#: rhodecode/templates/changeset/changeset_file_comment.html:75
+#: rhodecode/templates/changeset/changeset_file_comment.html:86
 msgid "Hide"
 msgstr "Ukryj"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 msgid "You need to be logged in to comment."
 msgstr "Musisz być zalogowany żeby komentarz."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 msgid "Login now"
 msgstr "Zaloguj się teraz"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:118
+#: rhodecode/templates/changeset/changeset_file_comment.html:137
 msgid "Leave a comment"
 msgstr "Napisz komentarz"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:125
+#: rhodecode/templates/changeset/changeset_file_comment.html:144
 msgid "Check this to change current status of code-review for this changeset"
 msgstr "Zaznacz to, aby zmienić bieżący stan code przeglądu tego zestawienia zmian"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:125
+#: rhodecode/templates/changeset/changeset_file_comment.html:144
 msgid "change status"
 msgstr "zmień status"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:145
+#: rhodecode/templates/changeset/changeset_file_comment.html:164
 msgid "Comment and close"
 msgstr "Skomentuj i zamknij"
 
@@ -3384,7 +3573,7 b' msgid "No changesets"'
 msgstr "Brak zestawienia zmian"
 
 #: rhodecode/templates/compare/compare_diff.html:37
-#: rhodecode/templates/pullrequests/pullrequest_show.html:69
+#: rhodecode/templates/pullrequests/pullrequest_show.html:87
 #, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
@@ -3393,58 +3582,60 b' msgstr[1] "Poka\xc5\xbc %s komentarze"'
 msgstr[2] "Pokaż %s komentarze"
 
 #: rhodecode/templates/compare/compare_diff.html:52
-#: rhodecode/templates/pullrequests/pullrequest_show.html:84
+#: rhodecode/templates/pullrequests/pullrequest_show.html:102
 msgid "No files"
 msgstr "Brak plików"
 
-#: rhodecode/templates/data_table/_dt_elements.html:39
-#: rhodecode/templates/data_table/_dt_elements.html:41
-#: rhodecode/templates/data_table/_dt_elements.html:43
+#: rhodecode/templates/data_table/_dt_elements.html:33
+#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/data_table/_dt_elements.html:37
 msgid "Fork"
 msgstr "Gałąź"
 
-#: rhodecode/templates/data_table/_dt_elements.html:60
-#: rhodecode/templates/journal/journal.html:89
+#: rhodecode/templates/data_table/_dt_elements.html:54
 #: rhodecode/templates/summary/summary.html:77
 msgid "Mercurial repository"
 msgstr "Repozytorium mercurial"
 
-#: rhodecode/templates/data_table/_dt_elements.html:62
-#: rhodecode/templates/journal/journal.html:91
+#: rhodecode/templates/data_table/_dt_elements.html:56
 #: rhodecode/templates/summary/summary.html:80
 msgid "Git repository"
 msgstr "Repozytorium git"
 
-#: rhodecode/templates/data_table/_dt_elements.html:69
-#: rhodecode/templates/journal/journal.html:97
+#: rhodecode/templates/data_table/_dt_elements.html:63
 #: rhodecode/templates/summary/summary.html:87
 msgid "public repository"
 msgstr "Publiczne repozytorium"
 
-#: rhodecode/templates/data_table/_dt_elements.html:80
+#: rhodecode/templates/data_table/_dt_elements.html:74
 #: rhodecode/templates/summary/summary.html:96
 #: rhodecode/templates/summary/summary.html:97
 msgid "Fork of"
 msgstr "Gałąź z"
 
-#: rhodecode/templates/data_table/_dt_elements.html:94
+#: rhodecode/templates/data_table/_dt_elements.html:88
 msgid "No changesets yet"
 msgstr "Nie ma jeszcze zestawienia zmian"
 
-#: rhodecode/templates/data_table/_dt_elements.html:101
-#: rhodecode/templates/data_table/_dt_elements.html:103
+#: 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 "Subskrybuj %s kanał rss"
 
-#: rhodecode/templates/data_table/_dt_elements.html:109
-#: rhodecode/templates/data_table/_dt_elements.html:111
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:105
 #, 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:131
+#, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "Potwierdź usunięcie tego użytkownika: %s"
 
@@ -3474,8 +3665,12 b' msgstr "Je\xc5\x9bli nie chcesz wygenerowa\xc4\x87 nowego has\xc5\x82a to zignoruj t\xc4\x85 wiadomo\xc5\x9b\xc4\x87."'
 
 #: rhodecode/templates/email_templates/pull_request.html:4
 #, python-format
-msgid "User %s opened pull request for repository %s and wants you to review changes."
-msgstr "Użytkownik %s zgłosił wniosek połączenia w repozytorium %s i chce żeby sprawdzić zmiany."
+msgid ""
+"User %s opened pull request for repository %s and wants you to review "
+"changes."
+msgstr ""
+"Użytkownik %s zgłosił wniosek połączenia w repozytorium %s i chce żeby "
+"sprawdzić zmiany."
 
 #: rhodecode/templates/email_templates/pull_request.html:5
 msgid "title"
@@ -3486,18 +3681,20 b' msgstr "tytu\xc5\x82"'
 msgid "description"
 msgstr "opis"
 
-#: rhodecode/templates/email_templates/pull_request.html:11
+#: rhodecode/templates/email_templates/pull_request.html:7
+msgid "View this pull request here"
+msgstr "Wyświetl prośby pobrania tutaj"
+
+#: rhodecode/templates/email_templates/pull_request.html:12
 msgid "revisions for reviewing"
 msgstr "korekty dotyczące rewizji"
 
-#: rhodecode/templates/email_templates/pull_request.html:18
-msgid "View this pull request here"
-msgstr "Wyświetl prośby pobrania tutaj"
-
 #: rhodecode/templates/email_templates/pull_request_comment.html:4
 #, python-format
 msgid "User %s commented on pull request #%s for repository %s"
-msgstr "Użytkownik %s skomentował wniosek o połączenie gałęzi #%s dla repozytorium %s"
+msgstr ""
+"Użytkownik %s skomentował wniosek o połączenie gałęzi #%s dla "
+"repozytorium %s"
 
 #: rhodecode/templates/email_templates/pull_request_comment.html:10
 msgid "New status"
@@ -3653,7 +3850,7 b' msgstr "poka\xc5\xbc adnotacje"'
 
 #: rhodecode/templates/files/files_edit.html:50
 #: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:53
+#: rhodecode/templates/files/files_source.html:55
 msgid "show as raw"
 msgstr "wyświetl jako raw"
 
@@ -3702,12 +3899,25 b' msgstr "Za\xc5\x82aduj histori\xc4\x99 pliku"'
 msgid "show source"
 msgstr "pokaż źródło"
 
-#: rhodecode/templates/files/files_source.html:44
+#: rhodecode/templates/files/files_source.html:29
+#, fuzzy, python-format
+msgid "edit on branch:%s"
+msgstr "Usunięta gałąź: %s"
+
+#: rhodecode/templates/files/files_source.html:31
+msgid "edit on branch:?"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:31
+msgid "Editing files allowed only when on branch head revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:46
 #, python-format
 msgid "Binary file (%s)"
 msgstr "Plik binarny (%s)"
 
-#: rhodecode/templates/files/files_source.html:53
+#: rhodecode/templates/files/files_source.html:55
 msgid "File is too big to display"
 msgstr "Plik jest za duży do wyświetlenia"
 
@@ -3782,6 +3992,10 b' msgstr "ga\xc5\x82\xc4\x85\xc5\xba"'
 msgid "forked"
 msgstr "rozgałęziony"
 
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
+msgstr "Porównaj rozwidlenie"
+
 #: rhodecode/templates/forks/forks_data.html:42
 msgid "There are no forks yet"
 msgstr "Nie ma jeszcze gałęzi"
@@ -3809,26 +4023,10 b' msgstr "Kana\xc5\x82 RSS"'
 msgid "ATOM feed"
 msgstr "Kanał ATOM"
 
-#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:54
 msgid "Watched"
 msgstr "Obserwowane"
 
-#: rhodecode/templates/journal/journal.html:54
-msgid "ADD"
-msgstr "DODAJ"
-
-#: rhodecode/templates/journal/journal.html:77
-msgid "following user"
-msgstr "następujący użytkownik"
-
-#: rhodecode/templates/journal/journal.html:77
-msgid "user"
-msgstr "użytkownik"
-
-#: rhodecode/templates/journal/journal.html:110
-msgid "You are not following any users or repositories"
-msgstr "Nie obserwujesz żadnych użytkowników lub repozytoriów"
-
 #: rhodecode/templates/journal/journal_data.html:55
 msgid "No entries yet"
 msgstr "Brak wpisów jeszcze"
@@ -3859,17 +4057,17 b' msgid "Detailed compare view"'
 msgstr "Szczegółowe porównanie widoku"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:100
+#: rhodecode/templates/pullrequests/pullrequest_show.html:118
 msgid "Pull request reviewers"
 msgstr "Recenzje wniosków połączenia gałęzi"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:130
 msgid "owner"
 msgstr "właściciel"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:127
+#: rhodecode/templates/pullrequests/pullrequest_show.html:145
 msgid "Add reviewer to this pull request."
 msgstr "Pokarz wszystkie zmiany"
 
@@ -3921,15 +4119,20 b' msgstr[2] "%d recenzent\xc3\xb3w"'
 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:58
+#: rhodecode/templates/pullrequests/pullrequest_show.html:56
+#, fuzzy
+msgid "Origin repository"
+msgstr "Repozytorium git"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:76
 msgid "Created on"
 msgstr "Utworzono"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:83
 msgid "Compare view"
 msgstr "Wyświetl porównanie"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:130
 msgid "reviewer"
 msgstr "recenzent"
 
@@ -4206,28 +4409,3 b' msgstr "Etykiety pliku %s"'
 msgid "Compare tags"
 msgstr "Porównaj tagi"
 
-#~ msgid ""
-#~ "%s repository is not mapped to db"
-#~ " perhaps it was created or renamed"
-#~ " from the file system please run "
-#~ "the application again in order to "
-#~ "rescan repositories"
-#~ msgstr ""
-#~ "%s repozytorium nie jest mapowane do "
-#~ "db może zostało utworzone lub zmienione"
-#~ " z systemu plików proszę uruchomić "
-#~ "aplikację ponownie, aby ponownie przeskanować"
-#~ " repozytoria"
-
-#~ msgid ""
-#~ "%s repository is not mapped to db"
-#~ " perhaps it was moved or renamed  "
-#~ "from the filesystem please run the "
-#~ "application again in order to rescan "
-#~ "repositories"
-#~ msgstr ""
-#~ "%s repozytorium nie jest mapowane do "
-#~ "db może zostało przeniesione lub "
-#~ "zmienione w systemie plików proszę "
-#~ "uruchomić aplikację ponownie, aby ponownie "
-#~ "przeskanować repozytoria"

rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode 1.2.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-12-14 04:19+0100\n"
+"POT-Creation-Date: 2013-01-28 00:24+0100\n"
 "PO-Revision-Date: 2012-05-22 16:47-0300\n"
 "Last-Translator: Augusto Herrmann <[e-mail]>\n"
 "Language-Team: pt_BR <[e-mail]>\n"
@@ -34,15 +34,15 b' msgstr "ignorar espa\xc3\xa7os em branco"'
 msgid "%s line context"
 msgstr "contexto de %s linhas"
 
-#: rhodecode/controllers/changeset.py:314
-#: rhodecode/controllers/pullrequests.py:417
+#: rhodecode/controllers/changeset.py:329
+#: rhodecode/controllers/pullrequests.py:416
 #, fuzzy, python-format
 msgid "Status change -> %s"
 msgstr "Última alteração"
 
-#: rhodecode/controllers/changeset.py:345
+#: rhodecode/controllers/changeset.py:360
 msgid ""
-"Changing status on a changeset associated witha closed pull request is "
+"Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr ""
 
@@ -98,8 +98,8 b' msgstr "%s - feed %s"'
 #: rhodecode/templates/changeset/changeset.html:149
 #: rhodecode/templates/compare/compare_diff.html:62
 #: rhodecode/templates/compare/compare_diff.html:73
-#: rhodecode/templates/pullrequests/pullrequest_show.html:94
-#: rhodecode/templates/pullrequests/pullrequest_show.html:153
+#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:171
 msgid "Changeset was too big and was cut off..."
 msgstr "Conjunto de mudanças era grande demais e foi cortado..."
 
@@ -118,105 +118,109 b' msgstr "adicionar novo arquivo"'
 msgid "There are no files yet %s"
 msgstr "Ainda não há arquivos %s"
 
-#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325
+#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:292
-#, python-format
-msgid "Edited %s via RhodeCode"
+#: rhodecode/controllers/files.py:281
+msgid "You can only edit files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:295
+#, fuzzy, python-format
+msgid "Edited file %s via RhodeCode"
 msgstr "Editado %s via RhodeCode"
 
-#: rhodecode/controllers/files.py:297
+#: rhodecode/controllers/files.py:311
 msgid "No changes"
 msgstr "Sem alterações"
 
-#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372
+#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Commit realizado com sucesso para %s"
 
-#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378
+#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390
 msgid "Error occurred during commit"
 msgstr "Ocorreu um erro ao realizar commit"
 
-#: rhodecode/controllers/files.py:344
-#, python-format
-msgid "Added %s via RhodeCode"
+#: rhodecode/controllers/files.py:350
+#, fuzzy
+msgid "Added file via RhodeCode"
 msgstr "Adicionado %s via RhodeCode"
 
-#: rhodecode/controllers/files.py:358
+#: rhodecode/controllers/files.py:370
 msgid "No content"
 msgstr "Nenhum conteúdo"
 
-#: rhodecode/controllers/files.py:362
+#: rhodecode/controllers/files.py:374
 msgid "No filename"
 msgstr "Nenhum nomes de arquivo"
 
-#: rhodecode/controllers/files.py:404
+#: rhodecode/controllers/files.py:416
 msgid "downloads disabled"
 msgstr "downloads desabilitados"
 
-#: rhodecode/controllers/files.py:415
+#: rhodecode/controllers/files.py:427
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Revisão desconhecida %s"
 
-#: rhodecode/controllers/files.py:417
+#: rhodecode/controllers/files.py:429
 msgid "Empty repository"
 msgstr "Repositório vazio"
 
-#: rhodecode/controllers/files.py:419
+#: rhodecode/controllers/files.py:431
 msgid "Unknown archive type"
 msgstr "Arquivo de tipo desconhecido"
 
-#: rhodecode/controllers/files.py:564
+#: rhodecode/controllers/files.py:576
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr "Conjuntos de mudanças"
 
-#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74
-#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550
+#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74
+#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564
 msgid "Branches"
 msgstr "Ramos"
 
-#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78
-#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561
+#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78
+#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: rhodecode/controllers/forks.py:158
+#: rhodecode/controllers/forks.py:165
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "bifurcado repositório %s como %s"
 
-#: rhodecode/controllers/forks.py:172
+#: rhodecode/controllers/forks.py:179
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr "Ocorreu um erro ao bifurcar o repositório %s"
 
-#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261
+#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318
 #, fuzzy
 msgid "public journal"
 msgstr "Diário público"
 
-#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322
+#: rhodecode/templates/base/base.html:238
 #: rhodecode/templates/journal/journal.html:12
 msgid "journal"
 msgstr "diário"
 
-#: rhodecode/controllers/login.py:143
+#: rhodecode/controllers/login.py:142
 msgid "You have successfully registered into rhodecode"
 msgstr "Você se registrou com sucesso no rhodecode"
 
-#: rhodecode/controllers/login.py:164
+#: rhodecode/controllers/login.py:163
 msgid "Your password reset link was sent"
 msgstr "Seu link de reinicialização de senha foi enviado"
 
-#: rhodecode/controllers/login.py:184
+#: rhodecode/controllers/login.py:183
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
@@ -224,7 +228,7 b' msgstr ""'
 "Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao "
 "seu e-mail"
 
-#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556
+#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570
 msgid "Bookmarks"
 msgstr "Marcadores"
 
@@ -252,7 +256,7 b' msgstr "ocorreu um erro ao criar o reposit\xc3\xb3rio %s"'
 msgid "Successfully deleted pull request"
 msgstr "usuário excluído com sucesso"
 
-#: rhodecode/controllers/pullrequests.py:452
+#: rhodecode/controllers/pullrequests.py:451
 msgid "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr ""
 
@@ -268,48 +272,48 b' msgstr "N\xc3\xa3o h\xc3\xa1 \xc3\xadndice onde pesquisa. Por favor execute o indexador whoosh"'
 msgid "An error occurred during this search operation"
 msgstr "Ocorreu um erro durante essa operação de busca"
 
-#: rhodecode/controllers/settings.py:119
-#: rhodecode/controllers/admin/repos.py:272
+#: rhodecode/controllers/settings.py:120
+#: rhodecode/controllers/admin/repos.py:254
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "Repositório %s atualizado com sucesso"
 
-#: rhodecode/controllers/settings.py:137
-#: rhodecode/controllers/admin/repos.py:290
+#: rhodecode/controllers/settings.py:138
+#: rhodecode/controllers/admin/repos.py:272
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr "ocorreu um erro ao atualizar o repositório %s"
 
-#: rhodecode/controllers/settings.py:162
-#: rhodecode/controllers/admin/repos.py:315
+#: rhodecode/controllers/settings.py:163
+#: rhodecode/controllers/admin/repos.py:297
 #, python-format
 msgid "deleted repository %s"
 msgstr "excluído o repositório %s"
 
-#: rhodecode/controllers/settings.py:166
-#: rhodecode/controllers/admin/repos.py:325
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/settings.py:167
+#: rhodecode/controllers/admin/repos.py:307
+#: rhodecode/controllers/admin/repos.py:313
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "Ocorreu um erro durante a exclusão de %s"
 
-#: rhodecode/controllers/settings.py:185
+#: rhodecode/controllers/settings.py:186
 #, fuzzy
 msgid "unlocked"
 msgstr "destravar"
 
-#: rhodecode/controllers/settings.py:188
+#: rhodecode/controllers/settings.py:189
 #, fuzzy
 msgid "locked"
 msgstr "destravar"
 
-#: rhodecode/controllers/settings.py:190
+#: rhodecode/controllers/settings.py:191
 #, fuzzy, python-format
 msgid "Repository has been %s"
 msgstr "bifurcado repositório %s como %s"
 
-#: rhodecode/controllers/settings.py:194
-#: rhodecode/controllers/admin/repos.py:423
+#: rhodecode/controllers/settings.py:195
+#: rhodecode/controllers/admin/repos.py:405
 #, fuzzy
 msgid "An error occurred during unlocking"
 msgstr "Ocorreu um erro durante essa operação"
@@ -389,23 +393,23 b' msgstr "N\xc3\xa3o foi poss\xc3\xadvel ativar LDAP. A biblioteca \\"python-ldap\\" est\xc3\xa1 faltando."'
 msgid "error occurred during update of ldap settings"
 msgstr "ocorreu um erro ao atualizar as configurações de LDAP"
 
-#: rhodecode/controllers/admin/permissions.py:59
-#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:60
+#: rhodecode/controllers/admin/permissions.py:64
 msgid "None"
 msgstr "Nenhum"
 
-#: rhodecode/controllers/admin/permissions.py:60
-#: rhodecode/controllers/admin/permissions.py:64
-msgid "Read"
-msgstr "Ler"
-
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
-msgid "Write"
-msgstr "Gravar"
+msgid "Read"
+msgstr "Ler"
 
 #: rhodecode/controllers/admin/permissions.py:62
 #: rhodecode/controllers/admin/permissions.py:66
+msgid "Write"
+msgstr "Gravar"
+
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
 #: rhodecode/templates/admin/defaults/defaults.html:9
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
@@ -419,228 +423,228 b' msgstr "Gravar"'
 #: 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:126
+#: rhodecode/templates/admin/users/user_edit.html:130
 #: rhodecode/templates/admin/users/users.html:9
 #: rhodecode/templates/admin/users_groups/users_group_add.html:8
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:197
-#: rhodecode/templates/base/base.html:350
-#: rhodecode/templates/base/base.html:352
-#: rhodecode/templates/base/base.html:354
+#: rhodecode/templates/base/base.html:203
+#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:328
 msgid "Admin"
 msgstr "Administrador"
 
-#: rhodecode/controllers/admin/permissions.py:69
+#: rhodecode/controllers/admin/permissions.py:70
 msgid "disabled"
 msgstr "desabilitado"
 
-#: rhodecode/controllers/admin/permissions.py:71
+#: rhodecode/controllers/admin/permissions.py:72
 msgid "allowed with manual account activation"
 msgstr "permitido com ativação manual de conta"
 
-#: rhodecode/controllers/admin/permissions.py:73
+#: rhodecode/controllers/admin/permissions.py:74
 msgid "allowed with automatic account activation"
 msgstr "permitido com ativação automática de conta"
 
-#: rhodecode/controllers/admin/permissions.py:75
-#: rhodecode/controllers/admin/permissions.py:78
-msgid "Disabled"
-msgstr "Desabilitado"
-
 #: rhodecode/controllers/admin/permissions.py:76
 #: rhodecode/controllers/admin/permissions.py:79
+msgid "Disabled"
+msgstr "Desabilitado"
+
+#: rhodecode/controllers/admin/permissions.py:77
+#: rhodecode/controllers/admin/permissions.py:80
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: rhodecode/controllers/admin/permissions.py:122
+#: rhodecode/controllers/admin/permissions.py:128
 msgid "Default permissions updated successfully"
 msgstr "Permissões padrões atualizadas com sucesso"
 
-#: rhodecode/controllers/admin/permissions.py:136
+#: rhodecode/controllers/admin/permissions.py:142
 msgid "error occurred during update of permissions"
 msgstr "ocorreu um erro ao atualizar as permissões"
 
-#: rhodecode/controllers/admin/repos.py:121
+#: rhodecode/controllers/admin/repos.py:123
 msgid "--REMOVE FORK--"
 msgstr "--REMOVER BIFURCAÇÂO--"
 
-#: rhodecode/controllers/admin/repos.py:190
+#: rhodecode/controllers/admin/repos.py:162
 #, python-format
 msgid "created repository %s from %s"
 msgstr "repositório %s criado a partir de %s"
 
-#: rhodecode/controllers/admin/repos.py:194
+#: rhodecode/controllers/admin/repos.py:166
 #, python-format
 msgid "created repository %s"
 msgstr "repositório %s criado"
 
-#: rhodecode/controllers/admin/repos.py:225
+#: rhodecode/controllers/admin/repos.py:197
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr "ocorreu um erro ao criar o repositório %s"
 
-#: rhodecode/controllers/admin/repos.py:320
+#: rhodecode/controllers/admin/repos.py:302
 #, 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:349
+#: rhodecode/controllers/admin/repos.py:331
 msgid "An error occurred during deletion of repository user"
 msgstr "Ocorreu um erro ao excluir usuário de repositório"
 
-#: rhodecode/controllers/admin/repos.py:368
+#: rhodecode/controllers/admin/repos.py:350
 msgid "An error occurred during deletion of repository users groups"
 msgstr "Ocorreu um erro ao excluir grupo de usuário de repositório"
 
-#: rhodecode/controllers/admin/repos.py:386
+#: rhodecode/controllers/admin/repos.py:368
 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:403
+#: rhodecode/controllers/admin/repos.py:385
 msgid "An error occurred during cache invalidation"
 msgstr "Ocorreu um erro ao invalidar o cache"
 
-#: rhodecode/controllers/admin/repos.py:443
+#: rhodecode/controllers/admin/repos.py:425
 msgid "Updated repository visibility in public journal"
 msgstr "Atualizada a visibilidade do repositório no diário público"
 
+#: rhodecode/controllers/admin/repos.py:429
+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:434 rhodecode/model/validators.py:301
+msgid "Token mismatch"
+msgstr "Descompasso de Token"
+
 #: rhodecode/controllers/admin/repos.py:447
-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:452 rhodecode/model/validators.py:300
-msgid "Token mismatch"
-msgstr "Descompasso de Token"
-
-#: rhodecode/controllers/admin/repos.py:465
 msgid "Pulled from remote location"
 msgstr "Realizado pull de localização remota"
 
-#: rhodecode/controllers/admin/repos.py:467
+#: rhodecode/controllers/admin/repos.py:449
 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:483
+#: rhodecode/controllers/admin/repos.py:465
 msgid "Nothing"
 msgstr "Nada"
 
-#: rhodecode/controllers/admin/repos.py:485
+#: rhodecode/controllers/admin/repos.py:467
 #, 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:489
+#: rhodecode/controllers/admin/repos.py:471
 msgid "An error occurred during this operation"
 msgstr "Ocorreu um erro durante essa operação"
 
-#: rhodecode/controllers/admin/repos_groups.py:120
+#: rhodecode/controllers/admin/repos_groups.py:136
 #, python-format
 msgid "created repos group %s"
 msgstr "criado grupo de repositórios %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:133
+#: rhodecode/controllers/admin/repos_groups.py:148
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr "ccorreu um erro ao criar grupo de repositório %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:167
+#: rhodecode/controllers/admin/repos_groups.py:205
 #, python-format
 msgid "updated repos group %s"
 msgstr "atualizado grupo de repositórios %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:180
+#: rhodecode/controllers/admin/repos_groups.py:220
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr "ocorreu um erro ao atualizar grupo de repositórios %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:198
+#: rhodecode/controllers/admin/repos_groups.py:238
 #, 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:206
+#: rhodecode/controllers/admin/repos_groups.py:246
 #, python-format
 msgid "removed repos group %s"
 msgstr "removido grupo de repositórios %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:212
+#: rhodecode/controllers/admin/repos_groups.py:252
 msgid "Cannot delete this group it still contains subgroups"
 msgstr "Nao é possível excluir este grupo pois ele ainda contém subgrupos"
 
-#: rhodecode/controllers/admin/repos_groups.py:217
-#: rhodecode/controllers/admin/repos_groups.py:222
+#: rhodecode/controllers/admin/repos_groups.py:257
+#: rhodecode/controllers/admin/repos_groups.py:262
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr "ccorreu um erro ao excluir grupo de repositórios %s"
 
-#: rhodecode/controllers/admin/repos_groups.py:243
+#: rhodecode/controllers/admin/repos_groups.py:283
 msgid "An error occurred during deletion of group user"
 msgstr "Ocorreu um erro ao excluir o usuário de grupo"
 
-#: rhodecode/controllers/admin/repos_groups.py:264
+#: rhodecode/controllers/admin/repos_groups.py:304
 msgid "An error occurred during deletion of group users groups"
 msgstr "Ocorreu um erro ao excluir o grupo do grupo de usuários"
 
-#: rhodecode/controllers/admin/settings.py:123
-#, python-format
-msgid "Repositories successfully rescanned added: %s,removed: %s"
+#: rhodecode/controllers/admin/settings.py:124
+#, fuzzy, 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:131
+#: rhodecode/controllers/admin/settings.py:133
 msgid "Whoosh reindex task scheduled"
 msgstr "Tarefa de reindexação do whoosh agendada"
 
-#: rhodecode/controllers/admin/settings.py:162
+#: rhodecode/controllers/admin/settings.py:164
 msgid "Updated application settings"
 msgstr "Configurações da aplicação atualizadas"
 
-#: rhodecode/controllers/admin/settings.py:166
-#: rhodecode/controllers/admin/settings.py:299
+#: rhodecode/controllers/admin/settings.py:168
+#: rhodecode/controllers/admin/settings.py:301
 msgid "error occurred during updating application settings"
 msgstr "ocorreu um erro ao atualizar as configurações da aplicação"
 
-#: rhodecode/controllers/admin/settings.py:207
+#: rhodecode/controllers/admin/settings.py:209
 #, fuzzy
 msgid "Updated visualisation settings"
 msgstr "Configurações da aplicação atualizadas"
 
-#: rhodecode/controllers/admin/settings.py:212
+#: rhodecode/controllers/admin/settings.py:214
 #, fuzzy
 msgid "error occurred during updating visualisation settings"
 msgstr "ocorreu um erro ao atualizar as configurações da aplicação"
 
-#: rhodecode/controllers/admin/settings.py:295
+#: rhodecode/controllers/admin/settings.py:297
 #, fuzzy
 msgid "Updated VCS settings"
 msgstr "Atualizadas as configurações do mercurial"
 
-#: rhodecode/controllers/admin/settings.py:309
+#: rhodecode/controllers/admin/settings.py:311
 msgid "Added new hook"
 msgstr "Adicionado novo gancho"
 
-#: rhodecode/controllers/admin/settings.py:321
+#: rhodecode/controllers/admin/settings.py:323
 msgid "Updated hooks"
 msgstr "Atualizados os ganchos"
 
-#: rhodecode/controllers/admin/settings.py:325
+#: rhodecode/controllers/admin/settings.py:327
 msgid "error occurred during hook creation"
 msgstr "ocorreu um erro ao criar gancho"
 
-#: rhodecode/controllers/admin/settings.py:344
+#: rhodecode/controllers/admin/settings.py:346
 msgid "Email task created"
 msgstr "Tarefa de e-mail criada"
 
-#: rhodecode/controllers/admin/settings.py:399
+#: rhodecode/controllers/admin/settings.py:408
 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:430
+#: rhodecode/controllers/admin/settings.py:448
 msgid "Your account was updated successfully"
 msgstr "Sua conta foi atualizada com sucesso"
 
-#: rhodecode/controllers/admin/settings.py:445
-#: rhodecode/controllers/admin/users.py:196
+#: rhodecode/controllers/admin/settings.py:463
+#: rhodecode/controllers/admin/users.py:198
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr "ocorreu um erro ao atualizar o usuário %s"
@@ -659,57 +663,72 b' msgstr "ocorreu um erro ao criar o usu\xc3\xa1rio %s"'
 msgid "User updated successfully"
 msgstr "Usuário atualizado com sucesso"
 
-#: rhodecode/controllers/admin/users.py:212
+#: rhodecode/controllers/admin/users.py:214
 msgid "successfully deleted user"
 msgstr "usuário excluído com sucesso"
 
-#: rhodecode/controllers/admin/users.py:217
+#: rhodecode/controllers/admin/users.py:219
 msgid "An error occurred during deletion of user"
 msgstr "Ocorreu um erro ao excluir o usuário"
 
-#: rhodecode/controllers/admin/users.py:231
+#: rhodecode/controllers/admin/users.py:233
 msgid "You can't edit this user"
 msgstr "Você não pode editar esse usuário"
 
-#: rhodecode/controllers/admin/users.py:272
+#: rhodecode/controllers/admin/users.py:276
 msgid "Granted 'repository create' permission to user"
 msgstr "Concedida permissão de 'criar repositório' ao usuário"
 
-#: rhodecode/controllers/admin/users.py:277
+#: rhodecode/controllers/admin/users.py:281
 msgid "Revoked 'repository create' permission to user"
 msgstr "Revogada permissão de 'criar repositório' ao usuário"
 
-#: rhodecode/controllers/admin/users.py:283
+#: rhodecode/controllers/admin/users.py:287
 #, fuzzy
 msgid "Granted 'repository fork' permission to user"
 msgstr "Concedida permissão de 'criar repositório' ao usuário"
 
-#: rhodecode/controllers/admin/users.py:288
+#: rhodecode/controllers/admin/users.py:292
 #, fuzzy
 msgid "Revoked 'repository fork' permission to user"
 msgstr "Revogada permissão de 'criar repositório' ao usuário"
 
-#: rhodecode/controllers/admin/users.py:294
+#: rhodecode/controllers/admin/users.py:298
 #: rhodecode/controllers/admin/users_groups.py:279
 #, fuzzy
 msgid "An error occurred during permissions saving"
 msgstr "Ocorreu um erro durante essa operação"
 
-#: rhodecode/controllers/admin/users.py:309
+#: rhodecode/controllers/admin/users.py:312
 #, python-format
 msgid "Added email %s to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:315
+#: rhodecode/controllers/admin/users.py:318
 #, fuzzy
 msgid "An error occurred during email saving"
 msgstr "Ocorreu um erro durante essa operação"
 
-#: rhodecode/controllers/admin/users.py:325
+#: rhodecode/controllers/admin/users.py:328
 #, fuzzy
 msgid "Removed email from user"
 msgstr "removido grupo de repositórios %s"
 
+#: rhodecode/controllers/admin/users.py:341
+#, python-format
+msgid "Added ip %s to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:347
+#, fuzzy
+msgid "An error occurred during ip saving"
+msgstr "Ocorreu um erro durante essa operação"
+
+#: rhodecode/controllers/admin/users.py:359
+#, fuzzy
+msgid "Removed ip from user"
+msgstr "removido grupo de repositórios %s"
+
 #: rhodecode/controllers/admin/users_groups.py:86
 #, python-format
 msgid "created users group %s"
@@ -758,11 +777,16 b' msgstr "Concedida permiss\xc3\xa3o de \'criar reposit\xc3\xb3rio\' ao usu\xc3\xa1rio"'
 msgid "Revoked 'repository fork' permission to users group"
 msgstr "Revogada permissão de 'criar repositório' ao usuário"
 
-#: rhodecode/lib/auth.py:499
+#: rhodecode/lib/auth.py:509
+#, fuzzy, python-format
+msgid "IP %s not allowed"
+msgstr "seguidores"
+
+#: rhodecode/lib/auth.py:558
 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:540
+#: rhodecode/lib/auth.py:599
 msgid "You need to be a signed in to view this page"
 msgstr "Você precisa estar logado para ver essa página"
 
@@ -926,16 +950,16 b' msgstr "[passou a seguir] o reposit\xc3\xb3rio"'
 msgid "[stopped following] repository"
 msgstr "[parou de seguir] o repositório"
 
-#: rhodecode/lib/helpers.py:883
+#: rhodecode/lib/helpers.py:884
 #, python-format
 msgid " and %s more"
 msgstr " e mais %s"
 
-#: rhodecode/lib/helpers.py:887
+#: rhodecode/lib/helpers.py:888
 msgid "No Files"
 msgstr "Nenhum Arquivo"
 
-#: rhodecode/lib/helpers.py:1163
+#: rhodecode/lib/helpers.py:1164
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -1016,107 +1040,127 b' msgstr "agora h\xc3\xa1 pouco"'
 msgid "password reset link"
 msgstr "link de reinicialização de senha"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313
 #, fuzzy
 msgid "Repository no access"
 msgstr "repositórios"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314
 #, fuzzy
 msgid "Repository read access"
 msgstr "Esse repositório já existe"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315
 #, fuzzy
 msgid "Repository write access"
 msgstr "repositórios"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316
 #, fuzzy
 msgid "Repository admin access"
 msgstr "repositórios"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318
 #, fuzzy
 msgid "Repositories Group no access"
 msgstr "grupos de repositórios"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319
 #, fuzzy
 msgid "Repositories Group read access"
 msgstr "grupos de repositórios"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320
 #, fuzzy
 msgid "Repositories Group write access"
 msgstr "grupos de repositórios"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321
 #, fuzzy
 msgid "Repositories Group admin access"
 msgstr "grupos de repositórios"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323
 #, fuzzy
 msgid "RhodeCode Administrator"
 msgstr "Administração de usuários"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324
 #, fuzzy
 msgid "Repository creation disabled"
 msgstr "Criação de repositório"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325
 #, fuzzy
 msgid "Repository creation enabled"
 msgstr "Criação de repositório"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326
 #, fuzzy
 msgid "Repository forking disabled"
 msgstr "Criação de repositório"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327
 #, fuzzy
 msgid "Repository forking enabled"
 msgstr "Criação de repositório"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328
 #, fuzzy
 msgid "Register disabled"
 msgstr "desabilitado"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776
 msgid "Not Reviewed"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777
 #, fuzzy
 msgid "Approved"
 msgstr "removidos"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778
 msgid "Rejected"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779
 msgid "Under Review"
 msgstr ""
 
-#: rhodecode/model/comment.py:110
+#: rhodecode/model/comment.py:109
 #, python-format
 msgid "on line %s"
 msgstr "na linha %s"
 
-#: rhodecode/model/comment.py:173
+#: rhodecode/model/comment.py:176
 msgid "[Mention]"
 msgstr "[Menção]"
 
@@ -1168,34 +1212,33 b' msgstr "comentado no commit"'
 msgid "commented on pull request at %(when)s"
 msgstr "comentado no commit"
 
-#: rhodecode/model/pull_request.py:90
+#: rhodecode/model/pull_request.py:100
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr ""
 
-#: rhodecode/model/scm.py:542
+#: rhodecode/model/scm.py:556
 #, fuzzy
 msgid "latest tip"
 msgstr "último login"
 
-#: rhodecode/model/user.py:232
+#: rhodecode/model/user.py:231
 msgid "new user registration"
 msgstr "registro de novo usuário"
 
-#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
-#: rhodecode/model/user.py:303
+#: rhodecode/model/user.py:256 rhodecode/model/user.py:280
 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:327
+#: rhodecode/model/user.py:302
 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:333
+#: rhodecode/model/user.py:308
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch "
@@ -1204,21 +1247,21 b' msgstr ""'
 "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. "
 "Troque os donos ou remova esses repositórios. %s"
 
-#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37
+#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38
 msgid "Value cannot be an empty list"
 msgstr ""
 
-#: rhodecode/model/validators.py:83
+#: rhodecode/model/validators.py:84
 #, fuzzy, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "Esse nome de usuário já existe"
 
-#: rhodecode/model/validators.py:85
+#: rhodecode/model/validators.py:86
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr ""
 
-#: rhodecode/model/validators.py:87
+#: rhodecode/model/validators.py:88
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
@@ -1226,22 +1269,22 b' 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:115
+#: rhodecode/model/validators.py:116
 #, fuzzy, python-format
 msgid "Username %(username)s is not valid"
 msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido"
 
-#: rhodecode/model/validators.py:134
+#: rhodecode/model/validators.py:135
 #, fuzzy
 msgid "Invalid users group name"
 msgstr "nome de usuário inválido"
 
-#: rhodecode/model/validators.py:135
+#: rhodecode/model/validators.py:136
 #, fuzzy, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr "Esse grupo de usuários já existe"
 
-#: rhodecode/model/validators.py:137
+#: rhodecode/model/validators.py:138
 msgid ""
 "users group name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
@@ -1250,98 +1293,103 b' msgstr ""'
 "alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere "
 "alfanumérico"
 
-#: rhodecode/model/validators.py:175
+#: rhodecode/model/validators.py:176
 msgid "Cannot assign this group as parent"
 msgstr "Não é possível associar esse grupo como progenitor"
 
-#: rhodecode/model/validators.py:176
+#: rhodecode/model/validators.py:177
 #, fuzzy, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "Esse nome de usuário já existe"
 
-#: rhodecode/model/validators.py:178
+#: rhodecode/model/validators.py:179
 #, fuzzy, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr "Já existe um repositório com esse nome"
 
-#: rhodecode/model/validators.py:236
+#: rhodecode/model/validators.py:237
 #, fuzzy
 msgid "Invalid characters (non-ascii) in password"
 msgstr "Caracteres inválidos na senha"
 
-#: rhodecode/model/validators.py:251
+#: rhodecode/model/validators.py:252
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: rhodecode/model/validators.py:268
-msgid "invalid password"
-msgstr "senha inválida"
-
 #: rhodecode/model/validators.py:269
-msgid "invalid user name"
-msgstr "nome de usuário inválido"
+msgid "invalid password"
+msgstr "senha inválida"
 
 #: rhodecode/model/validators.py:270
+msgid "invalid user name"
+msgstr "nome de usuário inválido"
+
+#: rhodecode/model/validators.py:271
 msgid "Your account is disabled"
 msgstr "Sua conta está desabilitada"
 
-#: rhodecode/model/validators.py:314
+#: rhodecode/model/validators.py:315
 #, fuzzy, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr "Esse nome de repositório não é permitido"
 
-#: rhodecode/model/validators.py:316
+#: rhodecode/model/validators.py:317
 #, fuzzy, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "Já existe um repositório com esse nome"
 
-#: rhodecode/model/validators.py:317
+#: rhodecode/model/validators.py:318
 #, fuzzy, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "Esse repositório já existe em um grupo \"%s\""
 
-#: rhodecode/model/validators.py:319
+#: rhodecode/model/validators.py:320
 #, fuzzy, python-format
 msgid "Repositories group with name \"%(repo)s\" already exists"
 msgstr "Já existe um repositório com esse nome"
 
-#: rhodecode/model/validators.py:432
+#: rhodecode/model/validators.py:433
 msgid "invalid clone url"
 msgstr "URL de clonagem inválida"
 
-#: rhodecode/model/validators.py:433
+#: rhodecode/model/validators.py:434
 #, fuzzy
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr "URL de clonagem inválida, forneça uma URL válida de clonagem http\\s"
 
-#: rhodecode/model/validators.py:458
+#: rhodecode/model/validators.py:459
 #, fuzzy
 msgid "Fork have to be the same type as parent"
 msgstr "Bifurcação precisa ser do mesmo tipo que o original"
 
-#: rhodecode/model/validators.py:473
+#: rhodecode/model/validators.py:474
 #, fuzzy
 msgid "You don't have permissions to create repository in this group"
 msgstr "Você não tem permissão para ver esta página"
 
-#: rhodecode/model/validators.py:498
+#: rhodecode/model/validators.py:501
+#, fuzzy
+msgid "You don't have permissions to create a group in this location"
+msgstr "Você não tem permissão para ver esta página"
+
+#: rhodecode/model/validators.py:540
 msgid "This username or users group name is not valid"
 msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido"
 
-#: rhodecode/model/validators.py:591
+#: rhodecode/model/validators.py:636
 msgid "This is not a valid path"
 msgstr "Esse não é um caminho válido"
 
-#: rhodecode/model/validators.py:606
+#: rhodecode/model/validators.py:651
 msgid "This e-mail address is already taken"
 msgstr "Esse endereço de e-mail já está tomado"
 
-#: rhodecode/model/validators.py:626
+#: rhodecode/model/validators.py:671
 #, fuzzy, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "Esse endereço de e-mail não existe."
 
-#: rhodecode/model/validators.py:663
+#: rhodecode/model/validators.py:708
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
@@ -1349,11 +1397,20 b' 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:682
+#: rhodecode/model/validators.py:727
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
+#: rhodecode/model/validators.py:759
+msgid "Please enter a valid IPv4 or IpV6 address"
+msgstr ""
+
+#: rhodecode/model/validators.py:760
+#, python-format
+msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
+msgstr ""
+
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr "Painel de Controle"
@@ -1366,43 +1423,55 b' msgstr "Painel de Controle"'
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 #: rhodecode/templates/branches/branches.html:9
 #: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:48
+#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:50
 #: rhodecode/templates/tags/tags.html:10
 msgid "quick filter..."
 msgstr "filtro rápido..."
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:233
+#: rhodecode/templates/base/base.html:239
 msgid "repositories"
 msgstr "repositórios"
 
-#: rhodecode/templates/index_base.html:13
-#: rhodecode/templates/index_base.html:15
+#: rhodecode/templates/index_base.html:14
+#: rhodecode/templates/index_base.html:17
+#: rhodecode/templates/admin/repos/repo_add.html:5
+#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
 #: rhodecode/templates/admin/repos/repos.html:21
-msgid "ADD REPOSITORY"
-msgstr "ADICIONAR REPOSITÓRIO"
-
-#: rhodecode/templates/index_base.html:29
-#: rhodecode/templates/index_base.html:136
+msgid "Add repository"
+msgstr "Adicionar repositório"
+
+#: rhodecode/templates/index_base.html:23
+#, fuzzy
+msgid "Edit group"
+msgstr "editar grupo de repositórios"
+
+#: rhodecode/templates/index_base.html:23
+msgid "You have admin right to this group, and can edit it"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:36
+#: rhodecode/templates/index_base.html:140
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
 #: rhodecode/templates/admin/users_groups/users_group_add.html:32
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33
 msgid "Group name"
 msgstr "Nome do grupo"
 
-#: rhodecode/templates/index_base.html:30
-#: rhodecode/templates/index_base.html:72
-#: rhodecode/templates/index_base.html:138
-#: rhodecode/templates/index_base.html:176
-#: rhodecode/templates/index_base.html:266
+#: rhodecode/templates/index_base.html:37
+#: rhodecode/templates/index_base.html:79
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/index_base.html:180
+#: rhodecode/templates/index_base.html:273
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
-#: rhodecode/templates/admin/repos/repos.html:72
+#: rhodecode/templates/admin/repos/repos.html:73
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
 #: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:66
@@ -1410,31 +1479,29 b' msgstr "Nome do grupo"'
 msgid "Description"
 msgstr "Descrição"
 
-#: rhodecode/templates/index_base.html:40
+#: rhodecode/templates/index_base.html:47
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47
 msgid "Repositories group"
 msgstr "Grupo de repositórios"
 
-#: rhodecode/templates/index_base.html:71
-#: rhodecode/templates/index_base.html:174
-#: rhodecode/templates/index_base.html:264
+#: rhodecode/templates/index_base.html:78
+#: rhodecode/templates/index_base.html:178
+#: rhodecode/templates/index_base.html:271
+#: rhodecode/templates/admin/permissions/permissions.html:117
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
-#: rhodecode/templates/admin/repos/repos.html:70
-#: rhodecode/templates/admin/users/user_edit.html:196
-#: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:180
-#: rhodecode/templates/admin/users/user_edit_my_account.html:216
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
+#: rhodecode/templates/admin/repos/repos.html:71
+#: rhodecode/templates/admin/users/user_edit.html:200
+#: rhodecode/templates/admin/users/user_edit_my_account.html:60
+#: rhodecode/templates/admin/users/user_edit_my_account.html:211
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:184
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
 #: rhodecode/templates/branches/branches.html:50
 #: rhodecode/templates/branches/branches_data.html:6
 #: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:70
-#: rhodecode/templates/journal/journal.html:196
-#: rhodecode/templates/journal/journal_page_repos.html:7
+#: rhodecode/templates/journal/journal.html:201
+#: rhodecode/templates/journal/journal.html:305
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
 #: rhodecode/templates/summary/summary.html:132
@@ -1443,99 +1510,107 b' msgstr "Grupo de reposit\xc3\xb3rios"'
 msgid "Name"
 msgstr "Nome"
 
-#: rhodecode/templates/index_base.html:73
+#: rhodecode/templates/index_base.html:80
 msgid "Last change"
 msgstr "Última alteração"
 
-#: rhodecode/templates/index_base.html:74
-#: rhodecode/templates/index_base.html:179
-#: rhodecode/templates/admin/users/user_edit_my_account.html:182
-#: rhodecode/templates/journal/journal.html:198
+#: rhodecode/templates/index_base.html:81
+#: rhodecode/templates/index_base.html:183
+#: rhodecode/templates/index_base.html:276
+#: rhodecode/templates/admin/repos/repos.html:74
+#: rhodecode/templates/admin/users/user_edit_my_account.html:213
+#: rhodecode/templates/journal/journal.html:203
+#: rhodecode/templates/journal/journal.html:307
 msgid "Tip"
 msgstr "Ponta"
 
-#: rhodecode/templates/index_base.html:75
-#: rhodecode/templates/index_base.html:181
-#: rhodecode/templates/index_base.html:269
+#: rhodecode/templates/index_base.html:82
+#: rhodecode/templates/index_base.html:185
+#: rhodecode/templates/index_base.html:278
 #: rhodecode/templates/admin/repos/repo_edit.html:121
-#: rhodecode/templates/admin/repos/repos.html:73
+#: rhodecode/templates/admin/repos/repos.html:76
 msgid "Owner"
 msgstr "Dono"
 
-#: rhodecode/templates/index_base.html:76
+#: rhodecode/templates/index_base.html:83
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr "RSS"
 
-#: rhodecode/templates/index_base.html:77
+#: rhodecode/templates/index_base.html:84
 msgid "Atom"
 msgstr "Atom"
 
-#: rhodecode/templates/index_base.html:167
-#: rhodecode/templates/index_base.html:207
-#: rhodecode/templates/index_base.html:291
-#: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:202
+#: rhodecode/templates/index_base.html:171
+#: rhodecode/templates/index_base.html:211
+#: rhodecode/templates/index_base.html:300
+#: rhodecode/templates/admin/repos/repos.html:97
+#: rhodecode/templates/admin/users/user_edit_my_account.html:235
 #: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
 #: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:221
+#: rhodecode/templates/journal/journal.html:225
+#: rhodecode/templates/journal/journal.html:329
 #: rhodecode/templates/tags/tags.html:77
 msgid "Click to sort ascending"
 msgstr "Clique para ordenar em ordem crescente"
 
-#: rhodecode/templates/index_base.html:168
-#: rhodecode/templates/index_base.html:208
-#: rhodecode/templates/index_base.html:292
-#: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:203
+#: rhodecode/templates/index_base.html:172
+#: rhodecode/templates/index_base.html:212
+#: rhodecode/templates/index_base.html:301
+#: rhodecode/templates/admin/repos/repos.html:98
+#: rhodecode/templates/admin/users/user_edit_my_account.html:236
 #: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:222
+#: rhodecode/templates/journal/journal.html:226
+#: rhodecode/templates/journal/journal.html:330
 #: rhodecode/templates/tags/tags.html:78
 msgid "Click to sort descending"
 msgstr "Clique para ordenar em ordem descrescente"
 
-#: rhodecode/templates/index_base.html:177
-#: rhodecode/templates/index_base.html:267
+#: rhodecode/templates/index_base.html:181
+#: rhodecode/templates/index_base.html:274
 msgid "Last Change"
 msgstr "Última Alteração"
 
-#: rhodecode/templates/index_base.html:209
-#: rhodecode/templates/index_base.html:293
-#: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:204
+#: rhodecode/templates/index_base.html:213
+#: rhodecode/templates/index_base.html:302
+#: rhodecode/templates/admin/repos/repos.html:99
+#: rhodecode/templates/admin/users/user_edit_my_account.html:237
 #: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
 #: rhodecode/templates/branches/branches.html:78
-#: rhodecode/templates/journal/journal.html:223
+#: rhodecode/templates/journal/journal.html:227
+#: rhodecode/templates/journal/journal.html:331
 #: rhodecode/templates/tags/tags.html:79
 msgid "No records found."
 msgstr "Nenhum registro encontrado."
 
-#: rhodecode/templates/index_base.html:210
-#: rhodecode/templates/index_base.html:294
-#: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:205
+#: rhodecode/templates/index_base.html:214
+#: rhodecode/templates/index_base.html:303
+#: rhodecode/templates/admin/repos/repos.html:100
+#: rhodecode/templates/admin/users/user_edit_my_account.html:238
 #: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:79
-#: rhodecode/templates/journal/journal.html:224
+#: rhodecode/templates/journal/journal.html:228
+#: rhodecode/templates/journal/journal.html:332
 #: rhodecode/templates/tags/tags.html:80
 msgid "Data error."
 msgstr "Erro de dados."
 
-#: rhodecode/templates/index_base.html:211
-#: rhodecode/templates/index_base.html:295
-#: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:206
+#: rhodecode/templates/index_base.html:215
+#: rhodecode/templates/index_base.html:304
+#: rhodecode/templates/admin/repos/repos.html:101
+#: rhodecode/templates/admin/users/user_edit_my_account.html:105
+#: rhodecode/templates/admin/users/user_edit_my_account.html:239
 #: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:80
-#: rhodecode/templates/journal/journal.html:62
-#: rhodecode/templates/journal/journal.html:225
+#: rhodecode/templates/journal/journal.html:229
+#: rhodecode/templates/journal/journal.html:333
 #: rhodecode/templates/tags/tags.html:81
 msgid "Loading..."
 msgstr "Carregando..."
@@ -1551,9 +1626,9 b' msgstr "Entrar em"'
 #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
 #: rhodecode/templates/admin/admin_log.html:5
 #: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:50
+#: rhodecode/templates/admin/users/user_edit.html:54
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
-#: rhodecode/templates/base/base.html:83
+#: rhodecode/templates/base/base.html:89
 #: rhodecode/templates/summary/summary.html:131
 msgid "Username"
 msgstr "Nome de usuário"
@@ -1561,7 +1636,7 b' msgstr "Nome de usu\xc3\xa1rio"'
 #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
 #: rhodecode/templates/admin/ldap/ldap.html:46
 #: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:92
+#: rhodecode/templates/base/base.html:98
 msgid "Password"
 msgstr "Senha"
 
@@ -1573,7 +1648,7 b' msgstr "Lembre-se de mim"'
 msgid "Forgot your password ?"
 msgstr "Esqueceu sua senha ?"
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109
 msgid "Don't have an account ?"
 msgstr "Não possui uma conta ?"
 
@@ -1613,22 +1688,22 b' msgstr "Repita a senha"'
 
 #: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:90
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
+#: rhodecode/templates/admin/users/user_edit.html:94
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57
 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:99
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
+#: rhodecode/templates/admin/users/user_edit.html:103
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66
 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:108
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
+#: rhodecode/templates/admin/users/user_edit.html:112
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75
 #: rhodecode/templates/summary/summary.html:133
 msgid "Email"
 msgstr "E-mail"
@@ -1709,11 +1784,10 b' msgstr[0] ""'
 msgstr[1] ""
 
 #: rhodecode/templates/admin/admin_log.html:6
-#: rhodecode/templates/admin/repos/repos.html:74
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:10
+#: rhodecode/templates/admin/repos/repos.html:77
+#: rhodecode/templates/admin/users/user_edit_my_account.html:215
+#: rhodecode/templates/journal/journal.html:205
+#: rhodecode/templates/journal/journal.html:309
 msgid "Action"
 msgstr "Ação"
 
@@ -1791,7 +1865,7 b' msgstr "Habilitar menu de descarregar na p\xc3\xa1gina de sum\xc3\xa1rio."'
 
 #: rhodecode/templates/admin/defaults/defaults.html:75
 #: rhodecode/templates/admin/repos/repo_edit.html:112
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71
 #, fuzzy
 msgid "Enable locking"
 msgstr "habilitar"
@@ -1803,12 +1877,13 b' msgstr ""'
 
 #: rhodecode/templates/admin/defaults/defaults.html:84
 #: rhodecode/templates/admin/ldap/ldap.html:89
+#: rhodecode/templates/admin/permissions/permissions.html:92
 #: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79
 #: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_edit.html:133
-#: rhodecode/templates/admin/users/user_edit.html:178
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
+#: rhodecode/templates/admin/users/user_edit.html:137
+#: rhodecode/templates/admin/users/user_edit.html:182
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135
 #: rhodecode/templates/settings/repo_settings.html:94
 msgid "Save"
@@ -1901,8 +1976,8 b' msgid "Comments"'
 msgstr "commits"
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:267
-#: rhodecode/templates/base/base.html:269
+#: rhodecode/templates/base/base.html:272
+#: rhodecode/templates/base/base.html:274
 msgid "Pull requests"
 msgstr ""
 
@@ -1929,8 +2004,8 b' msgstr "Administra\xc3\xa7\xc3\xa3o de permiss\xc3\xb5es"'
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:134
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
-#: rhodecode/templates/admin/users/user_edit.html:143
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63
+#: rhodecode/templates/admin/users/user_edit.html:147
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
 #: rhodecode/templates/settings/repo_settings.html:86
 msgid "Permissions"
@@ -1992,19 +2067,113 b' msgstr "Cria\xc3\xa7\xc3\xa3o de reposit\xc3\xb3rio"'
 msgid "Repository forking"
 msgstr "Criação de repositório"
 
-#: rhodecode/templates/admin/permissions/permissions.html:92
-#: rhodecode/templates/admin/repos/repo_edit.html:264
-msgid "set"
-msgstr "ajustar"
-
-#: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
-msgid "Add repository"
-msgstr "Adicionar repositório"
+#: rhodecode/templates/admin/permissions/permissions.html:93
+#: rhodecode/templates/admin/permissions/permissions.html:209
+#: rhodecode/templates/admin/repos/repo_edit.html:142
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80
+#: rhodecode/templates/admin/settings/settings.html:113
+#: rhodecode/templates/admin/settings/settings.html:179
+#: rhodecode/templates/admin/settings/settings.html:269
+#: rhodecode/templates/admin/users/user_edit.html:138
+#: rhodecode/templates/admin/users/user_edit.html:183
+#: rhodecode/templates/admin/users/user_edit.html:286
+#: rhodecode/templates/admin/users/user_edit.html:334
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
+#: rhodecode/templates/files/files_add.html:82
+#: rhodecode/templates/files/files_edit.html:68
+#: rhodecode/templates/pullrequests/pullrequest.html:124
+#: rhodecode/templates/settings/repo_settings.html:95
+msgid "Reset"
+msgstr "Limpar"
+
+#: rhodecode/templates/admin/permissions/permissions.html:103
+#, fuzzy
+msgid "Default User Permissions"
+msgstr "Permissões padrão"
+
+#: rhodecode/templates/admin/permissions/permissions.html:111
+#: rhodecode/templates/admin/users/user_edit.html:194
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
+#, fuzzy
+msgid "Nothing here yet"
+msgstr "Ainda não há notificações aqui"
+
+#: rhodecode/templates/admin/permissions/permissions.html:118
+#: rhodecode/templates/admin/users/user_edit.html:201
+#: rhodecode/templates/admin/users/user_edit_my_account.html:61
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
+msgid "Permission"
+msgstr "Permissão"
+
+#: rhodecode/templates/admin/permissions/permissions.html:119
+#: rhodecode/templates/admin/users/user_edit.html:202
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
+#, fuzzy
+msgid "Edit Permission"
+msgstr "Permissão de repositório"
+
+#: rhodecode/templates/admin/permissions/permissions.html:149
+#: rhodecode/templates/admin/permissions/permissions.html:151
+#: rhodecode/templates/admin/repos/repo_edit.html:13
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/users/user_edit.html:13
+#: rhodecode/templates/admin/users/user_edit.html:232
+#: rhodecode/templates/admin/users/user_edit.html:234
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
+#: rhodecode/templates/data_table/_dt_elements.html:116
+#: rhodecode/templates/data_table/_dt_elements.html:117
+msgid "edit"
+msgstr "editar"
+
+#: rhodecode/templates/admin/permissions/permissions.html:168
+#: rhodecode/templates/admin/users/user_edit.html:295
+#, fuzzy
+msgid "Allowed IP addresses"
+msgstr "Endereço de e-mail"
+
+#: rhodecode/templates/admin/permissions/permissions.html:182
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
+#: rhodecode/templates/admin/users/user_edit.html:263
+#: rhodecode/templates/admin/users/user_edit.html:308
+#: rhodecode/templates/admin/users_groups/users_groups.html:44
+#: rhodecode/templates/data_table/_dt_elements.html:122
+#: rhodecode/templates/data_table/_dt_elements.html:130
+msgid "delete"
+msgstr "excluir"
+
+#: rhodecode/templates/admin/permissions/permissions.html:183
+#: rhodecode/templates/admin/users/user_edit.html:309
+#, fuzzy, python-format
+msgid "Confirm to delete this ip: %s"
+msgstr "Confirma excluir este usuário: %s"
+
+#: rhodecode/templates/admin/permissions/permissions.html:189
+#: rhodecode/templates/admin/users/user_edit.html:315
+msgid "All IP addresses are allowed"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:200
+#: rhodecode/templates/admin/users/user_edit.html:326
+#, fuzzy
+msgid "New ip address"
+msgstr "Endereço de e-mail"
+
+#: rhodecode/templates/admin/permissions/permissions.html:208
+#: rhodecode/templates/admin/users/user_edit.html:285
+#: rhodecode/templates/admin/users/user_edit.html:333
+#, fuzzy
+msgid "Add"
+msgstr "adicionar"
 
 #: rhodecode/templates/admin/repos/repo_add.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:11
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
+#: rhodecode/templates/base/base.html:154
 msgid "Repositories"
 msgstr "Repositórios"
 
@@ -2070,19 +2239,6 b' msgstr "adicionar novo reposit\xc3\xb3rio"'
 msgid "Edit repository"
 msgstr "Editar repositório"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:228
-#: rhodecode/templates/admin/users/user_edit.html:230
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
-#: rhodecode/templates/files/files_source.html:29
-#: rhodecode/templates/journal/journal_page_repos.html:29
-msgid "edit"
-msgstr "editar"
-
 #: rhodecode/templates/admin/repos/repo_edit.html:40
 #: rhodecode/templates/settings/repo_settings.html:39
 msgid "Clone uri"
@@ -2097,23 +2253,6 b' msgstr "Opcionalmente selecione um grupo no qual colocar esse reposit\xc3\xb3rio."'
 msgid "Change owner of this repository."
 msgstr "Mudar o dono desse repositório."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
-#: rhodecode/templates/admin/settings/settings.html:113
-#: rhodecode/templates/admin/settings/settings.html:179
-#: rhodecode/templates/admin/settings/settings.html:269
-#: rhodecode/templates/admin/users/user_edit.html:134
-#: rhodecode/templates/admin/users/user_edit.html:179
-#: rhodecode/templates/admin/users/user_edit.html:282
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/files/files_add.html:82
-#: rhodecode/templates/files/files_edit.html:68
-#: rhodecode/templates/pullrequests/pullrequest.html:124
-#: rhodecode/templates/settings/repo_settings.html:95
-msgid "Reset"
-msgstr "Limpar"
-
 #: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr "Administração"
@@ -2183,16 +2322,16 b' msgstr "Chave de API"'
 
 #: rhodecode/templates/admin/repos/repo_edit.html:203
 #: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:117
+#: rhodecode/templates/admin/users/user_edit.html:121
 #: rhodecode/templates/admin/users_groups/users_group_add.html:41
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42
 msgid "Active"
 msgstr "Ativo"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:218
-#: rhodecode/templates/base/base.html:331
-#: rhodecode/templates/base/base.html:333
-#: rhodecode/templates/base/base.html:335
+#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/base/base.html:308
+#: rhodecode/templates/base/base.html:310
 msgid "Public journal"
 msgstr "Diário público"
 
@@ -2249,13 +2388,17 b' msgstr ""'
 msgid "Set as fork of"
 msgstr "Marcar como bifurcação"
 
+#: rhodecode/templates/admin/repos/repo_edit.html:264
+msgid "set"
+msgstr "ajustar"
+
 #: rhodecode/templates/admin/repos/repo_edit.html:268
 #, fuzzy
 msgid "Manually set this repository as a fork of another from the list"
 msgstr "Marcar manualmente este repositório como sendo uma bifurcação de outro"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:274
-#: rhodecode/templates/changeset/changeset_file_comment.html:26
+#: rhodecode/templates/changeset/changeset_file_comment.html:41
 msgid "Delete"
 msgstr "Excluir"
 
@@ -2300,7 +2443,7 b' 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/users.html:85
-#: rhodecode/templates/base/base.html:229
+#: rhodecode/templates/base/base.html:235
 msgid "admin"
 msgstr "administrador"
 
@@ -2310,8 +2453,7 b' msgid "member"'
 msgstr "membro"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-#: rhodecode/templates/data_table/_dt_elements.html:67
-#: rhodecode/templates/journal/journal.html:95
+#: rhodecode/templates/data_table/_dt_elements.html:61
 #: rhodecode/templates/summary/summary.html:85
 msgid "private repository"
 msgstr "repositório privado"
@@ -2355,15 +2497,12 b' msgstr ""'
 
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74
 msgid ""
-"Set or revoke permission to all children of that group, including "
-"repositories and other groups"
+"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:9
-#: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:313
-#: rhodecode/templates/base/base.html:315
-#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:128
 #: rhodecode/templates/bookmarks/bookmarks.html:11
 #: rhodecode/templates/branches/branches.html:10
 #: rhodecode/templates/changelog/changelog.html:10
@@ -2404,7 +2543,7 b' msgid "add new repos group"'
 msgstr "adicionar novo grupo de repositórios"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55
 msgid "Group parent"
 msgstr "Progenitor do grupo"
 
@@ -2412,7 +2551,7 b' msgstr "Progenitor do grupo"'
 #: rhodecode/templates/admin/users/user_add.html:94
 #: rhodecode/templates/admin/users_groups/users_group_add.html:49
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "save"
 msgstr "salvar"
 
@@ -2424,7 +2563,12 b' msgstr "Editar grupo de reposit\xc3\xb3rios"'
 msgid "edit repos group"
 msgstr "editar grupo de repositórios"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26
+#, fuzzy
+msgid "Add new child group"
+msgstr "Adicionar novo grupo de usuários"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
 msgid ""
 "Enable lock-by-pulling on group. This option will be applied to all other"
 " groups and repositories inside"
@@ -2435,8 +2579,9 b' msgid "Repositories groups administratio'
 msgstr "Administração de grupos de repositórios"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
-msgid "ADD NEW GROUP"
-msgstr "ADICIONAR NOVO GRUPO"
+#, fuzzy
+msgid "Add new group"
+msgstr "Adicionar novo grupo de usuários"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
 msgid "Number of toplevel repositories"
@@ -2448,22 +2593,14 b' msgstr "N\xc3\xbamero de reposit\xc3\xb3rios de n\xc3\xadvel superior"'
 msgid "action"
 msgstr "ação"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
-#: rhodecode/templates/admin/users/user_edit.html:259
-#: rhodecode/templates/admin/users_groups/users_groups.html:44
-#: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/data_table/_dt_elements.html:121
-msgid "delete"
-msgstr "excluir"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
 #, fuzzy, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
 msgstr[0] "Confirma excluir este repositório"
 msgstr[1] ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68
 msgid "There are no repositories groups yet"
 msgstr "Ainda não há grupos de repositórios"
 
@@ -2679,7 +2816,7 b' msgstr ""'
 "que essa configuração tenha efeito. Clique este rótulo para destravar."
 
 #: rhodecode/templates/admin/settings/settings.html:262
-#: rhodecode/templates/base/base.html:221
+#: rhodecode/templates/base/base.html:227
 msgid "unlock"
 msgstr "destravar"
 
@@ -2745,27 +2882,31 b' msgstr "Usando"'
 msgid "API key"
 msgstr "Chave de API"
 
-#: rhodecode/templates/admin/users/user_edit.html:63
+#: rhodecode/templates/admin/users/user_edit.html:48
+msgid "Your IP"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:67
 msgid "LDAP DN"
 msgstr "DN LDAP"
 
-#: rhodecode/templates/admin/users/user_edit.html:72
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:35
+#: rhodecode/templates/admin/users/user_edit.html:76
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39
 msgid "New password"
 msgstr "Nova senha"
 
-#: rhodecode/templates/admin/users/user_edit.html:81
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
+#: rhodecode/templates/admin/users/user_edit.html:85
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48
 msgid "New password confirmation"
 msgstr "Confirmação de nova senha"
 
-#: rhodecode/templates/admin/users/user_edit.html:151
+#: rhodecode/templates/admin/users/user_edit.html:155
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
 #, fuzzy
 msgid "Inherit default permissions"
 msgstr "Permissões padrão"
 
-#: rhodecode/templates/admin/users/user_edit.html:156
+#: rhodecode/templates/admin/users/user_edit.html:160
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113
 #, python-format
 msgid ""
@@ -2773,59 +2914,34 b' msgid ""'
 "options does not have any action"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:162
+#: rhodecode/templates/admin/users/user_edit.html:166
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr "Criar repositórios"
 
-#: rhodecode/templates/admin/users/user_edit.html:170
+#: rhodecode/templates/admin/users/user_edit.html:174
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127
 #, fuzzy
 msgid "Fork repositories"
 msgstr "repositórios"
 
-#: rhodecode/templates/admin/users/user_edit.html:190
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
-#, fuzzy
-msgid "Nothing here yet"
-msgstr "Ainda não há notificações aqui"
-
-#: rhodecode/templates/admin/users/user_edit.html:197
-#: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:217
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
-msgid "Permission"
-msgstr "Permissão"
-
-#: rhodecode/templates/admin/users/user_edit.html:198
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
-#, fuzzy
-msgid "Edit Permission"
-msgstr "Permissão de repositório"
-
-#: rhodecode/templates/admin/users/user_edit.html:247
+#: rhodecode/templates/admin/users/user_edit.html:251
 #, fuzzy
 msgid "Email addresses"
 msgstr "Endereço de e-mail"
 
-#: rhodecode/templates/admin/users/user_edit.html:260
+#: rhodecode/templates/admin/users/user_edit.html:264
 #, fuzzy, python-format
 msgid "Confirm to delete this email: %s"
 msgstr "Confirma excluir este usuário: %s"
 
-#: rhodecode/templates/admin/users/user_edit.html:274
+#: rhodecode/templates/admin/users/user_edit.html:278
 #, fuzzy
 msgid "New email address"
 msgstr "Endereço de e-mail"
 
-#: rhodecode/templates/admin/users/user_edit.html:281
-#, fuzzy
-msgid "Add"
-msgstr "adicionar"
-
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:124
+#: rhodecode/templates/base/base.html:130
 msgid "My account"
 msgstr "Minha conta"
 
@@ -2838,7 +2954,7 b' msgid "My permissions"'
 msgstr "Minhas permissões"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:57
 msgid "My repos"
 msgstr "Meus repositórios"
 
@@ -2848,6 +2964,7 b' msgid "My pull requests"'
 msgstr "comentado no commit"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:45
+#: rhodecode/templates/journal/journal.html:61
 #, fuzzy
 msgid "Add repo"
 msgstr "adicionar novo"
@@ -2876,51 +2993,19 b' msgstr ""'
 msgid "Pull request #%s opened by %s on %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7
-#: rhodecode/templates/bookmarks/bookmarks.html:40
-#: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:54
-#: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:8
-#: rhodecode/templates/tags/tags.html:55
-#: rhodecode/templates/tags/tags_data.html:9
-msgid "Revision"
-msgstr "Revisão"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/journal/journal_page_repos.html:29
-msgid "private"
-msgstr "privado"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31
-#: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/journal/journal_page_repos.html:32
-#, python-format
-msgid "Confirm to delete this repository: %s"
-msgstr "Confirma excluir esse repositório: %s"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38
-#: rhodecode/templates/journal/journal_page_repos.html:42
-msgid "No repositories yet"
-msgstr "Ainda não há repositórios"
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40
-#: rhodecode/templates/journal/journal_page_repos.html:44
-msgid "create one now"
-msgstr "criar um agora"
-
 #: 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/base/base.html:235
+#: rhodecode/templates/base/base.html:241
 msgid "users"
 msgstr "usuários"
 
 #: rhodecode/templates/admin/users/users.html:23
-msgid "ADD NEW USER"
-msgstr "ADICIONAR NOVO USUÁRIO"
+#, fuzzy
+msgid "Add new user"
+msgstr "adicionar novo usuário"
 
 #: rhodecode/templates/admin/users/users.html:77
 msgid "username"
@@ -2945,7 +3030,7 b' msgid "active"'
 msgstr "ativo"
 
 #: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:238
+#: rhodecode/templates/base/base.html:244
 msgid "ldap"
 msgstr "ldap"
 
@@ -3014,8 +3099,9 b' msgid "Users groups administration"'
 msgstr "Administração de grupos de usuários"
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:23
-msgid "ADD NEW USER GROUP"
-msgstr "ADICIONAR NOVO GRUPO DE USUÁRIOS"
+#, fuzzy
+msgid "Add new user group"
+msgstr "Adicionar novo grupo de usuários"
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:32
 msgid "group name"
@@ -3035,153 +3121,158 b' msgstr "Confirme para excluir este grupo de usu\xc3\xa1rios: %s"'
 msgid "Submit a bug"
 msgstr "Encaminhe um bug"
 
-#: rhodecode/templates/base/base.html:77
+#: rhodecode/templates/base/base.html:76
+#, fuzzy
+msgid "Not logged in"
+msgstr "último login"
+
+#: rhodecode/templates/base/base.html:83
 msgid "Login to your account"
 msgstr "Entrar com sua conta"
 
-#: rhodecode/templates/base/base.html:100
+#: rhodecode/templates/base/base.html:106
 msgid "Forgot password ?"
 msgstr "Esqueceu a senha ?"
 
-#: rhodecode/templates/base/base.html:107
+#: rhodecode/templates/base/base.html:113
 msgid "Log In"
 msgstr "Entrar"
 
-#: rhodecode/templates/base/base.html:118
+#: rhodecode/templates/base/base.html:124
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:322
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:326
+#: rhodecode/templates/base/base.html:129
+#: rhodecode/templates/base/base.html:297
+#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:301
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/public_journal.html:4
 msgid "Journal"
 msgstr "Diário"
 
-#: rhodecode/templates/base/base.html:125
+#: rhodecode/templates/base/base.html:131
 msgid "Log Out"
 msgstr "Sair"
 
-#: rhodecode/templates/base/base.html:144
+#: rhodecode/templates/base/base.html:150
 msgid "Switch repository"
 msgstr "Trocar repositório"
 
-#: rhodecode/templates/base/base.html:146
-msgid "Products"
-msgstr "Produtos"
-
 #: rhodecode/templates/base/base.html:152
-#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47
-msgid "loading..."
-msgstr "carregando..."
+msgid "Products"
+msgstr "Produtos"
 
 #: rhodecode/templates/base/base.html:158
-#: rhodecode/templates/base/base.html:160
-#: rhodecode/templates/base/base.html:162
-#: rhodecode/templates/data_table/_dt_elements.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:17
-#: rhodecode/templates/data_table/_dt_elements.html:19
-msgid "Summary"
-msgstr "Sumário"
+#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47
+msgid "loading..."
+msgstr "carregando..."
 
 #: rhodecode/templates/base/base.html:166
 #: rhodecode/templates/base/base.html:168
 #: rhodecode/templates/base/base.html:170
+#: rhodecode/templates/data_table/_dt_elements.html:9
+#: rhodecode/templates/data_table/_dt_elements.html:11
+#: rhodecode/templates/data_table/_dt_elements.html:13
+msgid "Summary"
+msgstr "Sumário"
+
+#: rhodecode/templates/base/base.html:174
+#: rhodecode/templates/base/base.html:176
+#: rhodecode/templates/base/base.html:178
 #: rhodecode/templates/changelog/changelog.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:23
-#: rhodecode/templates/data_table/_dt_elements.html:25
-#: rhodecode/templates/data_table/_dt_elements.html:27
+#: 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 "Registro de alterações"
 
-#: rhodecode/templates/base/base.html:175
-#: rhodecode/templates/base/base.html:177
-#: rhodecode/templates/base/base.html:179
+#: rhodecode/templates/base/base.html:182
+#: rhodecode/templates/base/base.html:184
+#: rhodecode/templates/base/base.html:186
 msgid "Switch to"
 msgstr "Trocar para"
 
-#: rhodecode/templates/base/base.html:186
-#: rhodecode/templates/base/base.html:188
-#: rhodecode/templates/base/base.html:190
-#: rhodecode/templates/data_table/_dt_elements.html:31
-#: rhodecode/templates/data_table/_dt_elements.html:33
-#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/base/base.html:193
+#: rhodecode/templates/base/base.html:195
+#: rhodecode/templates/base/base.html:197
+#: rhodecode/templates/data_table/_dt_elements.html:25
+#: rhodecode/templates/data_table/_dt_elements.html:27
+#: rhodecode/templates/data_table/_dt_elements.html:29
 msgid "Files"
 msgstr "Arquivos"
 
-#: rhodecode/templates/base/base.html:195
-#: rhodecode/templates/base/base.html:199
+#: rhodecode/templates/base/base.html:201
+#: rhodecode/templates/base/base.html:205
 msgid "Options"
 msgstr "Opções"
 
-#: rhodecode/templates/base/base.html:204
-#: rhodecode/templates/base/base.html:206
+#: rhodecode/templates/base/base.html:210
+#: rhodecode/templates/base/base.html:212
 #, fuzzy
 msgid "repository settings"
 msgstr "Criação de repositório"
 
-#: rhodecode/templates/base/base.html:210
-#: rhodecode/templates/data_table/_dt_elements.html:80
+#: rhodecode/templates/base/base.html:216
+#: rhodecode/templates/data_table/_dt_elements.html:74
 #: rhodecode/templates/forks/fork.html:13
 msgid "fork"
 msgstr "bifurcação"
 
-#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50
+#: rhodecode/templates/base/base.html:218
 #: rhodecode/templates/changelog/changelog.html:43
-msgid "Open new pull request"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:215
-#: rhodecode/templates/forks/forks_data.html:21
 #, fuzzy
-msgid "Compare fork"
+msgid "open new pull request"
+msgstr "Criar novo arquivo"
+
+#: rhodecode/templates/base/base.html:221
+#, fuzzy
+msgid "compare fork"
 msgstr "comparar exibir"
 
-#: rhodecode/templates/base/base.html:217
+#: rhodecode/templates/base/base.html:223
 msgid "search"
 msgstr "pesquisar"
 
-#: rhodecode/templates/base/base.html:223
+#: rhodecode/templates/base/base.html:229
 #, fuzzy
 msgid "lock"
 msgstr "destravar"
 
-#: rhodecode/templates/base/base.html:234
+#: rhodecode/templates/base/base.html:240
 msgid "repositories groups"
 msgstr "grupos de repositórios"
 
-#: rhodecode/templates/base/base.html:236
+#: rhodecode/templates/base/base.html:242
 msgid "users groups"
 msgstr "grupos de usuários"
 
-#: rhodecode/templates/base/base.html:237
+#: rhodecode/templates/base/base.html:243
 msgid "permissions"
 msgstr "permissões"
 
-#: rhodecode/templates/base/base.html:239
+#: rhodecode/templates/base/base.html:245
 #, fuzzy
 msgid "defaults"
 msgstr "excluir"
 
-#: rhodecode/templates/base/base.html:240
+#: rhodecode/templates/base/base.html:246
 msgid "settings"
 msgstr "configurações"
 
-#: rhodecode/templates/base/base.html:251
-#: rhodecode/templates/base/base.html:253
+#: rhodecode/templates/base/base.html:256
+#: rhodecode/templates/base/base.html:258
 msgid "Followers"
 msgstr "Seguidores"
 
-#: rhodecode/templates/base/base.html:259
-#: rhodecode/templates/base/base.html:261
+#: rhodecode/templates/base/base.html:264
+#: rhodecode/templates/base/base.html:266
 msgid "Forks"
 msgstr "Bifurcações"
 
-#: rhodecode/templates/base/base.html:340
-#: rhodecode/templates/base/base.html:342
-#: rhodecode/templates/base/base.html:344
+#: rhodecode/templates/base/base.html:315
+#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:319
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "Pesquisar"
@@ -3191,7 +3282,7 b' msgid "add another comment"'
 msgstr "adicionar outro comentário"
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:83
+#: rhodecode/templates/data_table/_dt_elements.html:140
 #: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr "Parar de seguir este repositório"
@@ -3213,6 +3304,10 b' msgstr "pesquisa truncada"'
 msgid "no matching files"
 msgstr "nenhum arquivo corresponde"
 
+#: rhodecode/templates/base/root.html:50
+msgid "Open new pull request"
+msgstr ""
+
 #: rhodecode/templates/base/root.html:51
 msgid "Open new pull request for selected changesets"
 msgstr ""
@@ -3239,6 +3334,15 b' msgstr "marcadores"'
 msgid "Author"
 msgstr "Autor"
 
+#: rhodecode/templates/bookmarks/bookmarks.html:40
+#: rhodecode/templates/bookmarks/bookmarks_data.html:9
+#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/tags/tags_data.html:9
+msgid "Revision"
+msgstr "Revisão"
+
 #: rhodecode/templates/branches/branches.html:5
 #, fuzzy, python-format
 msgid "%s Branches"
@@ -3310,8 +3414,9 b' msgstr "Conjuntos de mudan\xc3\xa7as"'
 
 #: rhodecode/templates/changelog/changelog.html:94
 #: rhodecode/templates/shortlog/shortlog_data.html:20
-msgid "Click to open associated pull request"
-msgstr ""
+#, fuzzy, python-format
+msgid "Click to open associated pull request #%s"
+msgstr "repositório [criado]"
 
 #: rhodecode/templates/changelog/changelog.html:104
 msgid "Parent"
@@ -3349,7 +3454,7 b' msgstr "marcador"'
 msgid "tag"
 msgstr "etiqueta"
 
-#: rhodecode/templates/changelog/changelog.html:301
+#: rhodecode/templates/changelog/changelog.html:302
 msgid "There are no changes yet"
 msgstr "Ainda não há alteações"
 
@@ -3407,7 +3512,7 b' msgid "download diff"'
 msgstr "descarregar diff"
 
 #: rhodecode/templates/changeset/changeset.html:76
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -3415,7 +3520,7 b' msgstr[0] "%d coment\xc3\xa1rio"'
 msgstr[1] "%d comentários"
 
 #: rhodecode/templates/changeset/changeset.html:76
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
@@ -3424,7 +3529,7 b' msgstr[1] "(%d em linha)"'
 
 #: rhodecode/templates/changeset/changeset.html:122
 #: rhodecode/templates/compare/compare_diff.html:44
-#: rhodecode/templates/pullrequests/pullrequest_show.html:76
+#: rhodecode/templates/pullrequests/pullrequest_show.html:94
 #, fuzzy, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
@@ -3433,66 +3538,76 b' msgstr[1] ""'
 
 #: rhodecode/templates/changeset/changeset.html:124
 #: rhodecode/templates/compare/compare_diff.html:46
-#: rhodecode/templates/pullrequests/pullrequest_show.html:78
+#: rhodecode/templates/pullrequests/pullrequest_show.html:96
 #, fuzzy, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
 msgstr[0] "%s arquivos afetados com %s inserções e %s exclusões"
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:42
+#: rhodecode/templates/changeset/changeset_file_comment.html:30
+#, fuzzy, python-format
+msgid "Status from pull request %s"
+msgstr "Criar novo arquivo"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:32
+#, fuzzy, python-format
+msgid "Comment from pull request %s"
+msgstr "repositório [criado]"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:57
 msgid "Submitting..."
 msgstr "Enviando..."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:45
+#: rhodecode/templates/changeset/changeset_file_comment.html:60
 msgid "Commenting on line {1}."
 msgstr "Comentando a linha {1}."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:46
-#: rhodecode/templates/changeset/changeset_file_comment.html:121
+#: rhodecode/templates/changeset/changeset_file_comment.html:61
+#: rhodecode/templates/changeset/changeset_file_comment.html:140
 #, 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:48
-#: rhodecode/templates/changeset/changeset_file_comment.html:123
+#: rhodecode/templates/changeset/changeset_file_comment.html:63
+#: rhodecode/templates/changeset/changeset_file_comment.html:142
 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:59
-#: rhodecode/templates/changeset/changeset_file_comment.html:143
+#: rhodecode/templates/changeset/changeset_file_comment.html:74
+#: rhodecode/templates/changeset/changeset_file_comment.html:162
 msgid "Comment"
 msgstr "Comentário"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:60
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
+#: rhodecode/templates/changeset/changeset_file_comment.html:75
+#: rhodecode/templates/changeset/changeset_file_comment.html:86
 msgid "Hide"
 msgstr "Ocultar"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 msgid "You need to be logged in to comment."
 msgstr "Você precisa estar logado para comentar."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 msgid "Login now"
 msgstr "Entrar agora"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:118
+#: rhodecode/templates/changeset/changeset_file_comment.html:137
 msgid "Leave a comment"
 msgstr "Deixar um comentário"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:125
+#: rhodecode/templates/changeset/changeset_file_comment.html:144
 msgid "Check this to change current status of code-review for this changeset"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:125
+#: rhodecode/templates/changeset/changeset_file_comment.html:144
 #, fuzzy
 msgid "change status"
 msgstr "Conjuntos de mudanças"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:145
+#: rhodecode/templates/changeset/changeset_file_comment.html:164
 msgid "Comment and close"
 msgstr ""
 
@@ -3529,7 +3644,7 b' msgid "No changesets"'
 msgstr "Nenhum conjunto de alterações ainda."
 
 #: rhodecode/templates/compare/compare_diff.html:37
-#: rhodecode/templates/pullrequests/pullrequest_show.html:69
+#: rhodecode/templates/pullrequests/pullrequest_show.html:87
 #, fuzzy, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
@@ -3537,59 +3652,61 b' msgstr[0] "mostrar coment\xc3\xa1rios em linha"'
 msgstr[1] ""
 
 #: rhodecode/templates/compare/compare_diff.html:52
-#: rhodecode/templates/pullrequests/pullrequest_show.html:84
+#: rhodecode/templates/pullrequests/pullrequest_show.html:102
 #, fuzzy
 msgid "No files"
 msgstr "arquivos"
 
-#: rhodecode/templates/data_table/_dt_elements.html:39
-#: rhodecode/templates/data_table/_dt_elements.html:41
-#: rhodecode/templates/data_table/_dt_elements.html:43
+#: rhodecode/templates/data_table/_dt_elements.html:33
+#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/data_table/_dt_elements.html:37
 msgid "Fork"
 msgstr "Bifurcação"
 
-#: rhodecode/templates/data_table/_dt_elements.html:60
-#: rhodecode/templates/journal/journal.html:89
+#: rhodecode/templates/data_table/_dt_elements.html:54
 #: rhodecode/templates/summary/summary.html:77
 msgid "Mercurial repository"
 msgstr "Repositório Mercurial"
 
-#: rhodecode/templates/data_table/_dt_elements.html:62
-#: rhodecode/templates/journal/journal.html:91
+#: rhodecode/templates/data_table/_dt_elements.html:56
 #: rhodecode/templates/summary/summary.html:80
 msgid "Git repository"
 msgstr "Repositório Git"
 
-#: rhodecode/templates/data_table/_dt_elements.html:69
-#: rhodecode/templates/journal/journal.html:97
+#: rhodecode/templates/data_table/_dt_elements.html:63
 #: rhodecode/templates/summary/summary.html:87
 msgid "public repository"
 msgstr "repositório público"
 
-#: rhodecode/templates/data_table/_dt_elements.html:80
+#: rhodecode/templates/data_table/_dt_elements.html:74
 #: rhodecode/templates/summary/summary.html:96
 #: rhodecode/templates/summary/summary.html:97
 msgid "Fork of"
 msgstr "Bifurcação de"
 
-#: rhodecode/templates/data_table/_dt_elements.html:94
+#: rhodecode/templates/data_table/_dt_elements.html:88
 msgid "No changesets yet"
 msgstr "Nenhum conjunto de alterações ainda."
 
-#: rhodecode/templates/data_table/_dt_elements.html:101
-#: rhodecode/templates/data_table/_dt_elements.html:103
+#: 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 "Assinar o feed rss de %s"
 
-#: rhodecode/templates/data_table/_dt_elements.html:109
-#: rhodecode/templates/data_table/_dt_elements.html:111
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:105
 #, 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:131
+#, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "Confirma excluir este usuário: %s"
 
@@ -3637,15 +3754,15 b' msgstr "escrever"'
 msgid "description"
 msgstr "Descrição"
 
-#: rhodecode/templates/email_templates/pull_request.html:11
-msgid "revisions for reviewing"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request.html:18
+#: rhodecode/templates/email_templates/pull_request.html:7
 #, fuzzy
 msgid "View this pull request here"
 msgstr "Confirma excluir este repositório"
 
+#: rhodecode/templates/email_templates/pull_request.html:12
+msgid "revisions for reviewing"
+msgstr ""
+
 #: rhodecode/templates/email_templates/pull_request_comment.html:4
 #, fuzzy, python-format
 msgid "User %s commented on pull request #%s for repository %s"
@@ -3807,7 +3924,7 b' msgstr "mostrar anota\xc3\xa7\xc3\xa3o"'
 
 #: rhodecode/templates/files/files_edit.html:50
 #: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:53
+#: rhodecode/templates/files/files_source.html:55
 msgid "show as raw"
 msgstr "mostrar como bruto"
 
@@ -3859,12 +3976,25 b' msgstr "Carregando lista de arquivos..."'
 msgid "show source"
 msgstr "mostrar fonte"
 
-#: rhodecode/templates/files/files_source.html:44
+#: rhodecode/templates/files/files_source.html:29
+#, fuzzy, python-format
+msgid "edit on branch:%s"
+msgstr "excluído o repositório %s"
+
+#: rhodecode/templates/files/files_source.html:31
+msgid "edit on branch:?"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:31
+msgid "Editing files allowed only when on branch head revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:46
 #, python-format
 msgid "Binary file (%s)"
 msgstr "Arquivo binário (%s)"
 
-#: rhodecode/templates/files/files_source.html:53
+#: rhodecode/templates/files/files_source.html:55
 msgid "File is too big to display"
 msgstr "Arquivo é grande demais para exibir"
 
@@ -3940,6 +4070,11 b' msgstr "bifurca\xc3\xa7\xc3\xb5es"'
 msgid "forked"
 msgstr "bifurcado"
 
+#: rhodecode/templates/forks/forks_data.html:21
+#, fuzzy
+msgid "Compare fork"
+msgstr "comparar exibir"
+
 #: rhodecode/templates/forks/forks_data.html:42
 msgid "There are no forks yet"
 msgstr "Ainda não há bifurcações"
@@ -3970,26 +4105,10 b' msgstr "%s - feed %s"'
 msgid "ATOM feed"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:54
 msgid "Watched"
 msgstr "Seguindo"
 
-#: rhodecode/templates/journal/journal.html:54
-msgid "ADD"
-msgstr "ADICIONAR"
-
-#: rhodecode/templates/journal/journal.html:77
-msgid "following user"
-msgstr "seguindo usuário"
-
-#: rhodecode/templates/journal/journal.html:77
-msgid "user"
-msgstr "usuário"
-
-#: rhodecode/templates/journal/journal.html:110
-msgid "You are not following any users or repositories"
-msgstr "Você não está seguindo quaisquer usuários ou repositórios"
-
 #: rhodecode/templates/journal/journal_data.html:55
 msgid "No entries yet"
 msgstr "Ainda não há entradas"
@@ -4023,18 +4142,18 b' msgid "Detailed compare view"'
 msgstr "comparar exibir"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:100
+#: rhodecode/templates/pullrequests/pullrequest_show.html:118
 msgid "Pull request reviewers"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:130
 #, fuzzy
 msgid "owner"
 msgstr "Dono"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:127
+#: rhodecode/templates/pullrequests/pullrequest_show.html:145
 msgid "Add reviewer to this pull request."
 msgstr ""
 
@@ -4088,17 +4207,22 b' msgstr[1] ""'
 msgid "pull request was reviewed by all reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:58
+#: rhodecode/templates/pullrequests/pullrequest_show.html:56
+#, fuzzy
+msgid "Origin repository"
+msgstr "Repositório Git"
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:76
 #, fuzzy
 msgid "Created on"
 msgstr "criar um agora"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:83
 #, fuzzy
 msgid "Compare view"
 msgstr "comparar exibir"
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:130
 #, fuzzy
 msgid "reviewer"
 msgstr ""
@@ -4384,31 +4508,3 b' msgstr "%s atr\xc3\xa1s"'
 msgid "Compare tags"
 msgstr "comparar exibir"
 
-#~ msgid ""
-#~ "%s repository is not mapped to db"
-#~ " perhaps it was created or renamed"
-#~ " from the file system please run "
-#~ "the application again in order to "
-#~ "rescan repositories"
-#~ msgstr ""
-#~ "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"
-
-#~ msgid ""
-#~ "%s repository is not mapped to db"
-#~ " perhaps it was moved or renamed  "
-#~ "from the filesystem please run the "
-#~ "application again in order to rescan "
-#~ "repositories"
-#~ msgstr ""
-#~ "repositório %s não está mapeado ao "
-#~ "bd. Talvez ele tenha sido movido "
-#~ "ou renomeado a partir do sistema "
-#~ "de arquivos. Por favor execute a "
-#~ "aplicação outra vez para varrer "
-#~ "novamente por repositórios"
-