diff --git a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po
@@ -7,7 +7,7 @@ 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 <vincent@duvert.net>\n"
 "Language-Team: fr <LL@li.org>\n"
@@ -34,15 +34,16 @@ 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 @@ 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 @@ 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 @@ 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 @@ msgstr "Une erreur est survenue durant l’envoi de la requête 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 @@ 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 @@ msgstr "Impossible d’activer LDAP. La bibliothèque « python-ldap » 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 @@ msgstr "Écrire"
 #: 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 @@ msgstr "Une erreur est survenue durant la création de l’utilisateur %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 @@ msgstr "La permission de fork de dépôts a été accordée au groupe d’utilisateur."
 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 @@ msgstr "[suit maintenant] le dépôt"
 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 @@ msgstr "à l’instant"
 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 @@ msgstr "a ouvert une nouvelle requête 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ msgstr "Groupe de dépôts"
 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 @@ msgstr "Connexion à"
 #: 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 @@ msgstr "Nom d’utilisateur"
 #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
 #: rhodecode/templates/admin/ldap/ldap.html:46
 #: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:92
+#: rhodecode/templates/base/base.html:98
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -1543,7 +1619,7 @@ 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 @@ 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 @@ 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 @@ msgstr "Afficher le menu de téléchargements sur la page du dépôt."
 
 #: rhodecode/templates/admin/defaults/defaults.html:75
 #: rhodecode/templates/admin/repos/repo_edit.html: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 @@ msgstr "Activer le verrouillage lors d’un pull sur le dépôt."
 
 #: rhodecode/templates/admin/defaults/defaults.html:84
 #: rhodecode/templates/admin/ldap/ldap.html:89
+#: rhodecode/templates/admin/permissions/permissions.html: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 @@ 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 @@ 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 @@ msgstr "Création de dépôt"
 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 @@ msgstr "ajouter un nouveau dépôt"
 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 @@ msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt."
 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 @@ msgstr "Clé d’API"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:203
 #: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:117
+#: rhodecode/templates/admin/users/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 @@ 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 @@ msgstr "Écriture"
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:6
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
 #: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/base/base.html:229
+#: rhodecode/templates/base/base.html:235
 msgid "admin"
 msgstr "Administration"
 
@@ -2276,8 +2417,7 @@ msgid "member"
 msgstr "Membre"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-#: rhodecode/templates/data_table/_dt_elements.html:67
-#: rhodecode/templates/journal/journal.html: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 @@ 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 @@ 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 @@ 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 @@ msgstr "Éditer le groupe de dépôt"
 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 @@ 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 @@ msgstr "Nombre de sous-dépôts"
 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 @@ 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 @@ msgstr "en utilisant l’adresse"
 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 @@ 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 @@ 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 @@ 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 @@ msgstr "Je participe à"
 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 @@ 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 @@ 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 @@ msgstr "Voulez-vous vraiment supprimer le groupe d‘utilisateurs « %s » ?"
 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 @@ 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 @@ msgstr "Résultats tronqués"
 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ msgstr[1] "%s fichié modifié"
 
 #: 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ msgstr "Chargement de la liste des fichiers…"
 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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."
-