merge with beta

docs/changelog.rst

@@ -1,885 +1,903 b''
 .. _changelog:
 
 =========
 Changelog
 =========
 
 
+1.5.1 (**2012-12-13**)
+----------------------
+
+news
+++++
+
+- implements #677: Don't allow to close pull requests when they are 
+  under-review status
+- implemented #670 Implementation of Roles in Pull Request
+
+fixes
++++++
+
+- default permissions can get duplicated after migration
+- fixed changeset status labels, they now select radio buttons
+- #682 translation difficult for multi-line text
+- #683 fixed difference between messages about not mapped repositories
+
 1.5.0 (**2012-12-12**)
 ----------------------
 
 news
 ++++
 
 - new rewritten from scratch diff engine. 10x faster in edge cases. Handling
   of file renames, copies, change flags and binary files
 - added lightweight dashboard option. ref #500. New version of dashboard
   page that doesn't use any VCS data and is super fast to render. Recommended
   for large amount of repositories.
 - implements #648 write Script for updating last modification time for
   lightweight dashboard
 - implemented compare engine for git repositories.
 - LDAP failover, option to specify multiple servers
 - added Errormator and Sentry support for monitoring RhodeCode
 - implemented #628: Pass server URL to rc-extensions hooks
 - new tooltip implementation - added lazy loading of changesets from journal
   pages. This can significantly improve speed of rendering the page
 - implements #632,added branch/tag/bookmarks info into feeds
   added changeset link to body of message
 - implemented #638 permissions overview to groups
 - implements #636, lazy loading of history and authors to speed up source
   pages rendering
 - implemented #647, option to pass list of default encoding used to 
   encode to/decode from unicode
 - added caching layer into RSS/ATOM feeds.
 - basic implementation of cherry picking changesets for pull request, ref #575
 - implemented #661 Add option to include diff in RSS feed
 - implemented file history page for showing detailed changelog for a given file
 - implemented #663 Admin/permission: specify default repogroup perms
 - implemented #379 defaults settings page for creation of repositories, locking
   statistics, downloads, repository type
 - implemented #210 filtering of admin journal based on Whoosh Query language
 - added parents/children links in changeset viewref #650
 
 fixes
 +++++
 
 - fixed git version checker
 - #586 patched basic auth handler to fix issues with git behind proxy
 - #589 search urlgenerator didn't properly escape special characters
 - fixed issue #614 Include repo name in delete confirmation dialog
 - fixed #623: Lang meta-tag doesn't work with C#/C++
 - fixes #612 Double quotes to Single quotes result in bad html in diff
 - fixes #630 git statistics do too much work making them slow.
 - fixes #625 Git-Tags are not displayed in Shortlog
 - fix for issue #602, enforce str when setting mercurial UI object. 
   When this is used together with mercurial internal translation system
   it can lead to UnicodeDecodeErrors
 - fixes #645 Fix git handler when doing delete remote branch
 - implements #649 added two seperate method for author and commiter to VCS
   changeset class switch author for git backed to be the real author not commiter
 - fix issue #504 RhodeCode is showing different versions of README on
   different summary page loads
 - implemented #658 Changing username in LDAP-Mode should not be allowed.
 - fixes #652 switch to generator approach when doing file annotation to prevent
   huge memory consumption 
 - fixes #666 move lockkey path location to cache_dir to ensure this path is
   always writable for rhodecode server
 - many more small fixes and improvements
 - fixed issues with recursive scans on removed repositories that could take
   long time on instance start
 
 1.4.4 (**2012-10-08**)
 ----------------------
 
 news
 ++++
 
 - obfuscate db password in logs for engine connection string
 - #574 Show pull request status also in shortlog (if any)
 - remember selected tab in my account page
 - Bumped mercurial version to 2.3.2
 - #595 rcextension hook for repository delete
 
 fixes
 +++++
 
 - Add git version detection to warn users that Git used in system is to
   old. Ref #588 - also show git version in system details in settings page
 - fixed files quick filter links
 - #590 Add GET flag that controls the way the diff are generated, for pull
   requests we want to use non-bundle based diffs, That are far better for
   doing code reviews. The /compare url still uses bundle compare for full
   comparison including the incoming changesets
 - Fixed #585, checks for status of revision where to strict, and made
   opening pull request with those revision impossible due to previously set
   status. Checks now are made also for the repository.
 - fixes #591 git backend was causing encoding errors when handling binary
   files - added a test case for VCS lib tests
 - fixed #597 commits in future get negative age.
 - fixed #598 API docs methods had wrong members parameter as returned data
 
 1.4.3 (**2012-09-28**)
 ----------------------
 
 news
 ++++
 
 - #558 Added config file to hooks extra data
 - bumped mercurial version to 2.3.1
 - #518 added possibility of specifying multiple patterns for issues
 - update codemirror to latest version
 
 fixes
 +++++
 
 - fixed #570 explicit users group permissions can overwrite owner permissions
 - fixed #578 set proper PATH with current Python for Git
   hooks to execute within same Python as RhodeCode 
 - fixed issue with Git bare repos that ends with .git in name
 
 1.4.2 (**2012-09-12**)
 ----------------------
 
 news
 ++++
 
 - added option to menu to quick lock/unlock repository for users that have
   write access to
 - Implemented permissions for writing to repo
   groups. Now only write access to group allows to create a repostiory
   within that group
 - #565 Add support for {netloc} and {scheme} to alternative_gravatar_url
 - updated translation for zh_CN 
 
 fixes
 +++++
 
 - fixed visual permissions check on repos groups inside groups
 - fixed issues with non-ascii search terms in search, and indexers
 - fixed parsing of page number in GET parameters
 - fixed issues with generating pull-request overview for repos with
   bookmarks and tags, also preview doesn't loose chosen revision from
   select dropdown
 
 1.4.1 (**2012-09-07**)
 ----------------------
 
 news
 ++++
 
 - always put a comment about code-review status change even if user send
   empty data 
 - modified_on column saves repository update and it's going to be used
   later for light version of main page ref #500
 - pull request notifications send much nicer emails with details about pull
   request
 - #551 show breadcrumbs in summary view for repositories inside a group
 
 fixes
 +++++
 
 - fixed migrations of permissions that can lead to inconsistency.
   Some users sent feedback that after upgrading from older versions issues 
   with updating default permissions occurred. RhodeCode detects that now and
   resets default user permission to initial state if there is a need for that.
   Also forces users to set the default value for new forking permission. 
 - #535 improved apache wsgi example configuration in docs
 - fixes #550 mercurial repositories comparision failed when origin repo had
   additional not-common changesets
 - fixed status of code-review in preview windows of pull request
 - git forks were not initialized at bare repos
 - fixes #555 fixes issues with comparing non-related repositories
 - fixes #557 follower counter always counts up
 - fixed issue #560 require push ssl checkbox wasn't shown when option was
   enabled
 - fixed #559
 - fixed issue #559 fixed bug in routing that mapped repo names with <name>_<num> in name as
   if it was a request to url by repository ID
 
 1.4.0 (**2012-09-03**)
 ----------------------
 
 news
 ++++
  
 - new codereview system
 - email map, allowing users to have multiple email addresses mapped into
   their accounts
 - improved git-hook system. Now all actions for git are logged into journal
   including pushed revisions, user and IP address
 - changed setup-app into setup-rhodecode and added default options to it.
 - new git repos are created as bare now by default
 - #464 added links to groups in permission box
 - #465 mentions autocomplete inside comments boxes
 - #469 added --update-only option to whoosh to re-index only given list
   of repos in index 
 - rhodecode-api CLI client
 - new git http protocol replaced buggy dulwich implementation.
   Now based on pygrack & gitweb
 - Improved RSS/ATOM feeds. Discoverable by browsers using proper headers, and 
   reformated based on user suggestions. Additional rss/atom feeds for user
   journal
 - various i18n improvements
 - #478 permissions overview for admin in user edit view
 - File view now displays small gravatars off all authors of given file
 - Implemented landing revisions. Each repository will get landing_rev attribute
   that defines 'default' revision/branch for generating readme files
 - Implemented #509, RhodeCode enforces SSL for push/pulling if requested at 
   earliest possible call.
 - Import remote svn repositories to mercurial using hgsubversion.
 - Fixed #508 RhodeCode now has a option to explicitly set forking permissions
 - RhodeCode can use alternative server for generating avatar icons
 - implemented repositories locking. Pull locks, push unlocks. Also can be done
   via API calls
 - #538 form for permissions can handle multiple users at once 
 
 fixes
 +++++
 
 - improved translations
 - fixes issue #455 Creating an archive generates an exception on Windows
 - fixes #448 Download ZIP archive keeps file in /tmp open and results 
   in out of disk space
 - fixes issue #454 Search results under Windows include proceeding
   backslash
 - fixed issue #450. Rhodecode no longer will crash when bad revision is
   present in journal data.
 - fix for issue #417, git execution was broken on windows for certain
   commands.
 - fixed #413. Don't disable .git directory for bare repos on deleting
 - fixed issue #459. Changed the way of obtaining logger in reindex task.
 - fixed #453 added ID field in whoosh SCHEMA that solves the issue of
   reindexing modified files
 - fixed #481 rhodecode emails are sent without Date header 
 - fixed #458 wrong count when no repos are present
 - fixed issue #492 missing `\ No newline at end of file` test at the end of 
   new chunk in html diff
 - full text search now works also for commit messages
 
 1.3.6 (**2012-05-17**)
 ----------------------
 
 news
 ++++
 
 - chinese traditional translation
 - changed setup-app into setup-rhodecode and added arguments for auto-setup 
   mode that doesn't need user interaction 
 
 fixes
 +++++
 
 - fixed no scm found warning
 - fixed __future__ import error on rcextensions
 - made simplejson required lib for speedup on JSON encoding
 - fixes #449 bad regex could get more than revisions from parsing history
 - don't clear DB session when CELERY_EAGER is turned ON
 
 1.3.5 (**2012-05-10**)
 ----------------------
 
 news
 ++++
 
 - use ext_json for json module
 - unified annotation view with file source view
 - notification improvements, better inbox + css
 - #419 don't strip passwords for login forms, make rhodecode 
   more compatible with LDAP servers
 - Added HTTP_X_FORWARDED_FOR as another method of extracting 
   IP for pull/push logs. - moved all to base controller  
 - #415: Adding comment to changeset causes reload. 
   Comments are now added via ajax and doesn't reload the page
 - #374 LDAP config is discarded when LDAP can't be activated
 - limited push/pull operations are now logged for git in the journal
 - bumped mercurial to 2.2.X series
 - added support for displaying submodules in file-browser
 - #421 added bookmarks in changelog view
 
 fixes
 +++++
 
 - fixed dev-version marker for stable when served from source codes
 - fixed missing permission checks on show forks page
 - #418 cast to unicode fixes in notification objects
 - #426 fixed mention extracting regex
 - fixed remote-pulling for git remotes remopositories
 - fixed #434: Error when accessing files or changesets of a git repository 
   with submodules
 - fixed issue with empty APIKEYS for users after registration ref. #438
 - fixed issue with getting README files from git repositories
 
 1.3.4 (**2012-03-28**)
 ----------------------
 
 news
 ++++
 
 - Whoosh logging is now controlled by the .ini files logging setup
 - added clone-url into edit form on /settings page
 - added help text into repo add/edit forms
 - created rcextensions module with additional mappings (ref #322) and
   post push/pull/create repo hooks callbacks
 - implemented #377 Users view for his own permissions on account page
 - #399 added inheritance of permissions for users group on repos groups
 - #401 repository group is automatically pre-selected when adding repos 
   inside a repository group
 - added alternative HTTP 403 response when client failed to authenticate. Helps 
   solving issues with Mercurial and LDAP
 - #402 removed group prefix from repository name when listing repositories 
   inside a group
 - added gravatars into permission view and permissions autocomplete
 - #347 when running multiple RhodeCode instances, properly invalidates cache 
   for all registered servers
 
 fixes
 +++++
 
 - fixed #390 cache invalidation problems on repos inside group
 - fixed #385 clone by ID url was loosing proxy prefix in URL
 - fixed some unicode problems with waitress
 - fixed issue with escaping < and > in changeset commits
 - fixed error occurring during recursive group creation in API 
   create_repo function
 - fixed #393 py2.5 fixes for routes url generator
 - fixed #397 Private repository groups shows up before login
 - fixed #396 fixed problems with revoking users in nested groups
 - fixed mysql unicode issues + specified InnoDB as default engine with 
   utf8 charset
 - #406 trim long branch/tag names in changelog to not break UI
   
 1.3.3 (**2012-03-02**)
 ----------------------
 
 news
 ++++
 
 
 fixes
 +++++
 
 - fixed some python2.5 compatibility issues 
 - fixed issues with removed repos was accidentally added as groups, after
   full rescan of paths
 - fixes #376 Cannot edit user (using container auth)
 - fixes #378 Invalid image urls on changeset screen with proxy-prefix 
   configuration
 - fixed initial sorting of repos inside repo group
 - fixes issue when user tried to resubmit same permission into user/user_groups
 - bumped beaker version that fixes #375 leap error bug
 - fixed raw_changeset for git. It was generated with hg patch headers
 - fixed vcs issue with last_changeset for filenodes
 - fixed missing commit after hook delete
 - fixed #372 issues with git operation detection that caused a security issue 
   for git repos
 
 1.3.2 (**2012-02-28**)
 ----------------------
 
 news
 ++++
 
 
 fixes
 +++++
 
 - fixed git protocol issues with repos-groups
 - fixed git remote repos validator that prevented from cloning remote git repos
 - fixes #370 ending slashes fixes for repo and groups
 - fixes #368 improved git-protocol detection to handle other clients
 - fixes #366 When Setting Repository Group To Blank Repo Group Wont Be 
   Moved To Root
 - fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys 
 - fixed #373 missing cascade drop on user_group_to_perm table
 
 1.3.1 (**2012-02-27**)
 ----------------------
 
 news
 ++++
 
 
 fixes
 +++++
 
 - redirection loop occurs when remember-me wasn't checked during login
 - fixes issues with git blob history generation 
 - don't fetch branch for git in file history dropdown. Causes unneeded slowness
 
 1.3.0 (**2012-02-26**)
 ----------------------
 
 news
 ++++
 
 - code review, inspired by github code-comments 
 - #215 rst and markdown README files support
 - #252 Container-based and proxy pass-through authentication support
 - #44 branch browser. Filtering of changelog by branches
 - mercurial bookmarks support
 - new hover top menu, optimized to add maximum size for important views
 - configurable clone url template with possibility to specify  protocol like 
   ssh:// or http:// and also manually alter other parts of clone_url.
 - enabled largefiles extension by default
 - optimized summary file pages and saved a lot of unused space in them
 - #239 option to manually mark repository as fork
 - #320 mapping of commit authors to RhodeCode users
 - #304 hashes are displayed using monospace font    
 - diff configuration, toggle white lines and context lines
 - #307 configurable diffs, whitespace toggle, increasing context lines
 - sorting on branches, tags and bookmarks using YUI datatable
 - improved file filter on files page
 - implements #330 api method for listing nodes ar particular revision
 - #73 added linking issues in commit messages to chosen issue tracker url
   based on user defined regular expression
 - added linking of changesets in commit messages  
 - new compact changelog with expandable commit messages
 - firstname and lastname are optional in user creation
 - #348 added post-create repository hook
 - #212 global encoding settings is now configurable from .ini files 
 - #227 added repository groups permissions
 - markdown gets codehilite extensions
 - new API methods, delete_repositories, grante/revoke permissions for groups 
   and repos
   
     
 fixes
 +++++
 
 - rewrote dbsession management for atomic operations, and better error handling
 - fixed sorting of repo tables
 - #326 escape of special html entities in diffs
 - normalized user_name => username in api attributes
 - fixes #298 ldap created users with mixed case emails created conflicts 
   on saving a form
 - fixes issue when owner of a repo couldn't revoke permissions for users 
   and groups
 - fixes #271 rare JSON serialization problem with statistics
 - fixes #337 missing validation check for conflicting names of a group with a
   repositories group
 - #340 fixed session problem for mysql and celery tasks
 - fixed #331 RhodeCode mangles repository names if the a repository group 
   contains the "full path" to the repositories
 - #355 RhodeCode doesn't store encrypted LDAP passwords
 
 1.2.5 (**2012-01-28**)
 ----------------------
 
 news
 ++++
 
 fixes
 +++++
 
 - #340 Celery complains about MySQL server gone away, added session cleanup
   for celery tasks
 - #341 "scanning for repositories in None" log message during Rescan was missing
   a parameter
 - fixed creating archives with subrepos. Some hooks were triggered during that
   operation leading to crash.
 - fixed missing email in account page.
 - Reverted Mercurial to 2.0.1 for windows due to bug in Mercurial that makes
   forking on windows impossible 
 
 1.2.4 (**2012-01-19**)
 ----------------------
 
 news
 ++++
 
 - RhodeCode is bundled with mercurial series 2.0.X by default, with
   full support to largefiles extension. Enabled by default in new installations
 - #329 Ability to Add/Remove Groups to/from a Repository via AP
 - added requires.txt file with requirements
      
 fixes
 +++++
 
 - fixes db session issues with celery when emailing admins
 - #331 RhodeCode mangles repository names if the a repository group 
   contains the "full path" to the repositories
 - #298 Conflicting e-mail addresses for LDAP and RhodeCode users
 - DB session cleanup after hg protocol operations, fixes issues with
   `mysql has gone away` errors
 - #333 doc fixes for get_repo api function
 - #271 rare JSON serialization problem with statistics enabled
 - #337 Fixes issues with validation of repository name conflicting with 
   a group name. A proper message is now displayed.
 - #292 made ldap_dn in user edit readonly, to get rid of confusion that field
   doesn't work   
 - #316 fixes issues with web description in hgrc files 
 
 1.2.3 (**2011-11-02**)
 ----------------------
 
 news
 ++++
 
 - added option to manage repos group for non admin users
 - added following API methods for get_users, create_user, get_users_groups, 
   get_users_group, create_users_group, add_user_to_users_groups, get_repos, 
   get_repo, create_repo, add_user_to_repo
 - implements #237 added password confirmation for my account 
   and admin edit user.
 - implements #291 email notification for global events are now sent to all
   administrator users, and global config email.
      
 fixes
 +++++
 
 - added option for passing auth method for smtp mailer
 - #276 issue with adding a single user with id>10 to usergroups
 - #277 fixes windows LDAP settings in which missing values breaks the ldap auth 
 - #288 fixes managing of repos in a group for non admin user
 
 1.2.2 (**2011-10-17**)
 ----------------------
 
 news
 ++++
 
 - #226 repo groups are available by path instead of numerical id
  
 fixes
 +++++
 
 - #259 Groups with the same name but with different parent group
 - #260 Put repo in group, then move group to another group -> repo becomes unavailable
 - #258 RhodeCode 1.2 assumes egg folder is writable (lockfiles problems)
 - #265 ldap save fails sometimes on converting attributes to booleans, 
   added getter and setter into model that will prevent from this on db model level
 - fixed problems with timestamps issues #251 and #213
 - fixes #266 RhodeCode allows to create repo with the same name and in 
   the same parent as group
 - fixes #245 Rescan of the repositories on Windows
 - fixes #248 cannot edit repos inside a group on windows
 - fixes #219 forking problems on windows
 
 1.2.1 (**2011-10-08**)
 ----------------------
 
 news
 ++++
 
 
 fixes
 +++++
 
 - fixed problems with basic auth and push problems 
 - gui fixes
 - fixed logger
 
 1.2.0 (**2011-10-07**)
 ----------------------
 
 news
 ++++
 
 - implemented #47 repository groups
 - implemented #89 Can setup google analytics code from settings menu
 - implemented #91 added nicer looking archive urls with more download options
   like tags, branches
 - implemented #44 into file browsing, and added follow branch option
 - implemented #84 downloads can be enabled/disabled for each repository
 - anonymous repository can be cloned without having to pass default:default
   into clone url
 - fixed #90 whoosh indexer can index chooses repositories passed in command 
   line
 - extended journal with day aggregates and paging
 - implemented #107 source code lines highlight ranges
 - implemented #93 customizable changelog on combined revision ranges - 
   equivalent of githubs compare view 
 - implemented #108 extended and more powerful LDAP configuration
 - implemented #56 users groups
 - major code rewrites optimized codes for speed and memory usage
 - raw and diff downloads are now in git format
 - setup command checks for write access to given path
 - fixed many issues with international characters and unicode. It uses utf8
   decode with replace to provide less errors even with non utf8 encoded strings
 - #125 added API KEY access to feeds
 - #109 Repository can be created from external Mercurial link (aka. remote 
   repository, and manually updated (via pull) from admin panel
 - beta git support - push/pull server + basic view for git repos
 - added followers page and forks page
 - server side file creation (with binary file upload interface) 
   and edition with commits powered by codemirror 
 - #111 file browser file finder, quick lookup files on whole file tree 
 - added quick login sliding menu into main page
 - changelog uses lazy loading of affected files details, in some scenarios 
   this can improve speed of changelog page dramatically especially for 
   larger repositories.
 - implements #214 added support for downloading subrepos in download menu.
 - Added basic API for direct operations on rhodecode via JSON
 - Implemented advanced hook management
 
 fixes
 +++++
 
 - fixed file browser bug, when switching into given form revision the url was 
   not changing
 - fixed propagation to error controller on simplehg and simplegit middlewares
 - fixed error when trying to make a download on empty repository
 - fixed problem with '[' chars in commit messages in journal
 - fixed #99 Unicode errors, on file node paths with non utf-8 characters
 - journal fork fixes
 - removed issue with space inside renamed repository after deletion
 - fixed strange issue on formencode imports
 - fixed #126 Deleting repository on Windows, rename used incompatible chars. 
 - #150 fixes for errors on repositories mapped in db but corrupted in 
   filesystem
 - fixed problem with ascendant characters in realm #181
 - fixed problem with sqlite file based database connection pool
 - whoosh indexer and code stats share the same dynamic extensions map
 - fixes #188 - relationship delete of repo_to_perm entry on user removal
 - fixes issue #189 Trending source files shows "show more" when no more exist
 - fixes issue #197 Relative paths for pidlocks
 - fixes issue #198 password will require only 3 chars now for login form
 - fixes issue #199 wrong redirection for non admin users after creating a repository
 - fixes issues #202, bad db constraint made impossible to attach same group 
   more than one time. Affects only mysql/postgres
 - fixes #218 os.kill patch for windows was missing sig param
 - improved rendering of dag (they are not trimmed anymore when number of 
   heads exceeds 5)
     
 1.1.8 (**2011-04-12**)
 ----------------------
 
 news
 ++++
 
 - improved windows support
 
 fixes
 +++++
 
 - fixed #140 freeze of python dateutil library, since new version is python2.x
   incompatible
 - setup-app will check for write permission in given path
 - cleaned up license info issue #149
 - fixes for issues #137,#116 and problems with unicode and accented characters.
 - fixes crashes on gravatar, when passed in email as unicode
 - fixed tooltip flickering problems
 - fixed came_from redirection on windows
 - fixed logging modules, and sql formatters
 - windows fixes for os.kill issue #133
 - fixes path splitting for windows issues #148
 - fixed issue #143 wrong import on migration to 1.1.X
 - fixed problems with displaying binary files, thanks to Thomas Waldmann
 - removed name from archive files since it's breaking ui for long repo names
 - fixed issue with archive headers sent to browser, thanks to Thomas Waldmann
 - fixed compatibility for 1024px displays, and larger dpi settings, thanks to 
   Thomas Waldmann
 - fixed issue #166 summary pager was skipping 10 revisions on second page
 
 
 1.1.7 (**2011-03-23**)
 ----------------------
 
 news
 ++++
 
 fixes
 +++++
 
 - fixed (again) #136 installation support for FreeBSD
 
 
 1.1.6 (**2011-03-21**)
 ----------------------
 
 news
 ++++
 
 fixes
 +++++
 
 - fixed #136 installation support for FreeBSD
 - RhodeCode will check for python version during installation
 
 1.1.5 (**2011-03-17**)
 ----------------------
 
 news
 ++++
 
 - basic windows support, by exchanging pybcrypt into sha256 for windows only
   highly inspired by idea of mantis406
 
 fixes
 +++++
 
 - fixed sorting by author in main page
 - fixed crashes with diffs on binary files
 - fixed #131 problem with boolean values for LDAP
 - fixed #122 mysql problems thanks to striker69 
 - fixed problem with errors on calling raw/raw_files/annotate functions 
   with unknown revisions
 - fixed returned rawfiles attachment names with international character
 - cleaned out docs, big thanks to Jason Harris
 
 1.1.4 (**2011-02-19**)
 ----------------------
 
 news
 ++++
 
 fixes
 +++++
 
 - fixed formencode import problem on settings page, that caused server crash
   when that page was accessed as first after server start
 - journal fixes
 - fixed option to access repository just by entering http://server/<repo_name> 
 
 1.1.3 (**2011-02-16**)
 ----------------------
 
 news
 ++++
 
 - implemented #102 allowing the '.' character in username
 - added option to access repository just by entering http://server/<repo_name>
 - celery task ignores result for better performance
 
 fixes
 +++++
 
 - fixed ehlo command and non auth mail servers on smtp_lib. Thanks to 
   apollo13 and Johan Walles
 - small fixes in journal
 - fixed problems with getting setting for celery from .ini files
 - registration, password reset and login boxes share the same title as main 
   application now
 - fixed #113: to high permissions to fork repository
 - fixed problem with '[' chars in commit messages in journal
 - removed issue with space inside renamed repository after deletion
 - db transaction fixes when filesystem repository creation failed
 - fixed #106 relation issues on databases different than sqlite
 - fixed static files paths links to use of url() method
 
 1.1.2 (**2011-01-12**)
 ----------------------
 
 news
 ++++
 
 
 fixes
 +++++
 
 - fixes #98 protection against float division of percentage stats
 - fixed graph bug
 - forced webhelpers version since it was making troubles during installation 
 
 1.1.1 (**2011-01-06**)
 ----------------------
  
 news
 ++++
 
 - added force https option into ini files for easier https usage (no need to
   set server headers with this options)
 - small css updates
 
 fixes
 +++++
 
 - fixed #96 redirect loop on files view on repositories without changesets
 - fixed #97 unicode string passed into server header in special cases (mod_wsgi)
   and server crashed with errors
 - fixed large tooltips problems on main page
 - fixed #92 whoosh indexer is more error proof
 
 1.1.0 (**2010-12-18**)
 ----------------------
 
 news
 ++++
 
 - rewrite of internals for vcs >=0.1.10
 - uses mercurial 1.7 with dotencode disabled for maintaining compatibility 
   with older clients
 - anonymous access, authentication via ldap
 - performance upgrade for cached repos list - each repository has its own 
   cache that's invalidated when needed.
 - performance upgrades on repositories with large amount of commits (20K+)
 - main page quick filter for filtering repositories
 - user dashboards with ability to follow chosen repositories actions
 - sends email to admin on new user registration
 - added cache/statistics reset options into repository settings
 - more detailed action logger (based on hooks) with pushed changesets lists
   and options to disable those hooks from admin panel
 - introduced new enhanced changelog for merges that shows more accurate results
 - new improved and faster code stats (based on pygments lexers mapping tables, 
   showing up to 10 trending sources for each repository. Additionally stats
   can be disabled in repository settings.
 - gui optimizations, fixed application width to 1024px
 - added cut off (for large files/changesets) limit into config files
 - whoosh, celeryd, upgrade moved to paster command
 - other than sqlite database backends can be used
 
 fixes
 +++++
 
 - fixes #61 forked repo was showing only after cache expired
 - fixes #76 no confirmation on user deletes
 - fixes #66 Name field misspelled
 - fixes #72 block user removal when he owns repositories
 - fixes #69 added password confirmation fields
 - fixes #87 RhodeCode crashes occasionally on updating repository owner
 - fixes #82 broken annotations on files with more than 1 blank line at the end
 - a lot of fixes and tweaks for file browser
 - fixed detached session issues
 - fixed when user had no repos he would see all repos listed in my account
 - fixed ui() instance bug when global hgrc settings was loaded for server 
   instance and all hgrc options were merged with our db ui() object
 - numerous small bugfixes
  
 (special thanks for TkSoh for detailed feedback)
 
 
 1.0.2 (**2010-11-12**)
 ----------------------
 
 news
 ++++
 
 - tested under python2.7
 - bumped sqlalchemy and celery versions
 
 fixes
 +++++
 
 - fixed #59 missing graph.js
 - fixed repo_size crash when repository had broken symlinks
 - fixed python2.5 crashes.
 
 
 1.0.1 (**2010-11-10**)
 ----------------------
 
 news
 ++++
 
 - small css updated
 
 fixes
 +++++
 
 - fixed #53 python2.5 incompatible enumerate calls
 - fixed #52 disable mercurial extension for web
 - fixed #51 deleting repositories don't delete it's dependent objects
 
 
 1.0.0 (**2010-11-02**)
 ----------------------
 
 - security bugfix simplehg wasn't checking for permissions on commands
   other than pull or push.
 - fixed doubled messages after push or pull in admin journal
 - templating and css corrections, fixed repo switcher on chrome, updated titles
 - admin menu accessible from options menu on repository view
 - permissions cached queries
 
 1.0.0rc4  (**2010-10-12**)
 --------------------------
 
 - fixed python2.5 missing simplejson imports (thanks to Jens Bäckman)
 - removed cache_manager settings from sqlalchemy meta
 - added sqlalchemy cache settings to ini files
 - validated password length and added second try of failure on paster setup-app
 - fixed setup database destroy prompt even when there was no db
 
 
 1.0.0rc3 (**2010-10-11**)
 -------------------------
 
 - fixed i18n during installation.
 
 1.0.0rc2 (**2010-10-11**)
 -------------------------
 
 - Disabled dirsize in file browser, it's causing nasty bug when dir renames 
   occure. After vcs is fixed it'll be put back again.
 - templating/css rewrites, optimized css.
  No newline at end of file

rhodecode/__init__.py

@@ -1,67 +1,67 b''
 # -*- coding: utf-8 -*-
 """
     rhodecode.__init__
     ~~~~~~~~~~~~~~~~~~
 
     RhodeCode, a web based repository management based on pylons
     versioning implementation: http://www.python.org/dev/peps/pep-0386/
 
     :created_on: Apr 9, 2010
     :author: marcink
     :copyright: (C) 2010-2012 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import sys
 import platform
 
-VERSION = (1, 5, 0)
+VERSION = (1, 5, 1)
 
 try:
     from rhodecode.lib import get_current_revision
     _rev = get_current_revision(quiet=True)
     if _rev and len(VERSION) > 3:
         VERSION += ('dev%s' % _rev[0],)
 except ImportError:
     pass
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])) +
                '.'.join(VERSION[3:]))
-__dbversion__ = 8  # defines current db version for migrations
+__dbversion__ = 9  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'GPLv3'
 __py_version__ = sys.version_info
 __author__ = 'Marcin Kuzminski'
 __url__ = 'http://rhodecode.org'
 
 PLATFORM_WIN = ('Windows')
 PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD', 'OpenBSD', 'SunOS') #depracated
 
 is_windows = __platform__ in PLATFORM_WIN
 is_unix = not is_windows
 
 
 BACKENDS = {
     'hg': 'Mercurial repository',
     'git': 'Git repository',
 }
 
 CELERY_ON = False
 CELERY_EAGER = False
 
 # link to config for pylons
 CONFIG = {}
 
 # Linked module for extensions
 EXTENSIONS = {}

rhodecode/controllers/admin/repos.py

@@ -1,520 +1,510 b''
 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.admin.repos
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Repositories controller for RhodeCode
 
     :created_on: Apr 7, 2010
     :author: marcink
     :copyright: (C) 2010-2012 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 import traceback
 import formencode
 from formencode import htmlfill
 
 from webob.exc import HTTPInternalServerError
 from pylons import request, session, tmpl_context as c, url
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 from sqlalchemy.exc import IntegrityError
 
 import rhodecode
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
     HasPermissionAnyDecorator, HasRepoPermissionAllDecorator
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.utils import invalidate_cache, action_logger, repo_name_slug
 from rhodecode.lib.helpers import get_token
 from rhodecode.model.meta import Session
 from rhodecode.model.db import User, Repository, UserFollowing, RepoGroup,\
     RhodeCodeSetting
 from rhodecode.model.forms import RepoForm
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.lib.compat import json
 from sqlalchemy.sql.expression import func
 
 log = logging.getLogger(__name__)
 
 
 class ReposController(BaseController):
     """
     REST Controller styled on the Atom Publishing Protocol"""
     # To properly map this controller, ensure your config/routing.py
     # file has a resource setup:
     #     map.resource('repo', 'repos')
 
     @LoginRequired()
     @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository')
     def __before__(self):
         c.admin_user = session.get('admin_user')
         c.admin_username = session.get('admin_username')
         super(ReposController, self).__before__()
 
     def __load_defaults(self):
         c.repo_groups = RepoGroup.groups_choices(check_perms=True)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
 
         repo_model = RepoModel()
         c.users_array = repo_model.get_users_js()
         c.users_groups_array = repo_model.get_users_groups_js()
         choices, c.landing_revs = ScmModel().get_repo_landing_revs()
         c.landing_revs_choices = choices
 
     def __load_data(self, repo_name=None):
         """
         Load defaults settings for edit, and update
 
         :param repo_name:
         """
         self.__load_defaults()
 
         c.repo_info = db_repo = Repository.get_by_repo_name(repo_name)
         repo = db_repo.scm_instance
 
         if c.repo_info is None:
-            h.flash(_('%s repository is not mapped to db perhaps'
-                      ' it was created or renamed from the filesystem'
-                      ' please run the application again'
-                      ' in order to rescan repositories') % repo_name,
-                      category='error')
-
+            h.not_mapped_error(repo_name)
             return redirect(url('repos'))
 
         ##override defaults for exact repo info here git/hg etc
         choices, c.landing_revs = ScmModel().get_repo_landing_revs(c.repo_info)
         c.landing_revs_choices = choices
 
         c.default_user_id = User.get_by_username('default').user_id
         c.in_public_journal = UserFollowing.query()\
             .filter(UserFollowing.user_id == c.default_user_id)\
             .filter(UserFollowing.follows_repository == c.repo_info).scalar()
 
         if c.repo_info.stats:
             # this is on what revision we ended up so we add +1 for count
             last_rev = c.repo_info.stats.stat_on_revision + 1
         else:
             last_rev = 0
         c.stats_revision = last_rev
 
         c.repo_last_rev = repo.count() if repo.revisions else 0
 
         if last_rev == 0 or c.repo_last_rev == 0:
             c.stats_percentage = 0
         else:
             c.stats_percentage = '%.2f' % ((float((last_rev)) /
                                             c.repo_last_rev) * 100)
 
         defaults = RepoModel()._get_defaults(repo_name)
 
         c.repos_list = [('', _('--REMOVE FORK--'))]
         c.repos_list += [(x.repo_id, x.repo_name) for x in
                     Repository.query().order_by(Repository.repo_name).all()
                     if x.repo_id != c.repo_info.repo_id]
 
         defaults['id_fork_of'] = db_repo.fork.repo_id if db_repo.fork else ''
         return defaults
 
     @HasPermissionAllDecorator('hg.admin')
     def index(self, format='html'):
         """GET /repos: All items in the collection"""
         # url('repos')
 
         c.repos_list = Repository.query()\
                         .order_by(func.lower(Repository.repo_name))\
                         .all()
 
         repos_data = []
         total_records = len(c.repos_list)
 
         _tmpl_lookup = rhodecode.CONFIG['pylons.app_globals'].mako_lookup
         template = _tmpl_lookup.get_template('data_table/_dt_elements.html')
 
         quick_menu = lambda repo_name: (template.get_def("quick_menu")
                                         .render(repo_name, _=_, h=h, c=c))
         repo_lnk = lambda name, rtype, private, fork_of: (
             template.get_def("repo_name")
             .render(name, rtype, private, fork_of, short_name=False,
                     admin=True, _=_, h=h, c=c))
 
         repo_actions = lambda repo_name: (template.get_def("repo_actions")
                                        .render(repo_name, _=_, h=h, c=c))
 
         for repo in c.repos_list:
             repos_data.append({
                 "menu": quick_menu(repo.repo_name),
                 "raw_name": repo.repo_name.lower(),
                 "name": repo_lnk(repo.repo_name, repo.repo_type,
                                  repo.private, repo.fork),
                 "desc": repo.description,
                 "owner": repo.user.username,
                 "action": repo_actions(repo.repo_name),
             })
 
         c.data = json.dumps({
             "totalRecords": total_records,
             "startIndex": 0,
             "sort": "name",
             "dir": "asc",
             "records": repos_data
         })
 
         return render('admin/repos/repos.html')
 
     @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository')
     def create(self):
         """
         POST /repos: Create a new item"""
         # url('repos')
 
         self.__load_defaults()
         form_result = {}
         try:
             form_result = RepoForm(repo_groups=c.repo_groups_choices,
                                    landing_revs=c.landing_revs_choices)()\
                             .to_python(dict(request.POST))
             new_repo = RepoModel().create(form_result,
                                           self.rhodecode_user.user_id)
             if form_result['clone_uri']:
                 h.flash(_('created repository %s from %s') \
                     % (form_result['repo_name'], form_result['clone_uri']),
                     category='success')
             else:
                 h.flash(_('created repository %s') % form_result['repo_name'],
                     category='success')
 
             if request.POST.get('user_created'):
                 # created by regular non admin user
                 action_logger(self.rhodecode_user, 'user_created_repo',
                               form_result['repo_name_full'], self.ip_addr,
                               self.sa)
             else:
                 action_logger(self.rhodecode_user, 'admin_created_repo',
                               form_result['repo_name_full'], self.ip_addr,
                               self.sa)
             Session().commit()
         except formencode.Invalid, errors:
 
             c.new_repo = errors.value['repo_name']
 
             if request.POST.get('user_created'):
                 r = render('admin/repos/repo_add_create_repository.html')
             else:
                 r = render('admin/repos/repo_add.html')
 
             return htmlfill.render(
                 r,
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
 
         except Exception:
             log.error(traceback.format_exc())
             msg = _('error occurred during creation of repository %s') \
                     % form_result.get('repo_name')
             h.flash(msg, category='error')
             return redirect(url('repos'))
         #redirect to our new repo !
         return redirect(url('summary_home', repo_name=new_repo.repo_name))
 
     @HasPermissionAllDecorator('hg.admin')
     def new(self, format='html'):
         """GET /repos/new: Form to create a new item"""
         new_repo = request.GET.get('repo', '')
         c.new_repo = repo_name_slug(new_repo)
         self.__load_defaults()
         ## apply the defaults from defaults page
         defaults = RhodeCodeSetting.get_default_repo_settings(strip_prefix=True)
         return htmlfill.render(
             render('admin/repos/repo_add.html'),
             defaults=defaults,
             errors={},
             prefix_error=False,
             encoding="UTF-8"
         )
 
     @HasPermissionAllDecorator('hg.admin')
     def update(self, repo_name):
         """
         PUT /repos/repo_name: Update an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="PUT" />
         # Or using helpers:
         #    h.form(url('repo', repo_name=ID),
         #           method='put')
         # url('repo', repo_name=ID)
         self.__load_defaults()
         repo_model = RepoModel()
         changed_name = repo_name
         #override the choices with extracted revisions !
         choices, c.landing_revs = ScmModel().get_repo_landing_revs(repo_name)
         c.landing_revs_choices = choices
 
         _form = RepoForm(edit=True, old_data={'repo_name': repo_name},
                          repo_groups=c.repo_groups_choices,
                          landing_revs=c.landing_revs_choices)()
         try:
             form_result = _form.to_python(dict(request.POST))
             repo = repo_model.update(repo_name, **form_result)
             invalidate_cache('get_repo_cached_%s' % repo_name)
             h.flash(_('Repository %s updated successfully') % repo_name,
                     category='success')
             changed_name = repo.repo_name
             action_logger(self.rhodecode_user, 'admin_updated_repo',
                               changed_name, self.ip_addr, self.sa)
             Session().commit()
         except formencode.Invalid, errors:
             defaults = self.__load_data(repo_name)
             defaults.update(errors.value)
             return htmlfill.render(
                 render('admin/repos/repo_edit.html'),
                 defaults=defaults,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
 
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('error occurred during update of repository %s') \
                     % repo_name, category='error')
         return redirect(url('edit_repo', repo_name=changed_name))
 
     @HasPermissionAllDecorator('hg.admin')
     def delete(self, repo_name):
         """
         DELETE /repos/repo_name: Delete an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="DELETE" />
         # Or using helpers:
         #    h.form(url('repo', repo_name=ID),
         #           method='delete')
         # url('repo', repo_name=ID)
 
         repo_model = RepoModel()
         repo = repo_model.get_by_repo_name(repo_name)
         if not repo:
-            h.flash(_('%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') % repo_name,
-                      category='error')
-
+            h.not_mapped_error(repo_name)
             return redirect(url('repos'))
         try:
             action_logger(self.rhodecode_user, 'admin_deleted_repo',
                               repo_name, self.ip_addr, self.sa)
             repo_model.delete(repo)
             invalidate_cache('get_repo_cached_%s' % repo_name)
             h.flash(_('deleted repository %s') % repo_name, category='success')
             Session().commit()
         except IntegrityError, e:
             if e.message.find('repositories_fork_id_fkey') != -1:
                 log.error(traceback.format_exc())
                 h.flash(_('Cannot delete %s it still contains attached '
                           'forks') % repo_name,
                         category='warning')
             else:
                 log.error(traceback.format_exc())
                 h.flash(_('An error occurred during '
                           'deletion of %s') % repo_name,
                         category='error')
 
         except Exception, e:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of %s') % repo_name,
                     category='error')
 
         return redirect(url('repos'))
 
     @HasRepoPermissionAllDecorator('repository.admin')
     def delete_perm_user(self, repo_name):
         """
         DELETE an existing repository permission user
 
         :param repo_name:
         """
         try:
             RepoModel().revoke_user_permission(repo=repo_name,
                                                user=request.POST['user_id'])
             Session().commit()
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of repository user'),
                     category='error')
             raise HTTPInternalServerError()
 
     @HasRepoPermissionAllDecorator('repository.admin')
     def delete_perm_users_group(self, repo_name):
         """
         DELETE an existing repository permission users group
 
         :param repo_name:
         """
 
         try:
             RepoModel().revoke_users_group_permission(
                 repo=repo_name, group_name=request.POST['users_group_id']
             )
             Session().commit()
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of repository'
                       ' users groups'),
                     category='error')
             raise HTTPInternalServerError()
 
     @HasPermissionAllDecorator('hg.admin')
     def repo_stats(self, repo_name):
         """
         DELETE an existing repository statistics
 
         :param repo_name:
         """
 
         try:
             RepoModel().delete_stats(repo_name)
             Session().commit()
         except Exception, e:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of repository stats'),
                     category='error')
         return redirect(url('edit_repo', repo_name=repo_name))
 
     @HasPermissionAllDecorator('hg.admin')
     def repo_cache(self, repo_name):
         """
         INVALIDATE existing repository cache
 
         :param repo_name:
         """
 
         try:
             ScmModel().mark_for_invalidation(repo_name)
             Session().commit()
         except Exception, e:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during cache invalidation'),
                     category='error')
         return redirect(url('edit_repo', repo_name=repo_name))
 
     @HasPermissionAllDecorator('hg.admin')
     def repo_locking(self, repo_name):
         """
         Unlock repository when it is locked !
 
         :param repo_name:
         """
 
         try:
             repo = Repository.get_by_repo_name(repo_name)
             if request.POST.get('set_lock'):
                 Repository.lock(repo, c.rhodecode_user.user_id)
             elif request.POST.get('set_unlock'):
                 Repository.unlock(repo)
         except Exception, e:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during unlocking'),
                     category='error')
         return redirect(url('edit_repo', repo_name=repo_name))
 
     @HasPermissionAllDecorator('hg.admin')
     def repo_public_journal(self, repo_name):
         """
         Set's this repository to be visible in public journal,
         in other words assing default user to follow this repo
 
         :param repo_name:
         """
 
         cur_token = request.POST.get('auth_token')
         token = get_token()
         if cur_token == token:
             try:
                 repo_id = Repository.get_by_repo_name(repo_name).repo_id
                 user_id = User.get_by_username('default').user_id
                 self.scm_model.toggle_following_repo(repo_id, user_id)
                 h.flash(_('Updated repository visibility in public journal'),
                         category='success')
                 Session().commit()
             except:
                 h.flash(_('An error occurred during setting this'
                           ' repository in public journal'),
                         category='error')
 
         else:
             h.flash(_('Token mismatch'), category='error')
         return redirect(url('edit_repo', repo_name=repo_name))
 
     @HasPermissionAllDecorator('hg.admin')
     def repo_pull(self, repo_name):
         """
         Runs task to update given repository with remote changes,
         ie. make pull on remote location
 
         :param repo_name:
         """
         try:
             ScmModel().pull_changes(repo_name, self.rhodecode_user.username)
             h.flash(_('Pulled from remote location'), category='success')
         except Exception, e:
             h.flash(_('An error occurred during pull from remote location'),
                     category='error')
 
         return redirect(url('edit_repo', repo_name=repo_name))
 
     @HasPermissionAllDecorator('hg.admin')
     def repo_as_fork(self, repo_name):
         """
         Mark given repository as a fork of another
 
         :param repo_name:
         """
         try:
             fork_id = request.POST.get('id_fork_of')
             repo = ScmModel().mark_as_fork(repo_name, fork_id,
                                     self.rhodecode_user.username)
             fork = repo.fork.repo_name if repo.fork else _('Nothing')
             Session().commit()
             h.flash(_('Marked repo %s as fork of %s') % (repo_name, fork),
                     category='success')
         except Exception, e:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during this operation'),
                     category='error')
 
         return redirect(url('edit_repo', repo_name=repo_name))
 
     @HasPermissionAllDecorator('hg.admin')
     def show(self, repo_name, format='html'):
         """GET /repos/repo_name: Show a specific item"""
         # url('repo', repo_name=ID)
 
     @HasPermissionAllDecorator('hg.admin')
     def edit(self, repo_name, format='html'):
         """GET /repos/repo_name/edit: Form to edit an existing item"""
         # url('edit_repo', repo_name=ID)
         defaults = self.__load_data(repo_name)
 
         return htmlfill.render(
             render('admin/repos/repo_edit.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
         )

rhodecode/controllers/forks.py

@@ -1,185 +1,175 b''
 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.forks
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     forks controller for rhodecode
 
     :created_on: Apr 23, 2011
     :author: marcink
     :copyright: (C) 2011-2012 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import logging
 import formencode
 import traceback
 from formencode import htmlfill
 
 from pylons import tmpl_context as c, request, url
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 
 import rhodecode.lib.helpers as h
 
 from rhodecode.lib.helpers import Page
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator, \
     NotAnonymous, HasRepoPermissionAny, HasPermissionAllDecorator,\
     HasPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.model.db import Repository, RepoGroup, UserFollowing, User
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.forms import RepoForkForm
 from rhodecode.model.scm import ScmModel
 from rhodecode.lib.utils2 import safe_int
 
 log = logging.getLogger(__name__)
 
 
 class ForksController(BaseRepoController):
 
     @LoginRequired()
     def __before__(self):
         super(ForksController, self).__before__()
 
     def __load_defaults(self):
         c.repo_groups = RepoGroup.groups_choices(check_perms=True)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
         choices, c.landing_revs = ScmModel().get_repo_landing_revs()
         c.landing_revs_choices = choices
 
     def __load_data(self, repo_name=None):
         """
         Load defaults settings for edit, and update
 
         :param repo_name:
         """
         self.__load_defaults()
 
         c.repo_info = db_repo = Repository.get_by_repo_name(repo_name)
         repo = db_repo.scm_instance
 
         if c.repo_info is None:
-            h.flash(_('%s repository is not mapped to db perhaps'
-                      ' it was created or renamed from the filesystem'
-                      ' please run the application again'
-                      ' in order to rescan repositories') % repo_name,
-                      category='error')
-
+            h.not_mapped_error(repo_name)
             return redirect(url('repos'))
 
         c.default_user_id = User.get_by_username('default').user_id
         c.in_public_journal = UserFollowing.query()\
             .filter(UserFollowing.user_id == c.default_user_id)\
             .filter(UserFollowing.follows_repository == c.repo_info).scalar()
 
         if c.repo_info.stats:
             last_rev = c.repo_info.stats.stat_on_revision+1
         else:
             last_rev = 0
         c.stats_revision = last_rev
 
         c.repo_last_rev = repo.count() if repo.revisions else 0
 
         if last_rev == 0 or c.repo_last_rev == 0:
             c.stats_percentage = 0
         else:
             c.stats_percentage = '%.2f' % ((float((last_rev)) /
                                             c.repo_last_rev) * 100)
 
         defaults = RepoModel()._get_defaults(repo_name)
         # add suffix to fork
         defaults['repo_name'] = '%s-fork' % defaults['repo_name']
         return defaults
 
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def forks(self, repo_name):
         p = safe_int(request.params.get('page', 1), 1)
         repo_id = c.rhodecode_db_repo.repo_id
         d = []
         for r in Repository.get_repo_forks(repo_id):
             if not HasRepoPermissionAny(
                 'repository.read', 'repository.write', 'repository.admin'
             )(r.repo_name, 'get forks check'):
                 continue
             d.append(r)
         c.forks_pager = Page(d, page=p, items_per_page=20)
 
         c.forks_data = render('/forks/forks_data.html')
 
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return c.forks_data
 
         return render('/forks/forks.html')
 
     @NotAnonymous()
     @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository')
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def fork(self, repo_name):
         c.repo_info = Repository.get_by_repo_name(repo_name)
         if not c.repo_info:
-            h.flash(_('%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') % repo_name,
-                      category='error')
-
+            h.not_mapped_error(repo_name)
             return redirect(url('home'))
 
         defaults = self.__load_data(repo_name)
 
         return htmlfill.render(
             render('forks/fork.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
         )
 
     @NotAnonymous()
     @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository')
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def fork_create(self, repo_name):
         self.__load_defaults()
         c.repo_info = Repository.get_by_repo_name(repo_name)
         _form = RepoForkForm(old_data={'repo_type': c.repo_info.repo_type},
                              repo_groups=c.repo_groups_choices,
                              landing_revs=c.landing_revs_choices)()
         form_result = {}
         try:
             form_result = _form.to_python(dict(request.POST))
 
             # create fork is done sometimes async on celery, db transaction
             # management is handled there.
             RepoModel().create_fork(form_result, self.rhodecode_user.user_id)
             h.flash(_('forked %s repository as %s') \
                       % (repo_name, form_result['repo_name']),
                     category='success')
         except formencode.Invalid, errors:
             c.new_repo = errors.value['repo_name']
 
             return htmlfill.render(
                 render('forks/fork.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during repository forking %s') %
                     repo_name, category='error')
 
         return redirect(url('home'))

rhodecode/controllers/pullrequests.py

@@ -1,472 +1,487 b''
 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.pullrequests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     pull requests controller for rhodecode for initializing pull requests
 
     :created_on: May 7, 2012
     :author: marcink
     :copyright: (C) 2010-2012 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import logging
 import traceback
 import formencode
 
 from webob.exc import HTTPNotFound, HTTPForbidden
 from collections import defaultdict
 from itertools import groupby
 
 from pylons import request, response, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 
 from rhodecode.lib.compat import json
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\
     NotAnonymous
 from rhodecode.lib import helpers as h
 from rhodecode.lib import diffs
 from rhodecode.lib.utils import action_logger, jsonify
 from rhodecode.lib.vcs.exceptions import EmptyRepositoryError
 from rhodecode.lib.vcs.backends.base import EmptyChangeset
 from rhodecode.lib.diffs import LimitedDiffContainer
 from rhodecode.model.db import User, PullRequest, ChangesetStatus,\
     ChangesetComment
 from rhodecode.model.pull_request import PullRequestModel
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.comment import ChangesetCommentsModel
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.forms import PullRequestForm
 
 log = logging.getLogger(__name__)
 
 
 class PullrequestsController(BaseRepoController):
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(PullrequestsController, self).__before__()
         repo_model = RepoModel()
         c.users_array = repo_model.get_users_js()
         c.users_groups_array = repo_model.get_users_groups_js()
 
     def _get_repo_refs(self, repo):
         hist_l = []
 
         branches_group = ([('branch:%s:%s' % (k, v), k) for
                          k, v in repo.branches.iteritems()], _("Branches"))
         bookmarks_group = ([('book:%s:%s' % (k, v), k) for
                          k, v in repo.bookmarks.iteritems()], _("Bookmarks"))
         tags_group = ([('tag:%s:%s' % (k, v), k) for
                          k, v in repo.tags.iteritems()], _("Tags"))
 
         hist_l.append(bookmarks_group)
         hist_l.append(branches_group)
         hist_l.append(tags_group)
 
         return hist_l
 
     def _get_default_rev(self, repo):
         """
         Get's default revision to do compare on pull request
 
         :param repo:
         """
         repo = repo.scm_instance
         if 'default' in repo.branches:
             return 'default'
         else:
             #if repo doesn't have default branch return first found
             return repo.branches.keys()[0]
 
+    def _get_is_allowed_change_status(self, pull_request):
+        owner = self.rhodecode_user.user_id == pull_request.user_id 
+        reviewer = self.rhodecode_user.user_id in [x.user_id for x in
+                                                   pull_request.reviewers]
+        return (self.rhodecode_user.admin or owner or reviewer)
+
     def show_all(self, repo_name):
         c.pull_requests = PullRequestModel().get_all(repo_name)
         c.repo_name = repo_name
         return render('/pullrequests/pullrequest_show_all.html')
 
     @NotAnonymous()
     def index(self):
         org_repo = c.rhodecode_db_repo
 
         if org_repo.scm_instance.alias != 'hg':
             log.error('Review not available for GIT REPOS')
             raise HTTPNotFound
 
         try:
             org_repo.scm_instance.get_changeset()
         except EmptyRepositoryError, e:
             h.flash(h.literal(_('There are no changesets yet')),
                     category='warning')
             redirect(url('summary_home', repo_name=org_repo.repo_name))
 
         other_repos_info = {}
 
         c.org_refs = self._get_repo_refs(c.rhodecode_repo)
         c.org_repos = []
         c.other_repos = []
         c.org_repos.append((org_repo.repo_name, '%s/%s' % (
                                 org_repo.user.username, c.repo_name))
                            )
 
         # add org repo to other so we can open pull request agains itself
         c.other_repos.extend(c.org_repos)
 
         c.default_pull_request = org_repo.repo_name  # repo name pre-selected
         c.default_pull_request_rev = self._get_default_rev(org_repo)  # revision pre-selected
         c.default_revs = self._get_repo_refs(org_repo.scm_instance)
         #add orginal repo
         other_repos_info[org_repo.repo_name] = {
             'gravatar': h.gravatar_url(org_repo.user.email, 24),
             'description': org_repo.description,
             'revs': h.select('other_ref', '', c.default_revs, class_='refs')
         }
 
         #gather forks and add to this list
         for fork in org_repo.forks:
             c.other_repos.append((fork.repo_name, '%s/%s' % (
                                     fork.user.username, fork.repo_name))
                                  )
             other_repos_info[fork.repo_name] = {
                 'gravatar': h.gravatar_url(fork.user.email, 24),
                 'description': fork.description,
                 'revs': h.select('other_ref', '',
                                  self._get_repo_refs(fork.scm_instance),
                                  class_='refs')
             }
         #add parents of this fork also, but only if it's not empty
         if org_repo.parent and org_repo.parent.scm_instance.revisions:
             c.default_pull_request = org_repo.parent.repo_name
             c.default_pull_request_rev = self._get_default_rev(org_repo.parent)
             c.default_revs = self._get_repo_refs(org_repo.parent.scm_instance)
             c.other_repos.append((org_repo.parent.repo_name, '%s/%s' % (
                                         org_repo.parent.user.username,
                                         org_repo.parent.repo_name))
                                      )
             other_repos_info[org_repo.parent.repo_name] = {
                 'gravatar': h.gravatar_url(org_repo.parent.user.email, 24),
                 'description': org_repo.parent.description,
                 'revs': h.select('other_ref', '',
                                  self._get_repo_refs(org_repo.parent.scm_instance),
                                  class_='refs')
             }
 
         c.other_repos_info = json.dumps(other_repos_info)
         c.review_members = [org_repo.user]
         return render('/pullrequests/pullrequest.html')
 
     @NotAnonymous()
     def create(self, repo_name):
         repo = RepoModel()._get_repo(repo_name)
         try:
             _form = PullRequestForm(repo.repo_id)().to_python(request.POST)
         except formencode.Invalid, errors:
             log.error(traceback.format_exc())
             if errors.error_dict.get('revisions'):
                 msg = 'Revisions: %s' % errors.error_dict['revisions']
             elif errors.error_dict.get('pullrequest_title'):
                 msg = _('Pull request requires a title with min. 3 chars')
             else:
                 msg = _('error during creation of pull request')
 
             h.flash(msg, 'error')
             return redirect(url('pullrequest_home', repo_name=repo_name))
 
         org_repo = _form['org_repo']
         org_ref = _form['org_ref']
         other_repo = _form['other_repo']
         other_ref = _form['other_ref']
         revisions = _form['revisions']
         reviewers = _form['review_members']
 
         # if we have cherry picked pull request we don't care what is in
         # org_ref/other_ref
         rev_start = request.POST.get('rev_start')
         rev_end = request.POST.get('rev_end')
 
         if rev_start and rev_end:
             # this is swapped to simulate that rev_end is a revision from
             # parent of the fork
             org_ref = 'rev:%s:%s' % (rev_end, rev_end)
             other_ref = 'rev:%s:%s' % (rev_start, rev_start)
 
         title = _form['pullrequest_title']
         description = _form['pullrequest_desc']
 
         try:
             pull_request = PullRequestModel().create(
                 self.rhodecode_user.user_id, org_repo, org_ref, other_repo,
                 other_ref, revisions, reviewers, title, description
             )
             Session().commit()
             h.flash(_('Successfully opened new pull request'),
                     category='success')
         except Exception:
             h.flash(_('Error occurred during sending pull request'),
                     category='error')
             log.error(traceback.format_exc())
             return redirect(url('pullrequest_home', repo_name=repo_name))
 
         return redirect(url('pullrequest_show', repo_name=other_repo,
                             pull_request_id=pull_request.pull_request_id))
 
     @NotAnonymous()
     @jsonify
     def update(self, repo_name, pull_request_id):
         pull_request = PullRequest.get_or_404(pull_request_id)
         if pull_request.is_closed():
             raise HTTPForbidden()
         #only owner or admin can update it
         owner = pull_request.author.user_id == c.rhodecode_user.user_id
         if h.HasPermissionAny('hg.admin', 'repository.admin')() or owner:
             reviewers_ids = map(int, filter(lambda v: v not in [None, ''],
                        request.POST.get('reviewers_ids', '').split(',')))
 
             PullRequestModel().update_reviewers(pull_request_id, reviewers_ids)
             Session().commit()
             return True
         raise HTTPForbidden()
 
     @NotAnonymous()
     @jsonify
     def delete(self, repo_name, pull_request_id):
         pull_request = PullRequest.get_or_404(pull_request_id)
         #only owner can delete it !
         if pull_request.author.user_id == c.rhodecode_user.user_id:
             PullRequestModel().delete(pull_request)
             Session().commit()
             h.flash(_('Successfully deleted pull request'),
                     category='success')
             return redirect(url('admin_settings_my_account', anchor='pullrequests'))
         raise HTTPForbidden()
 
     def _load_compare_data(self, pull_request, enable_comments=True):
         """
         Load context data needed for generating compare diff
 
         :param pull_request:
         :type pull_request:
         """
         rev_start = request.GET.get('rev_start')
         rev_end = request.GET.get('rev_end')
 
         org_repo = pull_request.org_repo
         (org_ref_type,
          org_ref_name,
          org_ref_rev) = pull_request.org_ref.split(':')
 
         other_repo = org_repo
         (other_ref_type,
          other_ref_name,
          other_ref_rev) = pull_request.other_ref.split(':')
 
         # despite opening revisions for bookmarks/branches/tags, we always
         # convert this to rev to prevent changes after book or branch change
         org_ref = ('rev', org_ref_rev)
         other_ref = ('rev', other_ref_rev)
 
         c.org_repo = org_repo
         c.other_repo = other_repo
 
         c.fulldiff = fulldiff = request.GET.get('fulldiff')
 
         c.cs_ranges = [org_repo.get_changeset(x) for x in pull_request.revisions]
 
         other_ref = ('rev', getattr(c.cs_ranges[0].parents[0]
                                   if c.cs_ranges[0].parents
                                   else EmptyChangeset(), 'raw_id'))
 
         c.statuses = org_repo.statuses([x.raw_id for x in c.cs_ranges])
         c.target_repo = c.repo_name
         # defines that we need hidden inputs with changesets
         c.as_form = request.GET.get('as_form', False)
 
         c.org_ref = org_ref[1]
         c.other_ref = other_ref[1]
 
         diff_limit = self.cut_off_limit if not fulldiff else None
 
         #we swap org/other ref since we run a simple diff on one repo
         _diff = diffs.differ(org_repo, other_ref, other_repo, org_ref)
 
         diff_processor = diffs.DiffProcessor(_diff or '', format='gitdiff',
                                              diff_limit=diff_limit)
         _parsed = diff_processor.prepare()
 
         c.limited_diff = False
         if isinstance(_parsed, LimitedDiffContainer):
             c.limited_diff = True
 
         c.files = []
         c.changes = {}
         c.lines_added = 0
         c.lines_deleted = 0
         for f in _parsed:
             st = f['stats']
             if st[0] != 'b':
                 c.lines_added += st[0]
                 c.lines_deleted += st[1]
             fid = h.FID('', f['filename'])
             c.files.append([fid, f['operation'], f['filename'], f['stats']])
             diff = diff_processor.as_html(enable_comments=enable_comments,
                                           parsed_lines=[f])
             c.changes[fid] = [f['operation'], f['filename'], diff]
 
     def show(self, repo_name, pull_request_id):
         repo_model = RepoModel()
         c.users_array = repo_model.get_users_js()
         c.users_groups_array = repo_model.get_users_groups_js()
         c.pull_request = PullRequest.get_or_404(pull_request_id)
         c.target_repo = c.pull_request.org_repo.repo_name
-
+        c.allowed_to_change_status = self._get_is_allowed_change_status(c.pull_request)
         cc_model = ChangesetCommentsModel()
         cs_model = ChangesetStatusModel()
         _cs_statuses = cs_model.get_statuses(c.pull_request.org_repo,
                                             pull_request=c.pull_request,
                                             with_revisions=True)
 
         cs_statuses = defaultdict(list)
         for st in _cs_statuses:
             cs_statuses[st.author.username] += [st]
 
         c.pull_request_reviewers = []
         c.pull_request_pending_reviewers = []
         for o in c.pull_request.reviewers:
             st = cs_statuses.get(o.user.username, None)
             if st:
                 sorter = lambda k: k.version
                 st = [(x, list(y)[0])
                       for x, y in (groupby(sorted(st, key=sorter), sorter))]
             else:
                 c.pull_request_pending_reviewers.append(o.user)
             c.pull_request_reviewers.append([o.user, st])
 
         # pull_requests repo_name we opened it against
         # ie. other_repo must match
         if repo_name != c.pull_request.other_repo.repo_name:
             raise HTTPNotFound
 
         # load compare data into template context
         enable_comments = not c.pull_request.is_closed()
         self._load_compare_data(c.pull_request, enable_comments=enable_comments)
 
         # inline comments
         c.inline_cnt = 0
         c.inline_comments = cc_model.get_inline_comments(
                                 c.rhodecode_db_repo.repo_id,
                                 pull_request=pull_request_id)
         # count inline comments
         for __, lines in c.inline_comments:
             for comments in lines.values():
                 c.inline_cnt += len(comments)
         # comments
         c.comments = cc_model.get_comments(c.rhodecode_db_repo.repo_id,
                                            pull_request=pull_request_id)
 
         try:
             cur_status = c.statuses[c.pull_request.revisions[0]][0]
         except:
             log.error(traceback.format_exc())
             cur_status = 'undefined'
         if c.pull_request.is_closed() and 0:
             c.current_changeset_status = cur_status
         else:
             # changeset(pull-request) status calulation based on reviewers
             c.current_changeset_status = cs_model.calculate_status(
                                             c.pull_request_reviewers,
                                          )
         c.changeset_statuses = ChangesetStatus.STATUSES
 
         return render('/pullrequests/pullrequest_show.html')
 
     @NotAnonymous()
     @jsonify
     def comment(self, repo_name, pull_request_id):
         pull_request = PullRequest.get_or_404(pull_request_id)
         if pull_request.is_closed():
             raise HTTPForbidden()
 
         status = request.POST.get('changeset_status')
         change_status = request.POST.get('change_changeset_status')
         text = request.POST.get('text')
-        if status and change_status:
+
+        allowed_to_change_status = self._get_is_allowed_change_status(pull_request)
+        if status and change_status and allowed_to_change_status:
             text = text or (_('Status change -> %s')
                             % ChangesetStatus.get_status_lbl(status))
         comm = ChangesetCommentsModel().create(
             text=text,
             repo=c.rhodecode_db_repo.repo_id,
             user=c.rhodecode_user.user_id,
             pull_request=pull_request_id,
             f_path=request.POST.get('f_path'),
             line_no=request.POST.get('line'),
             status_change=(ChangesetStatus.get_status_lbl(status)
-                           if status and change_status else None)
+            if status and change_status and allowed_to_change_status else None)
         )
 
-        # get status if set !
-        if status and change_status:
-            ChangesetStatusModel().set_status(
-                c.rhodecode_db_repo.repo_id,
-                status,
-                c.rhodecode_user.user_id,
-                comm,
-                pull_request=pull_request_id
-            )
         action_logger(self.rhodecode_user,
                       'user_commented_pull_request:%s' % pull_request_id,
                       c.rhodecode_db_repo, self.ip_addr, self.sa)
 
-        if request.POST.get('save_close'):
-            PullRequestModel().close_pull_request(pull_request_id)
-            action_logger(self.rhodecode_user,
-                      'user_closed_pull_request:%s' % pull_request_id,
-                      c.rhodecode_db_repo, self.ip_addr, self.sa)
+        if allowed_to_change_status:
+            # get status if set !
+            if status and change_status:
+                ChangesetStatusModel().set_status(
+                    c.rhodecode_db_repo.repo_id,
+                    status,
+                    c.rhodecode_user.user_id,
+                    comm,
+                    pull_request=pull_request_id
+                )
+
+            if request.POST.get('save_close'):
+                if status in ['rejected', 'approved']:
+                    PullRequestModel().close_pull_request(pull_request_id)
+                    action_logger(self.rhodecode_user,
+                              'user_closed_pull_request:%s' % pull_request_id,
+                              c.rhodecode_db_repo, self.ip_addr, self.sa)
+                else:
+                    h.flash(_('Closing pull request on other statuses than '
+                              'rejected or approved forbidden'),
+                            category='warning')
 
         Session().commit()
 
         if not request.environ.get('HTTP_X_PARTIAL_XHR'):
             return redirect(h.url('pullrequest_show', repo_name=repo_name,
                                   pull_request_id=pull_request_id))
 
         data = {
            'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),
         }
         if comm:
             c.co = comm
             data.update(comm.get_dict())
             data.update({'rendered_text':
                          render('changeset/changeset_comment_block.html')})
 
         return data
 
     @NotAnonymous()
     @jsonify
     def delete_comment(self, repo_name, comment_id):
         co = ChangesetComment.get(comment_id)
         if co.pull_request.is_closed():
             #don't allow deleting comments on closed pull request
             raise HTTPForbidden()
 
         owner = lambda: co.author.user_id == c.rhodecode_user.user_id
         if h.HasPermissionAny('hg.admin', 'repository.admin')() or owner:
             ChangesetCommentsModel().delete(comment=co)
             Session().commit()
             return True
         else:
             raise HTTPForbidden()

rhodecode/controllers/settings.py

@@ -1,206 +1,196 b''
 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.settings
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Settings controller for rhodecode
 
     :created_on: Jun 30, 2010
     :author: marcink
     :copyright: (C) 2010-2012 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 import traceback
 import formencode
 
 from formencode import htmlfill
 
 from pylons import tmpl_context as c, request, url
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 
 import rhodecode.lib.helpers as h
 
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAllDecorator,\
     HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import invalidate_cache, action_logger
 
 from rhodecode.model.forms import RepoSettingsForm
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.db import RepoGroup, Repository
 from rhodecode.model.meta import Session
 from rhodecode.model.scm import ScmModel
 
 log = logging.getLogger(__name__)
 
 
 class SettingsController(BaseRepoController):
 
     @LoginRequired()
     def __before__(self):
         super(SettingsController, self).__before__()
 
     def __load_defaults(self):
         c.repo_groups = RepoGroup.groups_choices(check_perms=True)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
 
         repo_model = RepoModel()
         c.users_array = repo_model.get_users_js()
         c.users_groups_array = repo_model.get_users_groups_js()
         choices, c.landing_revs = ScmModel().get_repo_landing_revs()
         c.landing_revs_choices = choices
 
     def __load_data(self, repo_name=None):
         """
         Load defaults settings for edit, and update
 
         :param repo_name:
         """
         self.__load_defaults()
 
         c.repo_info = db_repo = Repository.get_by_repo_name(repo_name)
         repo = db_repo.scm_instance
 
         if c.repo_info is None:
-            h.flash(_('%s repository is not mapped to db perhaps'
-                      ' it was created or renamed from the filesystem'
-                      ' please run the application again'
-                      ' in order to rescan repositories') % repo_name,
-                      category='error')
-
+            h.not_mapped_error(repo_name)
             return redirect(url('home'))
 
         ##override defaults for exact repo info here git/hg etc
         choices, c.landing_revs = ScmModel().get_repo_landing_revs(c.repo_info)
         c.landing_revs_choices = choices
 
         defaults = RepoModel()._get_defaults(repo_name)
 
         return defaults
 
     @HasRepoPermissionAllDecorator('repository.admin')
     def index(self, repo_name):
         defaults = self.__load_data(repo_name)
 
         return htmlfill.render(
             render('settings/repo_settings.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
         )
 
     @HasRepoPermissionAllDecorator('repository.admin')
     def update(self, repo_name):
         self.__load_defaults()
         repo_model = RepoModel()
         changed_name = repo_name
         #override the choices with extracted revisions !
         choices, c.landing_revs = ScmModel().get_repo_landing_revs(repo_name)
         c.landing_revs_choices = choices
 
         _form = RepoSettingsForm(edit=True,
                                  old_data={'repo_name': repo_name},
                                  repo_groups=c.repo_groups_choices,
                                  landing_revs=c.landing_revs_choices)()
         try:
             form_result = _form.to_python(dict(request.POST))
             repo_model.update(repo_name, **form_result)
             invalidate_cache('get_repo_cached_%s' % repo_name)
             h.flash(_('Repository %s updated successfully') % repo_name,
                     category='success')
             changed_name = form_result['repo_name_full']
             action_logger(self.rhodecode_user, 'user_updated_repo',
                           changed_name, self.ip_addr, self.sa)
             Session().commit()
         except formencode.Invalid, errors:
             defaults = self.__load_data(repo_name)
             defaults.update(errors.value)
             return htmlfill.render(
                 render('settings/repo_settings.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
 
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('error occurred during update of repository %s') \
                     % repo_name, category='error')
 
         return redirect(url('repo_settings_home', repo_name=changed_name))
 
     @HasRepoPermissionAllDecorator('repository.admin')
     def delete(self, repo_name):
         """DELETE /repos/repo_name: Delete an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="DELETE" />
         # Or using helpers:
         #    h.form(url('repo_settings_delete', repo_name=ID),
         #           method='delete')
         # url('repo_settings_delete', repo_name=ID)
 
         repo_model = RepoModel()
         repo = repo_model.get_by_repo_name(repo_name)
         if not repo:
-            h.flash(_('%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') % repo_name,
-                      category='error')
-
+            h.not_mapped_error(repo_name)
             return redirect(url('home'))
         try:
             action_logger(self.rhodecode_user, 'user_deleted_repo',
                               repo_name, self.ip_addr, self.sa)
             repo_model.delete(repo)
             invalidate_cache('get_repo_cached_%s' % repo_name)
             h.flash(_('deleted repository %s') % repo_name, category='success')
             Session().commit()
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of %s') % repo_name,
                     category='error')
 
         return redirect(url('admin_settings_my_account', anchor='my'))
 
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     def toggle_locking(self, repo_name):
         """
         Toggle locking of repository by simple GET call to url
 
         :param repo_name:
         """
 
         try:
             repo = Repository.get_by_repo_name(repo_name)
 
             if repo.enable_locking:
                 if repo.locked[0]:
                     Repository.unlock(repo)
                     action = _('unlocked')
                 else:
                     Repository.lock(repo, c.rhodecode_user.user_id)
                     action = _('locked')
 
                 h.flash(_('Repository has been %s') % action,
                         category='success')
         except Exception, e:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during unlocking'),
                     category='error')
         return redirect(url('summary_home', repo_name=repo_name))

rhodecode/i18n/en/LC_MESSAGES/rhodecode.po

@@ -1,4173 +1,4212 b''
 # English translations for rhodecode.
 # Copyright (C) 2010 ORGANIZATION
 # This file is distributed under the same license as the rhodecode project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rhodecode 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-12-03 03:21+0100\n"
+"POT-Creation-Date: 2012-12-14 04:19+0100\n"
 "PO-Revision-Date: 2011-02-25 19:13+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <[e-mail]>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
 #: rhodecode/controllers/changelog.py:95
 msgid "All Branches"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:84
+#: rhodecode/controllers/changeset.py:83
 msgid "show white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
+#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
 msgid "ignore white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:164
+#: rhodecode/controllers/changeset.py:163
 #, python-format
 msgid "%s line context"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:315
-#: rhodecode/controllers/pullrequests.py:411
+#: rhodecode/controllers/changeset.py:314
+#: rhodecode/controllers/pullrequests.py:417
 #, python-format
 msgid "Status change -> %s"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:346
+#: rhodecode/controllers/changeset.py:345
 msgid ""
 "Changing status on a changeset associated witha closed pull request is "
 "not allowed"
 msgstr ""
 
 #: rhodecode/controllers/compare.py:75
-#: rhodecode/controllers/pullrequests.py:117
+#: rhodecode/controllers/pullrequests.py:121
 #: rhodecode/controllers/shortlog.py:100
 msgid "There are no changesets yet"
 msgstr ""
 
 #: rhodecode/controllers/error.py:69
 msgid "Home page"
 msgstr ""
 
 #: rhodecode/controllers/error.py:98
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr ""
 
 #: rhodecode/controllers/error.py:101
 msgid "Unauthorized access to resource"
 msgstr ""
 
 #: rhodecode/controllers/error.py:103
 msgid "You don't have permission to view this page"
 msgstr ""
 
 #: rhodecode/controllers/error.py:105
 msgid "The resource could not be found"
 msgstr ""
 
 #: rhodecode/controllers/error.py:107
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr ""
 
 #: rhodecode/controllers/feed.py:52
 #, python-format
 msgid "Changes on %s repository"
 msgstr ""
 
 #: rhodecode/controllers/feed.py:53
 #, python-format
 msgid "%s %s feed"
 msgstr ""
 
 #: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:126
-#: rhodecode/templates/changeset/changeset.html:138
+#: rhodecode/templates/changeset/changeset.html:137
+#: 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
 msgid "Changeset was too big and was cut off..."
 msgstr ""
 
 #: rhodecode/controllers/feed.py:92
 msgid "commited on"
 msgstr ""
 
 #: rhodecode/controllers/files.py:86
 msgid "click here to add new file"
 msgstr ""
 
 #: rhodecode/controllers/files.py:87
 #, python-format
 msgid "There are no files yet %s"
 msgstr ""
 
 #: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr ""
 
 #: rhodecode/controllers/files.py:292
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr ""
 
 #: rhodecode/controllers/files.py:297
 msgid "No changes"
 msgstr ""
 
 #: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372
 #, python-format
 msgid "Successfully committed to %s"
 msgstr ""
 
 #: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378
 msgid "Error occurred during commit"
 msgstr ""
 
 #: rhodecode/controllers/files.py:344
 #, python-format
 msgid "Added %s via RhodeCode"
 msgstr ""
 
 #: rhodecode/controllers/files.py:358
 msgid "No content"
 msgstr ""
 
 #: rhodecode/controllers/files.py:362
 msgid "No filename"
 msgstr ""
 
 #: rhodecode/controllers/files.py:404
 msgid "downloads disabled"
 msgstr ""
 
 #: rhodecode/controllers/files.py:415
 #, python-format
 msgid "Unknown revision %s"
 msgstr ""
 
 #: rhodecode/controllers/files.py:417
 msgid "Empty repository"
 msgstr ""
 
 #: rhodecode/controllers/files.py:419
 msgid "Unknown archive type"
 msgstr ""
 
 #: rhodecode/controllers/files.py:564
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76
+#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74
 #: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80
+#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78
 #: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:92
-#, python-format
-msgid ""
-"%s repository is not mapped to db perhaps it was created or renamed from "
-"the filesystem please run the application again in order to rescan "
-"repositories"
-msgstr ""
-
-#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73
-#, python-format
-msgid ""
-"%s repository is not mapped to db perhaps it was created or renamed from "
-"the file system please run the application again in order to rescan "
-"repositories"
-msgstr ""
-
-#: rhodecode/controllers/forks.py:168
+#: rhodecode/controllers/forks.py:158
 #, python-format
 msgid "forked %s repository as %s"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:182
+#: rhodecode/controllers/forks.py:172
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243
+#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261
 msgid "public journal"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247
+#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265
 #: rhodecode/templates/base/base.html:232
+#: rhodecode/templates/journal/journal.html:12
 msgid "journal"
 msgstr ""
 
 #: rhodecode/controllers/login.py:143
 msgid "You have successfully registered into rhodecode"
 msgstr ""
 
 #: rhodecode/controllers/login.py:164
 msgid "Your password reset link was sent"
 msgstr ""
 
 #: rhodecode/controllers/login.py:184
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556
+#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:186
+#: rhodecode/controllers/pullrequests.py:190
 msgid "Pull request requires a title with min. 3 chars"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:188
+#: rhodecode/controllers/pullrequests.py:192
 msgid "error during creation of pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:220
+#: rhodecode/controllers/pullrequests.py:224
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:223
+#: rhodecode/controllers/pullrequests.py:227
 msgid "Error occurred during sending pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:256
+#: rhodecode/controllers/pullrequests.py:260
 msgid "Successfully deleted pull request"
 msgstr ""
 
+#: rhodecode/controllers/pullrequests.py:452
+msgid "Closing pull request on other statuses than rejected or approved forbidden"
+msgstr ""
+
 #: rhodecode/controllers/search.py:134
 msgid "Invalid search query. Try quoting it."
 msgstr ""
 
 #: rhodecode/controllers/search.py:139
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr ""
 
 #: rhodecode/controllers/search.py:143
 msgid "An error occurred during this search operation"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:108
-#: rhodecode/controllers/admin/repos.py:268
+#: rhodecode/controllers/settings.py:119
+#: rhodecode/controllers/admin/repos.py:272
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:126
-#: rhodecode/controllers/admin/repos.py:286
+#: rhodecode/controllers/settings.py:137
+#: rhodecode/controllers/admin/repos.py:290
 #, python-format
 msgid "error occurred during update of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:144
-#: rhodecode/controllers/admin/repos.py:304
-#, python-format
-msgid ""
-"%s repository is not mapped to db perhaps it was moved or renamed  from "
-"the filesystem please run the application again in order to rescan "
-"repositories"
-msgstr ""
-
-#: rhodecode/controllers/settings.py:156
-#: rhodecode/controllers/admin/repos.py:316
+#: rhodecode/controllers/settings.py:162
+#: rhodecode/controllers/admin/repos.py:315
 #, python-format
 msgid "deleted repository %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:160
-#: rhodecode/controllers/admin/repos.py:326
-#: rhodecode/controllers/admin/repos.py:332
+#: rhodecode/controllers/settings.py:166
+#: rhodecode/controllers/admin/repos.py:325
+#: rhodecode/controllers/admin/repos.py:331
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:179
+#: rhodecode/controllers/settings.py:185
 msgid "unlocked"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:182
-msgid "locked"
-msgstr ""
-
-#: rhodecode/controllers/settings.py:184
-#, python-format
-msgid "Repository has been %s"
-msgstr ""
-
 #: rhodecode/controllers/settings.py:188
-#: rhodecode/controllers/admin/repos.py:424
+msgid "locked"
+msgstr ""
+
+#: rhodecode/controllers/settings.py:190
+#, python-format
+msgid "Repository has been %s"
+msgstr ""
+
+#: rhodecode/controllers/settings.py:194
+#: rhodecode/controllers/admin/repos.py:423
 msgid "An error occurred during unlocking"
 msgstr ""
 
 #: rhodecode/controllers/summary.py:140
 msgid "No data loaded yet"
 msgstr ""
 
 #: rhodecode/controllers/summary.py:144
 #: rhodecode/templates/summary/summary.html:157
 msgid "Statistics are disabled for this repository"
 msgstr ""
 
 #: rhodecode/controllers/admin/defaults.py:96
 msgid "Default settings updated successfully"
 msgstr ""
 
 #: rhodecode/controllers/admin/defaults.py:110
 msgid "error occurred during update of defaults"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:50
 msgid "BASE"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:51
 msgid "ONELEVEL"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:52
 msgid "SUBTREE"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:56
 msgid "NEVER"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:57
 msgid "ALLOW"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:58
 msgid "TRY"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:59
 msgid "DEMAND"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:60
 msgid "HARD"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:64
 msgid "No encryption"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:65
 msgid "LDAPS connection"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:66
 msgid "START_TLS on LDAP connection"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:126
 msgid "Ldap settings updated successfully"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:130
 msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:147
 msgid "error occurred during update of ldap settings"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:59
 #: rhodecode/controllers/admin/permissions.py:63
 msgid "None"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:60
 #: rhodecode/controllers/admin/permissions.py:64
 msgid "Read"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
 msgid "Write"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:62
 #: rhodecode/controllers/admin/permissions.py:66
 #: rhodecode/templates/admin/defaults/defaults.html:9
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
 #: rhodecode/templates/admin/repos/repo_add.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:9
 #: rhodecode/templates/admin/repos/repos.html:9
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
 #: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:9
 #: rhodecode/templates/admin/users/user_add.html:8
 #: rhodecode/templates/admin/users/user_edit.html:9
 #: rhodecode/templates/admin/users/user_edit.html:126
 #: 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
 msgid "Admin"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:69
 msgid "disabled"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:71
 msgid "allowed with manual account activation"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:73
 msgid "allowed with automatic account activation"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:75
 #: rhodecode/controllers/admin/permissions.py:78
 msgid "Disabled"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:76
 #: rhodecode/controllers/admin/permissions.py:79
 msgid "Enabled"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:122
 msgid "Default permissions updated successfully"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:136
 msgid "error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:125
+#: rhodecode/controllers/admin/repos.py:121
 msgid "--REMOVE FORK--"
 msgstr ""
 
+#: rhodecode/controllers/admin/repos.py:190
+#, python-format
+msgid "created repository %s from %s"
+msgstr ""
+
 #: rhodecode/controllers/admin/repos.py:194
 #, python-format
-msgid "created repository %s from %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:198
-#, python-format
 msgid "created repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:229
+#: rhodecode/controllers/admin/repos.py:225
 #, python-format
 msgid "error occurred during creation of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:321
+#: rhodecode/controllers/admin/repos.py:320
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:350
+#: rhodecode/controllers/admin/repos.py:349
 msgid "An error occurred during deletion of repository user"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:369
+#: rhodecode/controllers/admin/repos.py:368
 msgid "An error occurred during deletion of repository users groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:387
+#: rhodecode/controllers/admin/repos.py:386
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:404
+#: rhodecode/controllers/admin/repos.py:403
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:444
+#: rhodecode/controllers/admin/repos.py:443
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:448
+#: rhodecode/controllers/admin/repos.py:447
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:453 rhodecode/model/validators.py:300
+#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300
 msgid "Token mismatch"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:466
+#: rhodecode/controllers/admin/repos.py:465
 msgid "Pulled from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:468
+#: rhodecode/controllers/admin/repos.py:467
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:484
+#: rhodecode/controllers/admin/repos.py:483
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:486
+#: rhodecode/controllers/admin/repos.py:485
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:490
+#: rhodecode/controllers/admin/repos.py:489
 msgid "An error occurred during this operation"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos_groups.py:120
 #, python-format
 msgid "created repos group %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos_groups.py:133
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos_groups.py:167
 #, python-format
 msgid "updated repos group %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos_groups.py:180
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos_groups.py:198
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos_groups.py:206
 #, python-format
 msgid "removed repos group %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos_groups.py:212
 msgid "Cannot delete this group it still contains subgroups"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos_groups.py:217
 #: rhodecode/controllers/admin/repos_groups.py:222
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos_groups.py:243
 msgid "An error occurred during deletion of group user"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos_groups.py:264
 msgid "An error occurred during deletion of group users groups"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:123
 #, python-format
 msgid "Repositories successfully rescanned added: %s,removed: %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:131
 msgid "Whoosh reindex task scheduled"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:162
 msgid "Updated application settings"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:166
 #: rhodecode/controllers/admin/settings.py:299
 msgid "error occurred during updating application settings"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:207
 msgid "Updated visualisation settings"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:212
 msgid "error occurred during updating visualisation settings"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:295
 msgid "Updated VCS settings"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:309
 msgid "Added new hook"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:321
 msgid "Updated hooks"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:325
 msgid "error occurred during hook creation"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:344
 msgid "Email task created"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:399
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:430
 msgid "Your account was updated successfully"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:445
 #: rhodecode/controllers/admin/users.py:196
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:130
 #, python-format
 msgid "created user %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "error occurred during creation of user %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:176
 msgid "User updated successfully"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:212
 msgid "successfully deleted user"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:217
 msgid "An error occurred during deletion of user"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:231
 msgid "You can't edit this user"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:272
 msgid "Granted 'repository create' permission to user"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:277
 msgid "Revoked 'repository create' permission to user"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:283
 msgid "Granted 'repository fork' permission to user"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:288
 msgid "Revoked 'repository fork' permission to user"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:294
 #: rhodecode/controllers/admin/users_groups.py:279
 msgid "An error occurred during permissions saving"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:309
 #, python-format
 msgid "Added email %s to user"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:315
 msgid "An error occurred during email saving"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:325
 msgid "Removed email from user"
 msgstr ""
 
 #: rhodecode/controllers/admin/users_groups.py:86
 #, python-format
 msgid "created users group %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users_groups.py:97
 #, python-format
 msgid "error occurred during creation of users group %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users_groups.py:164
 #, python-format
 msgid "updated users group %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users_groups.py:186
 #, python-format
 msgid "error occurred during update of users group %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users_groups.py:203
 msgid "successfully deleted users group"
 msgstr ""
 
 #: rhodecode/controllers/admin/users_groups.py:208
 msgid "An error occurred during deletion of users group"
 msgstr ""
 
 #: rhodecode/controllers/admin/users_groups.py:257
 msgid "Granted 'repository create' permission to users group"
 msgstr ""
 
 #: rhodecode/controllers/admin/users_groups.py:262
 msgid "Revoked 'repository create' permission to users group"
 msgstr ""
 
 #: rhodecode/controllers/admin/users_groups.py:268
 msgid "Granted 'repository fork' permission to users group"
 msgstr ""
 
 #: rhodecode/controllers/admin/users_groups.py:273
 msgid "Revoked 'repository fork' permission to users group"
 msgstr ""
 
 #: rhodecode/lib/auth.py:499
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
 #: rhodecode/lib/auth.py:540
 msgid "You need to be a signed in to view this page"
 msgstr ""
 
 #: rhodecode/lib/diffs.py:74
 msgid "binary file"
 msgstr ""
 
 #: rhodecode/lib/diffs.py:90
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 
 #: rhodecode/lib/diffs.py:100
 msgid "No changes detected"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:373
+#: rhodecode/lib/helpers.py:374
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:485
+#: rhodecode/lib/helpers.py:486
 msgid "True"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:489
+#: rhodecode/lib/helpers.py:490
 msgid "False"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:529
+#: rhodecode/lib/helpers.py:530
 #, python-format
 msgid "Deleted branch: %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:532
+#: rhodecode/lib/helpers.py:533
 #, python-format
 msgid "Created tag: %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:545
+#: rhodecode/lib/helpers.py:546
 msgid "Changeset not found"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:588
+#: rhodecode/lib/helpers.py:589
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:594
+#: rhodecode/lib/helpers.py:595
 msgid "compare view"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:614
-msgid "and"
-msgstr ""
-
 #: rhodecode/lib/helpers.py:615
+msgid "and"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:616
 #, python-format
 msgid "%s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51
+#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51
 msgid "revisions"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:640
+#: rhodecode/lib/helpers.py:641
 #, python-format
 msgid "fork name %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:653
+#: rhodecode/lib/helpers.py:658
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
 #: rhodecode/templates/pullrequests/pullrequest_show.html:12
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:659
+#: rhodecode/lib/helpers.py:664
 msgid "[deleted] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671
+#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676
 msgid "[created] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:663
+#: rhodecode/lib/helpers.py:668
 msgid "[created] repository as fork"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673
+#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678
 msgid "[forked] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675
+#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680
 msgid "[updated] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:669
+#: rhodecode/lib/helpers.py:674
 msgid "[delete] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:677
+#: rhodecode/lib/helpers.py:682
 msgid "[created] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:679
+#: rhodecode/lib/helpers.py:684
 msgid "[updated] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:681
+#: rhodecode/lib/helpers.py:686
 msgid "[created] users group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:683
+#: rhodecode/lib/helpers.py:688
 msgid "[updated] users group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:685
+#: rhodecode/lib/helpers.py:690
 msgid "[commented] on revision in repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:687
+#: rhodecode/lib/helpers.py:692
 msgid "[commented] on pull request for"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:689
+#: rhodecode/lib/helpers.py:694
 msgid "[closed] pull request for"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:691
+#: rhodecode/lib/helpers.py:696
 msgid "[pushed] into"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:693
+#: rhodecode/lib/helpers.py:698
 msgid "[committed via RhodeCode] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:695
+#: rhodecode/lib/helpers.py:700
 msgid "[pulled from remote] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:697
+#: rhodecode/lib/helpers.py:702
 msgid "[pulled] from"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:699
+#: rhodecode/lib/helpers.py:704
 msgid "[started following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:701
+#: rhodecode/lib/helpers.py:706
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:877
+#: rhodecode/lib/helpers.py:883
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:881
+#: rhodecode/lib/helpers.py:887
 msgid "No Files"
 msgstr ""
 
+#: rhodecode/lib/helpers.py:1163
+#, python-format
+msgid ""
+"%s repository is not mapped to db perhaps it was created or renamed from "
+"the filesystem please run the application again in order to rescan "
+"repositories"
+msgstr ""
+
 #: rhodecode/lib/utils2.py:403
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/lib/utils2.py:404
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/lib/utils2.py:405
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/lib/utils2.py:406
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/lib/utils2.py:407
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/lib/utils2.py:408
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/lib/utils2.py:424
 #, python-format
 msgid "in %s"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:426
 #, python-format
 msgid "%s ago"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:428
 #, python-format
 msgid "in %s and %s"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:431
 #, python-format
 msgid "%s and %s ago"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:434
 msgid "just now"
 msgstr ""
 
 #: rhodecode/lib/celerylib/tasks.py:270
 msgid "password reset link"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183
 msgid "Repository no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184
 msgid "Repository read access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185
 msgid "Repository write access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186
 msgid "Repository admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188
 msgid "Repositories Group no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189
 msgid "Repositories Group read access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190
 msgid "Repositories Group write access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191
 msgid "Repositories Group admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193
 msgid "RhodeCode Administrator"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194
 msgid "Repository creation disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195
 msgid "Repository creation enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196
 msgid "Repository forking disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197
 msgid "Repository forking enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198
 msgid "Register disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1196
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1199
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1640
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643
 msgid "Not Reviewed"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1641
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644
 msgid "Approved"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1642
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645
 msgid "Rejected"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646
 msgid "Under Review"
 msgstr ""
 
 #: rhodecode/model/comment.py:110
 #, python-format
 msgid "on line %s"
 msgstr ""
 
 #: rhodecode/model/comment.py:173
 msgid "[Mention]"
 msgstr ""
 
 #: rhodecode/model/forms.py:43
 msgid "Please enter a login"
 msgstr ""
 
 #: rhodecode/model/forms.py:44
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr ""
 
 #: rhodecode/model/forms.py:52
 msgid "Please enter a password"
 msgstr ""
 
 #: rhodecode/model/forms.py:53
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
 #: rhodecode/model/notification.py:220
 #, python-format
 msgid "commented on commit at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:221
 #, python-format
 msgid "sent message at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:222
 #, python-format
 msgid "mentioned you at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:223
 #, python-format
 msgid "registered in RhodeCode at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:224
 #, python-format
 msgid "opened new pull request at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:225
 #, python-format
 msgid "commented on pull request at %(when)s"
 msgstr ""
 
 #: rhodecode/model/pull_request.py:90
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr ""
 
 #: rhodecode/model/scm.py:542
 msgid "latest tip"
 msgstr ""
 
-#: rhodecode/model/user.py:230
+#: rhodecode/model/user.py:232
 msgid "new user registration"
 msgstr ""
 
-#: rhodecode/model/user.py:255 rhodecode/model/user.py:279
-#: rhodecode/model/user.py:301
+#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
+#: rhodecode/model/user.py:303
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:325
+#: rhodecode/model/user.py:327
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:331
+#: rhodecode/model/user.py:333
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories. %s"
 msgstr ""
 
 #: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37
 msgid "Value cannot be an empty list"
 msgstr ""
 
 #: rhodecode/model/validators.py:83
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:85
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr ""
 
 #: rhodecode/model/validators.py:87
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
 msgstr ""
 
 #: rhodecode/model/validators.py:115
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr ""
 
 #: rhodecode/model/validators.py:134
 msgid "Invalid users group name"
 msgstr ""
 
 #: rhodecode/model/validators.py:135
 #, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:137
 msgid ""
 "users group name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr ""
 
 #: rhodecode/model/validators.py:175
 msgid "Cannot assign this group as parent"
 msgstr ""
 
 #: rhodecode/model/validators.py:176
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:178
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:236
 msgid "Invalid characters (non-ascii) in password"
 msgstr ""
 
 #: rhodecode/model/validators.py:251
 msgid "Passwords do not match"
 msgstr ""
 
 #: rhodecode/model/validators.py:268
 msgid "invalid password"
 msgstr ""
 
 #: rhodecode/model/validators.py:269
 msgid "invalid user name"
 msgstr ""
 
 #: rhodecode/model/validators.py:270
 msgid "Your account is disabled"
 msgstr ""
 
 #: rhodecode/model/validators.py:314
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr ""
 
 #: rhodecode/model/validators.py:316
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:317
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr ""
 
 #: rhodecode/model/validators.py:319
 #, python-format
 msgid "Repositories group with name \"%(repo)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:432
 msgid "invalid clone url"
 msgstr ""
 
 #: rhodecode/model/validators.py:433
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 
 #: rhodecode/model/validators.py:458
 msgid "Fork have to be the same type as parent"
 msgstr ""
 
 #: rhodecode/model/validators.py:473
 msgid "You don't have permissions to create repository in this group"
 msgstr ""
 
 #: rhodecode/model/validators.py:498
 msgid "This username or users group name is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:582
+#: rhodecode/model/validators.py:591
 msgid "This is not a valid path"
 msgstr ""
 
-#: rhodecode/model/validators.py:597
+#: rhodecode/model/validators.py:606
 msgid "This e-mail address is already taken"
 msgstr ""
 
-#: rhodecode/model/validators.py:617
+#: rhodecode/model/validators.py:626
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr ""
 
-#: rhodecode/model/validators.py:654
+#: rhodecode/model/validators.py:663
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 
-#: rhodecode/model/validators.py:673
+#: rhodecode/model/validators.py:682
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
 #: rhodecode/templates/index.html:3
 msgid "Dashboard"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/repo_switcher_list.html:4
 #: rhodecode/templates/admin/repos/repos.html:9
 #: rhodecode/templates/admin/users/user_edit_my_account.html:31
 #: rhodecode/templates/admin/users/users.html:9
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 #: rhodecode/templates/branches/branches.html:9
-#: rhodecode/templates/journal/journal.html:40
+#: rhodecode/templates/journal/journal.html:9
+#: rhodecode/templates/journal/journal.html:48
 #: rhodecode/templates/tags/tags.html:10
 msgid "quick filter..."
 msgstr ""
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
 #: rhodecode/templates/base/base.html:233
 msgid "repositories"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:13
 #: rhodecode/templates/index_base.html:15
 #: rhodecode/templates/admin/repos/repos.html:21
 msgid "ADD REPOSITORY"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:29
 #: rhodecode/templates/index_base.html:136
 #: 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_show.html:33
 #: rhodecode/templates/admin/users_groups/users_group_add.html:32
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33
 msgid "Group name"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:30
 #: rhodecode/templates/index_base.html:72
 #: rhodecode/templates/index_base.html:138
 #: rhodecode/templates/index_base.html:176
 #: rhodecode/templates/index_base.html:266
 #: rhodecode/templates/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_groups/repos_groups_add.html:41
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
 #: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:66
 #: rhodecode/templates/summary/summary.html:114
 msgid "Description"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:40
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47
 msgid "Repositories group"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:71
 #: rhodecode/templates/index_base.html:174
 #: rhodecode/templates/index_base.html:264
 #: rhodecode/templates/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/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:62
-#: rhodecode/templates/journal/journal.html:168
+#: rhodecode/templates/journal/journal.html:70
+#: rhodecode/templates/journal/journal.html:196
 #: rhodecode/templates/journal/journal_page_repos.html:7
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
 #: rhodecode/templates/summary/summary.html:132
 #: rhodecode/templates/tags/tags.html:51
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:73
 msgid "Last change"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:74
 #: rhodecode/templates/index_base.html:179
 #: rhodecode/templates/admin/users/user_edit_my_account.html:182
-#: rhodecode/templates/journal/journal.html:170
+#: rhodecode/templates/journal/journal.html:198
 msgid "Tip"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:75
 #: rhodecode/templates/index_base.html:181
 #: rhodecode/templates/index_base.html:269
 #: rhodecode/templates/admin/repos/repo_edit.html:121
 #: rhodecode/templates/admin/repos/repos.html:73
 msgid "Owner"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:76
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:77
 msgid "Atom"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:167
 #: rhodecode/templates/index_base.html:207
 #: rhodecode/templates/index_base.html:291
 #: rhodecode/templates/admin/repos/repos.html:94
 #: rhodecode/templates/admin/users/user_edit_my_account.html:202
 #: rhodecode/templates/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
 #: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:193
+#: rhodecode/templates/journal/journal.html:221
 #: rhodecode/templates/tags/tags.html:77
 msgid "Click to sort ascending"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:168
 #: rhodecode/templates/index_base.html:208
 #: rhodecode/templates/index_base.html:292
 #: rhodecode/templates/admin/repos/repos.html:95
 #: rhodecode/templates/admin/users/user_edit_my_account.html:203
 #: rhodecode/templates/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:194
+#: rhodecode/templates/journal/journal.html:222
 #: rhodecode/templates/tags/tags.html:78
 msgid "Click to sort descending"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:177
 #: rhodecode/templates/index_base.html:267
 msgid "Last Change"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:209
 #: rhodecode/templates/index_base.html:293
 #: rhodecode/templates/admin/repos/repos.html:96
 #: rhodecode/templates/admin/users/user_edit_my_account.html:204
 #: rhodecode/templates/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
 #: rhodecode/templates/branches/branches.html:78
-#: rhodecode/templates/journal/journal.html:195
+#: rhodecode/templates/journal/journal.html:223
 #: rhodecode/templates/tags/tags.html:79
 msgid "No records found."
 msgstr ""
 
 #: rhodecode/templates/index_base.html:210
 #: rhodecode/templates/index_base.html:294
 #: rhodecode/templates/admin/repos/repos.html:97
 #: rhodecode/templates/admin/users/user_edit_my_account.html:205
 #: rhodecode/templates/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:79
-#: rhodecode/templates/journal/journal.html:196
+#: rhodecode/templates/journal/journal.html:224
 #: rhodecode/templates/tags/tags.html:80
 msgid "Data error."
 msgstr ""
 
 #: rhodecode/templates/index_base.html:211
 #: rhodecode/templates/index_base.html:295
 #: rhodecode/templates/admin/repos/repos.html:98
 #: rhodecode/templates/admin/users/user_edit_my_account.html:206
 #: rhodecode/templates/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:80
-#: rhodecode/templates/journal/journal.html:54
-#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/journal/journal.html:62
+#: rhodecode/templates/journal/journal.html:225
 #: rhodecode/templates/tags/tags.html:81
 msgid "Loading..."
 msgstr ""
 
 #: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54
 msgid "Sign In"
 msgstr ""
 
 #: rhodecode/templates/login.html:21
 msgid "Sign In to"
 msgstr ""
 
 #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
 #: rhodecode/templates/admin/admin_log.html:5
 #: rhodecode/templates/admin/users/user_add.html:32
 #: rhodecode/templates/admin/users/user_edit.html:50
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
 #: rhodecode/templates/base/base.html:83
 #: rhodecode/templates/summary/summary.html:131
 msgid "Username"
 msgstr ""
 
 #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
 #: rhodecode/templates/admin/ldap/ldap.html:46
 #: rhodecode/templates/admin/users/user_add.html:41
 #: rhodecode/templates/base/base.html:92
 msgid "Password"
 msgstr ""
 
 #: rhodecode/templates/login.html:50
 msgid "Remember me"
 msgstr ""
 
 #: rhodecode/templates/login.html:60
 msgid "Forgot your password ?"
 msgstr ""
 
 #: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103
 msgid "Don't have an account ?"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:5
 msgid "Reset your password"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:11
 msgid "Reset your password to"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:21
 msgid "Email address"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:30
 msgid "Reset my password"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:31
 msgid "Password reset link will be send to matching email address"
 msgstr ""
 
 #: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74
 msgid "Sign Up"
 msgstr ""
 
 #: rhodecode/templates/register.html:11
 msgid "Sign Up to"
 msgstr ""
 
 #: rhodecode/templates/register.html:38
 msgid "Re-enter password"
 msgstr ""
 
 #: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:59
 #: rhodecode/templates/admin/users/user_edit.html:90
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
 msgid "First Name"
 msgstr ""
 
 #: rhodecode/templates/register.html:56
 #: rhodecode/templates/admin/users/user_add.html:68
 #: rhodecode/templates/admin/users/user_edit.html:99
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
 msgid "Last Name"
 msgstr ""
 
 #: rhodecode/templates/register.html:65
 #: rhodecode/templates/admin/users/user_add.html:77
 #: rhodecode/templates/admin/users/user_edit.html:108
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
 #: rhodecode/templates/summary/summary.html:133
 msgid "Email"
 msgstr ""
 
 #: rhodecode/templates/register.html:76
 msgid "Your account will be activated right after registration"
 msgstr ""
 
 #: rhodecode/templates/register.html:78
 msgid "Your account must wait for activation by administrator"
 msgstr ""
 
 #: rhodecode/templates/repo_switcher_list.html:11
 #: rhodecode/templates/admin/defaults/defaults.html:44
 #: rhodecode/templates/admin/repos/repo_add_base.html:65
 #: rhodecode/templates/admin/repos/repo_edit.html:85
 #: rhodecode/templates/settings/repo_settings.html:76
 msgid "Private repository"
 msgstr ""
 
 #: rhodecode/templates/repo_switcher_list.html:16
 msgid "Public repository"
 msgstr ""
 
 #: rhodecode/templates/switch_to_list.html:3
 #: rhodecode/templates/branches/branches.html:14
 msgid "branches"
 msgstr ""
 
 #: rhodecode/templates/switch_to_list.html:10
 #: rhodecode/templates/branches/branches_data.html:57
 msgid "There are no branches yet"
 msgstr ""
 
 #: rhodecode/templates/switch_to_list.html:15
 #: rhodecode/templates/shortlog/shortlog_data.html:10
 #: rhodecode/templates/tags/tags.html:15
 msgid "tags"
 msgstr ""
 
 #: rhodecode/templates/switch_to_list.html:22
 #: rhodecode/templates/tags/tags_data.html:38
 msgid "There are no tags yet"
 msgstr ""
 
 #: rhodecode/templates/switch_to_list.html:28
 #: rhodecode/templates/bookmarks/bookmarks.html:15
 msgid "bookmarks"
 msgstr ""
 
 #: rhodecode/templates/switch_to_list.html:35
 #: rhodecode/templates/bookmarks/bookmarks_data.html:32
 msgid "There are no bookmarks yet"
 msgstr ""
 
 #: rhodecode/templates/admin/admin.html:5
-#: rhodecode/templates/admin/admin.html:9
+#: rhodecode/templates/admin/admin.html:13
 msgid "Admin journal"
 msgstr ""
 
+#: rhodecode/templates/admin/admin.html:10
+msgid "journal filter..."
+msgstr ""
+
+#: rhodecode/templates/admin/admin.html:12
+#: rhodecode/templates/journal/journal.html:11
+msgid "filter"
+msgstr ""
+
+#: rhodecode/templates/admin/admin.html:13
+#: rhodecode/templates/journal/journal.html:12
+#, python-format
+msgid "%s entry"
+msgid_plural "%s entries"
+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
 msgid "Action"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:7
 #: rhodecode/templates/admin/permissions/permissions.html:41
 msgid "Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:8
 #: rhodecode/templates/bookmarks/bookmarks.html:37
 #: rhodecode/templates/bookmarks/bookmarks_data.html:7
 #: rhodecode/templates/branches/branches.html:51
 #: rhodecode/templates/branches/branches_data.html:7
 #: rhodecode/templates/tags/tags.html:52
 #: rhodecode/templates/tags/tags_data.html:7
 msgid "Date"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:9
 msgid "From IP"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:57
+#: rhodecode/templates/admin/admin_log.html:63
 msgid "No actions yet"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:5
 #: rhodecode/templates/admin/defaults/defaults.html:25
 msgid "Repositories defaults"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:11
 msgid "Defaults"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:35
 #: rhodecode/templates/admin/repos/repo_add_base.html:38
 #: rhodecode/templates/admin/repos/repo_edit.html:58
 msgid "Type"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:48
 #: rhodecode/templates/admin/repos/repo_add_base.html:69
 #: rhodecode/templates/admin/repos/repo_edit.html:89
 #: rhodecode/templates/forks/fork.html:72
 #: rhodecode/templates/settings/repo_settings.html:80
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:55
 #: rhodecode/templates/admin/repos/repo_edit.html:94
 msgid "Enable statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:59
 #: rhodecode/templates/admin/repos/repo_edit.html:98
 msgid "Enable statistics window on summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:65
 #: rhodecode/templates/admin/repos/repo_edit.html:103
 msgid "Enable downloads"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:69
 #: rhodecode/templates/admin/repos/repo_edit.html:107
 msgid "Enable download menu on summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:75
 #: rhodecode/templates/admin/repos/repo_edit.html:112
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
 msgid "Enable locking"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:79
 #: rhodecode/templates/admin/repos/repo_edit.html:116
 msgid "Enable lock-by-pulling on repository."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:84
 #: rhodecode/templates/admin/ldap/ldap.html:89
 #: rhodecode/templates/admin/repos/repo_edit.html:141
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
 #: 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_groups/users_group_edit.html:135
-#: rhodecode/templates/settings/repo_settings.html:93
+#: rhodecode/templates/settings/repo_settings.html:94
 msgid "Save"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:5
 msgid "LDAP administration"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:11
 msgid "Ldap"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:28
 msgid "Connection settings"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:30
 msgid "Enable LDAP"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:34
 msgid "Host"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:38
 msgid "Port"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:42
 msgid "Account"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:50
 msgid "Connection security"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:54
 msgid "Certificate Checks"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:57
 msgid "Search settings"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:59
 msgid "Base DN"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:63
 msgid "LDAP Filter"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:67
 msgid "LDAP Search Scope"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:70
 msgid "Attribute mappings"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:72
 msgid "Login Attribute"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:76
 msgid "First Name Attribute"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:80
 msgid "Last Name Attribute"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:84
 msgid "E-mail Attribute"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:5
 #: rhodecode/templates/admin/notifications/notifications.html:9
 msgid "My Notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:29
 msgid "All"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:30
 #, fuzzy
 msgid "Comments"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
 #: rhodecode/templates/base/base.html:267
 #: rhodecode/templates/base/base.html:269
 msgid "Pull requests"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:35
 msgid "Mark all read"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_data.html:39
 msgid "No notifications here yet"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/show_notification.html:5
 #: rhodecode/templates/admin/notifications/show_notification.html:11
 msgid "Show notification"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/show_notification.html:9
 msgid "Notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:5
 msgid "Permissions administration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:134
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
 #: rhodecode/templates/admin/users/user_edit.html:143
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
 #: rhodecode/templates/settings/repo_settings.html:86
 msgid "Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:24
 msgid "Default permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:31
 msgid "Anonymous access"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:49
 msgid ""
 "All default permissions on each repository will be reset to choosen "
 "permission, note that all custom default permission on repositories will "
 "be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:50
 #: rhodecode/templates/admin/permissions/permissions.html:63
 msgid "overwrite existing settings"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:55
 #: rhodecode/templates/admin/repos/repo_add_base.html:29
 #: rhodecode/templates/admin/repos/repo_edit.html:49
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:4
 #: rhodecode/templates/forks/fork.html:50
 #: rhodecode/templates/settings/repo_settings.html:48
 msgid "Repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:62
 msgid ""
 "All default permissions on each repository group will be reset to choosen"
 " permission, note that all custom default permission on repositories "
 "group will be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:69
 msgid "Registration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:77
 msgid "Repository creation"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:85
 msgid "Repository forking"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:92
 #: rhodecode/templates/admin/repos/repo_edit.html:264
 msgid "set"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add.html:5
 #: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
 msgid "Add repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:11
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
 msgid "Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add.html:13
 msgid "add new"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
 #: rhodecode/templates/summary/summary.html:104
 #: rhodecode/templates/summary/summary.html:105
 msgid "Clone from"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:24
 #: rhodecode/templates/admin/repos/repo_edit.html:44
 #: rhodecode/templates/settings/repo_settings.html:43
 msgid "Optional http[s] url from which repository should be cloned."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:33
 #: rhodecode/templates/forks/fork.html:54
 msgid "Optionaly select a group to put this repository into."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:42
 msgid "Type of repository to create."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:47
 #: rhodecode/templates/admin/repos/repo_edit.html:66
 #: rhodecode/templates/forks/fork.html:41
 #: rhodecode/templates/settings/repo_settings.html:57
 msgid "Landing revision"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:51
 #: rhodecode/templates/admin/repos/repo_edit.html:70
 #: rhodecode/templates/forks/fork.html:45
 #: rhodecode/templates/settings/repo_settings.html:61
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:60
 #: rhodecode/templates/admin/repos/repo_edit.html:79
 #: rhodecode/templates/forks/fork.html:63
 #: rhodecode/templates/settings/repo_settings.html:70
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:73
 msgid "add"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_create_repository.html:9
 msgid "add new repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:5
 msgid "Edit repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:13
 #: rhodecode/templates/admin/users/user_edit.html:13
 #: rhodecode/templates/admin/users/user_edit.html:228
 #: rhodecode/templates/admin/users/user_edit.html:230
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:207
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:209
 #: rhodecode/templates/files/files_source.html:29
 #: rhodecode/templates/journal/journal_page_repos.html:29
 msgid "edit"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:40
 #: rhodecode/templates/settings/repo_settings.html:39
 msgid "Clone uri"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:53
 #: rhodecode/templates/settings/repo_settings.html:52
 msgid "Optional select a group to put this repository into."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:126
 msgid "Change owner of this repository."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:142
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
 #: rhodecode/templates/admin/settings/settings.html:113
 #: rhodecode/templates/admin/settings/settings.html:179
 #: rhodecode/templates/admin/settings/settings.html:269
 #: rhodecode/templates/admin/users/user_edit.html:134
 #: rhodecode/templates/admin/users/user_edit.html:179
 #: rhodecode/templates/admin/users/user_edit.html:282
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136
 #: rhodecode/templates/files/files_add.html:82
 #: rhodecode/templates/files/files_edit.html:68
 #: rhodecode/templates/pullrequests/pullrequest.html:124
-#: rhodecode/templates/settings/repo_settings.html:94
+#: rhodecode/templates/settings/repo_settings.html:95
 msgid "Reset"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:155
 msgid "Statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Reset current statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Confirm to remove current statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:162
 msgid "Fetched to rev"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:163
 msgid "Stats gathered"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:171
 msgid "Remote"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Pull changes from remote location"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Confirm to pull changes from remote side"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:186
 msgid "Cache"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:190
 msgid "Invalidate repository cache"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:190
 msgid "Confirm to invalidate repository cache"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:193
 msgid ""
 "Manually invalidate cache for this repository. On first access repository"
 " will be cached again"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:198
 msgid "List of cached values"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:201
 msgid "Prefix"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:202
 msgid "Key"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:203
 #: rhodecode/templates/admin/users/user_add.html:86
 #: rhodecode/templates/admin/users/user_edit.html:117
 #: rhodecode/templates/admin/users_groups/users_group_add.html:41
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42
 msgid "Active"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:218
 #: rhodecode/templates/base/base.html:331
 #: rhodecode/templates/base/base.html:333
 #: rhodecode/templates/base/base.html:335
 msgid "Public journal"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:224
 msgid "Remove from public journal"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:226
 msgid "Add to public journal"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:231
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:238
 msgid "Locking"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:243
 msgid "Unlock locked repo"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:243
 msgid "Confirm to unlock repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:246
 msgid "lock repo"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:246
 msgid "Confirm to lock repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:247
 msgid "Repository is not locked"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:252
 msgid "Force locking on repository. Works only when anonymous access is disabled"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:259
 msgid "Set as fork of"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:268
 msgid "Manually set this repository as a fork of another from the list"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:274
 #: rhodecode/templates/changeset/changeset_file_comment.html:26
 msgid "Delete"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:278
+#: rhodecode/templates/settings/repo_settings.html:115
 msgid "Remove this repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:278
+#: rhodecode/templates/settings/repo_settings.html:115
 msgid "Confirm to delete this repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:282
+#: rhodecode/templates/settings/repo_settings.html:119
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for RhodeCode and VCS systems.\n"
-"                         If you need fully delete it from filesystem "
-"please do it manually"
+"unaccesible for RhodeCode and VCS systems. If you need fully delete it "
+"from file system please do it manually"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
 msgid "none"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:4
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4
 msgid "read"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:5
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5
 msgid "write"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:6
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
 #: rhodecode/templates/admin/users/users.html:85
 #: rhodecode/templates/base/base.html:229
 msgid "admin"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:7
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7
 msgid "member"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
 #: rhodecode/templates/data_table/_dt_elements.html:67
-#: rhodecode/templates/journal/journal.html:87
+#: rhodecode/templates/journal/journal.html:95
 #: rhodecode/templates/summary/summary.html:85
 msgid "private repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:19
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:28
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18
 msgid "default"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:33
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42
 msgid "revoke"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:83
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67
 msgid "Add another member"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:97
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
 msgid "Failed to remove user"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:112
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103
 msgid "Failed to remove users group"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:5
 msgid "Repositories administration"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73
 msgid "apply to children"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74
 msgid ""
 "Set or revoke permission to all children of that group, including "
 "repositories and other groups"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:9
 #: rhodecode/templates/base/base.html:122
 #: rhodecode/templates/base/base.html:313
 #: rhodecode/templates/base/base.html:315
 #: rhodecode/templates/base/base.html:317
 #: rhodecode/templates/bookmarks/bookmarks.html:11
 #: rhodecode/templates/branches/branches.html:10
 #: rhodecode/templates/changelog/changelog.html:10
 #: rhodecode/templates/changeset/changeset.html:10
 #: rhodecode/templates/changeset/changeset_range.html:9
 #: rhodecode/templates/compare/compare_diff.html:9
 #: rhodecode/templates/files/file_diff.html:8
 #: rhodecode/templates/files/files.html:8
 #: rhodecode/templates/files/files_add.html:15
 #: rhodecode/templates/files/files_edit.html:15
 #: rhodecode/templates/followers/followers.html:9
 #: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9
 #: rhodecode/templates/pullrequests/pullrequest.html:8
 #: rhodecode/templates/pullrequests/pullrequest_show.html:8
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
 #: rhodecode/templates/settings/repo_settings.html:9
 #: rhodecode/templates/shortlog/shortlog.html:10
 #: rhodecode/templates/summary/summary.html:8
 #: rhodecode/templates/tags/tags.html:11
 msgid "Home"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:13
 msgid "with"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
 msgid "Add repos group"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10
 msgid "Repos groups"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12
 msgid "add new repos group"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50
 msgid "Group parent"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58
 #: 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
 msgid "save"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
 msgid "Edit repos group"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12
 msgid "edit repos group"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
 msgid ""
 "Enable lock-by-pulling on group. This option will be applied to all other"
 " groups and repositories inside"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
 msgid "Repositories groups administration"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
 msgid "ADD NEW GROUP"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
 msgid "Number of toplevel repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
 #: rhodecode/templates/admin/users/users.html:87
 #: rhodecode/templates/admin/users_groups/users_groups.html:35
 msgid "action"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
 #: rhodecode/templates/admin/users/user_edit.html:259
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 #: rhodecode/templates/data_table/_dt_elements.html:7
 #: rhodecode/templates/data_table/_dt_elements.html:121
 msgid "delete"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
 #, 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
 msgid "There are no repositories groups yet"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/hooks.html:5
 #: rhodecode/templates/admin/settings/settings.html:5
 msgid "Settings administration"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:9
 #: rhodecode/templates/settings/repo_settings.html:13
 msgid "Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/hooks.html:24
 msgid "Built in hooks - read only"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/hooks.html:40
 msgid "Custom hooks"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/hooks.html:56
 msgid "remove"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/hooks.html:88
 msgid "Failed to remove hook"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:24
 msgid "Remap and rescan repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:32
 msgid "rescan option"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:38
 msgid ""
 "In case a repository was deleted from filesystem and there are leftovers "
 "in the database check this option to scan obsolete data in database and "
 "remove it."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:39
 msgid "destroy old data"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:41
 msgid ""
 "Rescan repositories location for new repositories. Also deletes obsolete "
 "if `destroy` flag is checked "
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:46
 msgid "Rescan repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:52
 msgid "Whoosh indexing"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:60
 msgid "index build option"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:65
 msgid "build from scratch"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:71
 msgid "Reindex"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:77
 msgid "Global application settings"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:86
 msgid "Application name"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:95
 msgid "Realm text"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:104
 msgid "GA code"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:112
 #: rhodecode/templates/admin/settings/settings.html:178
 #: rhodecode/templates/admin/settings/settings.html:268
 msgid "Save settings"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:119
 msgid "Visualisation settings"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:127
 msgid "General"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:132
 msgid "Use lightweight dashboard"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:139
 msgid "Icons"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:144
 msgid "Show public repo icon on repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:148
 msgid "Show private repo icon on repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:155
 msgid "Meta-Tagging"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:160
 msgid "Stylify recognised metatags:"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:187
 msgid "VCS settings"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:196
 msgid "Web"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:201
 msgid "require ssl for vcs operations"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:203
 msgid ""
 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it "
 "will return HTTP Error 406: Not Acceptable"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:209
 msgid "Hooks"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:214
 msgid "Update repository after push (hg update)"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:218
 msgid "Show repository size after push"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:222
 msgid "Log user push commands"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:226
 msgid "Log user pull commands"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:230
 msgid "advanced setup"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:235
 msgid "Mercurial Extensions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:240
 msgid "largefiles extensions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:244
 msgid "hgsubversion extensions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:246
 msgid ""
 "Requires hgsubversion library installed. Allows clonning from svn remote "
 "locations"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:256
 msgid "Repositories location"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:261
 msgid ""
 "This a crucial application setting. If you are really sure you need to "
 "change this, you must restart application in order to make this setting "
 "take effect. Click this label to unlock."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:262
 #: rhodecode/templates/base/base.html:221
 msgid "unlock"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:263
 msgid ""
 "Location where repositories are stored. After changing this value a "
 "restart, and rescan is required"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:283
 msgid "Test Email"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:291
 msgid "Email to"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:299
 msgid "Send"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:305
 msgid "System Info and Packages"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:308
 msgid "show"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:10
 #: rhodecode/templates/admin/users/user_edit.html:11
 msgid "Users"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:12
 msgid "add new user"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:50
 msgid "Password confirmation"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:5
 msgid "Edit user"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:34
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10
 msgid "Change your avatar at"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:35
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:11
 msgid "Using"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:43
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:20
 msgid "API key"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:63
 msgid "LDAP DN"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:72
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:35
 msgid "New password"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:81
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
 msgid "New password confirmation"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:151
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
 msgid "Inherit default permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:156
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113
 #, python-format
 msgid ""
 "Select to inherit permissions from %s settings. With this selected below "
 "options does not have any action"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:162
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:170
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127
 msgid "Fork repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:190
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
 msgid "Nothing here yet"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:197
 #: rhodecode/templates/admin/users/user_edit_my_account.html:60
 #: rhodecode/templates/admin/users/user_edit_my_account.html:217
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:185
 msgid "Permission"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:198
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:186
 msgid "Edit Permission"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:247
 msgid "Email addresses"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:260
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:274
 msgid "New email address"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:281
 msgid "Add"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
 #: rhodecode/templates/base/base.html:124
 msgid "My account"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:9
 msgid "My Account"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:35
 msgid "My permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:41
+#: rhodecode/templates/journal/journal.html:49
 msgid "My repos"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:41
 msgid "My pull requests"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:45
 msgid "Add repo"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
 msgid "Opened by me"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10
 #, python-format
 msgid "Pull request #%s opened on %s"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
 msgid "Confirm to delete this pull request"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26
 msgid "I participate in"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7
 #: rhodecode/templates/bookmarks/bookmarks.html:40
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
 #: rhodecode/templates/branches/branches.html:54
 #: rhodecode/templates/branches/branches_data.html:9
 #: rhodecode/templates/journal/journal_page_repos.html:8
 #: rhodecode/templates/tags/tags.html:55
 #: rhodecode/templates/tags/tags_data.html:9
 msgid "Revision"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
 #: rhodecode/templates/journal/journal_page_repos.html:29
 msgid "private"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31
 #: rhodecode/templates/data_table/_dt_elements.html:7
 #: rhodecode/templates/journal/journal_page_repos.html:32
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38
 #: rhodecode/templates/journal/journal_page_repos.html:42
 msgid "No repositories yet"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40
 #: rhodecode/templates/journal/journal_page_repos.html:44
 msgid "create one now"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:9
 #: rhodecode/templates/base/base.html:235
 msgid "users"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:23
 msgid "ADD NEW USER"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:77
 msgid "username"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:80
 msgid "firstname"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:81
 msgid "lastname"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:82
 msgid "last login"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:84
 #: rhodecode/templates/admin/users_groups/users_groups.html:34
 msgid "active"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:86
 #: rhodecode/templates/base/base.html:238
 msgid "ldap"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:5
 msgid "Add users group"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:10
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
 msgid "Users groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:12
 msgid "add new users group"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:5
 msgid "Edit users group"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:11
 msgid "UsersGroups"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:50
 msgid "Members"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:58
 msgid "Choosen group members"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:61
 msgid "Remove all elements"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:75
 msgid "Available members"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:79
 msgid "Add all elements"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:146
 msgid "Group members"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:163
 msgid "No members yet"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:171
 msgid "Permissions defined for this group"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:178
 msgid "No permissions set yet"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:5
 msgid "Users groups administration"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:23
 msgid "ADD NEW USER GROUP"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:32
 msgid "group name"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:33
 #: rhodecode/templates/base/root.html:46
 msgid "members"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:45
 #, python-format
 msgid "Confirm to delete this users group: %s"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:41
 msgid "Submit a bug"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:77
 msgid "Login to your account"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:100
 msgid "Forgot password ?"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:107
 msgid "Log In"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:118
 msgid "Inbox"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:123
 #: rhodecode/templates/base/base.html:322
 #: rhodecode/templates/base/base.html:324
 #: rhodecode/templates/base/base.html:326
 #: rhodecode/templates/journal/journal.html:4
-#: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
 msgid "Journal"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:125
 msgid "Log Out"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:144
 msgid "Switch repository"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:146
 msgid "Products"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:152
 #: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47
 msgid "loading..."
 msgstr ""
 
 #: rhodecode/templates/base/base.html:158
 #: rhodecode/templates/base/base.html:160
 #: rhodecode/templates/base/base.html:162
 #: rhodecode/templates/data_table/_dt_elements.html:15
 #: rhodecode/templates/data_table/_dt_elements.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
 msgid "Summary"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:166
 #: rhodecode/templates/base/base.html:168
 #: rhodecode/templates/base/base.html:170
 #: 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
 msgid "Changelog"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:175
 #: rhodecode/templates/base/base.html:177
 #: rhodecode/templates/base/base.html:179
 msgid "Switch to"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:186
 #: rhodecode/templates/base/base.html:188
 #: rhodecode/templates/base/base.html:190
 #: rhodecode/templates/data_table/_dt_elements.html:31
 #: rhodecode/templates/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
 msgid "Files"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:195
 #: rhodecode/templates/base/base.html:199
 msgid "Options"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:204
 #: rhodecode/templates/base/base.html:206
 msgid "repository settings"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:210
 #: rhodecode/templates/data_table/_dt_elements.html:80
 #: rhodecode/templates/forks/fork.html:13
 msgid "fork"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50
 #: rhodecode/templates/changelog/changelog.html:43
 msgid "Open new pull request"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:215
 #: rhodecode/templates/forks/forks_data.html:21
 msgid "Compare fork"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:217
 msgid "search"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:223
 msgid "lock"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:234
 msgid "repositories groups"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:236
 msgid "users groups"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:237
 msgid "permissions"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:239
 msgid "defaults"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:240
 msgid "settings"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:251
 #: rhodecode/templates/base/base.html:253
 msgid "Followers"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:259
 #: rhodecode/templates/base/base.html:261
 msgid "Forks"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:340
 #: rhodecode/templates/base/base.html:342
 #: rhodecode/templates/base/base.html:344
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:42
 msgid "add another comment"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:75
+#: rhodecode/templates/journal/journal.html:83
 #: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:44
 #: rhodecode/templates/summary/summary.html:61
 msgid "Start following this repository"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:45
 msgid "Group"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:48
 msgid "search truncated"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:49
 msgid "no matching files"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:51
 msgid "Open new pull request for selected changesets"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:52
 msgid "Show selected changes __S -> __E"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:53
 msgid "Selection link"
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.html:39
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
 #: rhodecode/templates/branches/branches.html:53
 #: rhodecode/templates/branches/branches_data.html:8
 #: rhodecode/templates/tags/tags.html:54
 #: rhodecode/templates/tags/tags_data.html:8
 msgid "Author"
 msgstr ""
 
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
 msgstr ""
 
 #: rhodecode/templates/branches/branches.html:29
 msgid "Compare branches"
 msgstr ""
 
 #: rhodecode/templates/branches/branches.html:56
 #: rhodecode/templates/branches/branches_data.html:10
 #: rhodecode/templates/compare/compare_diff.html:5
 #: rhodecode/templates/compare/compare_diff.html:13
 #: rhodecode/templates/tags/tags.html:57
 #: rhodecode/templates/tags/tags_data.html:10
 msgid "Compare"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:15
 #, python-format
 msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/changelog/changelog.html:37
 msgid "Clear selection"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:40
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
 msgid "compare fork with %s"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:40
 msgid "Compare fork with parent"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:49
 msgid "Show"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:74
 #: rhodecode/templates/summary/summary.html:375
 msgid "show more"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:78
 msgid "Affected number of files, click to show more details"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:91
-#: rhodecode/templates/changeset/changeset.html:44
+#: rhodecode/templates/changeset/changeset.html:65
 #: rhodecode/templates/changeset/changeset_file_comment.html:20
 #: rhodecode/templates/changeset/changeset_range.html:46
 msgid "Changeset status"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:94
 #: rhodecode/templates/shortlog/shortlog_data.html:20
 msgid "Click to open associated pull request"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:104
-#: rhodecode/templates/changeset/changeset.html:85
 msgid "Parent"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:110
-#: rhodecode/templates/changeset/changeset.html:91
+#: rhodecode/templates/changeset/changeset.html:42
 msgid "No parents"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:115
-#: rhodecode/templates/changeset/changeset.html:95
+#: rhodecode/templates/changeset/changeset.html:106
 #: rhodecode/templates/changeset/changeset_range.html:79
 msgid "merge"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:118
-#: rhodecode/templates/changeset/changeset.html:98
+#: rhodecode/templates/changeset/changeset.html:109
 #: rhodecode/templates/changeset/changeset_range.html:82
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_add.html:33
 #: rhodecode/templates/files/files_edit.html:33
 #: rhodecode/templates/shortlog/shortlog_data.html:9
 msgid "branch"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:124
 #: rhodecode/templates/changeset/changeset_range.html:88
 msgid "bookmark"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:130
-#: rhodecode/templates/changeset/changeset.html:103
+#: rhodecode/templates/changeset/changeset.html:114
 #: rhodecode/templates/changeset/changeset_range.html:94
 msgid "tag"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:301
 msgid "There are no changes yet"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:73
+#: rhodecode/templates/changeset/changeset.html:94
 msgid "removed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:74
+#: rhodecode/templates/changeset/changeset.html:95
 msgid "changed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:75
+#: rhodecode/templates/changeset/changeset.html:96
 msgid "added"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:8
 #: rhodecode/templates/changelog/changelog_details.html:9
 #: rhodecode/templates/changelog/changelog_details.html:10
-#: rhodecode/templates/changeset/changeset.html:77
-#: rhodecode/templates/changeset/changeset.html:78
-#: rhodecode/templates/changeset/changeset.html:79
+#: rhodecode/templates/changeset/changeset.html:98
+#: rhodecode/templates/changeset/changeset.html:99
+#: rhodecode/templates/changeset/changeset.html:100
 #, python-format
 msgid "affected %s files"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:6
 #, python-format
 msgid "%s Changeset"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:14
 msgid "Changeset"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:49
+#: rhodecode/templates/changeset/changeset.html:52
+msgid "No children"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:70
 #: rhodecode/templates/changeset/diff_block.html:20
 msgid "raw diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:50
+#: rhodecode/templates/changeset/changeset.html:71
 msgid "patch diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:51
+#: rhodecode/templates/changeset/changeset.html:72
 #: rhodecode/templates/changeset/diff_block.html:21
 msgid "download diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:55
+#: rhodecode/templates/changeset/changeset.html:76
 #: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:55
+#: rhodecode/templates/changeset/changeset.html:76
 #: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:111
+#: rhodecode/templates/changeset/changeset.html:122
 #: rhodecode/templates/compare/compare_diff.html:44
 #: rhodecode/templates/pullrequests/pullrequest_show.html:76
 #, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:113
+#: rhodecode/templates/changeset/changeset.html:124
 #: rhodecode/templates/compare/compare_diff.html:46
 #: rhodecode/templates/pullrequests/pullrequest_show.html:78
 #, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:42
 msgid "Submitting..."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:45
 msgid "Commenting on line {1}."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:46
 #: rhodecode/templates/changeset/changeset_file_comment.html:121
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:48
 #: rhodecode/templates/changeset/changeset_file_comment.html:123
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:59
-#: rhodecode/templates/changeset/changeset_file_comment.html:138
+#: rhodecode/templates/changeset/changeset_file_comment.html:143
 msgid "Comment"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:60
 #: rhodecode/templates/changeset/changeset_file_comment.html:71
 msgid "Hide"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "You need to be logged in to comment."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "Login now"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:118
 msgid "Leave a comment"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:124
+#: rhodecode/templates/changeset/changeset_file_comment.html:125
 msgid "Check this to change current status of code-review for this changeset"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:124
+#: rhodecode/templates/changeset/changeset_file_comment.html:125
 msgid "change status"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:140
+#: rhodecode/templates/changeset/changeset_file_comment.html:145
 msgid "Comment and close"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.html:5
 #, python-format
 msgid "%s Changesets"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.html:29
 #: rhodecode/templates/compare/compare_diff.html:29
 msgid "Compare View"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.html:29
 msgid "Show combined compare"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.html:54
 msgid "Files affected"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:19
 msgid "show full diff for this file"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:27
 msgid "show inline comments"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_cs.html:5
 msgid "No changesets"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.html:37
 #: rhodecode/templates/pullrequests/pullrequest_show.html:69
 #, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/compare/compare_diff.html:52
 #: rhodecode/templates/pullrequests/pullrequest_show.html:84
 msgid "No files"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:39
 #: rhodecode/templates/data_table/_dt_elements.html:41
 #: rhodecode/templates/data_table/_dt_elements.html:43
 msgid "Fork"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:60
-#: rhodecode/templates/journal/journal.html:81
+#: rhodecode/templates/journal/journal.html:89
 #: rhodecode/templates/summary/summary.html:77
 msgid "Mercurial repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:62
-#: rhodecode/templates/journal/journal.html:83
+#: rhodecode/templates/journal/journal.html:91
 #: rhodecode/templates/summary/summary.html:80
 msgid "Git repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:69
-#: rhodecode/templates/journal/journal.html:89
+#: rhodecode/templates/journal/journal.html:97
 #: rhodecode/templates/summary/summary.html:87
 msgid "public repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:80
 #: rhodecode/templates/summary/summary.html:96
 #: rhodecode/templates/summary/summary.html:97
 msgid "Fork of"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:94
 msgid "No changesets yet"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:101
 #: rhodecode/templates/data_table/_dt_elements.html:103
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:109
 #: rhodecode/templates/data_table/_dt_elements.html:111
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:122
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
 
 #: rhodecode/templates/email_templates/changeset_comment.html:10
 msgid "New status$"
 msgstr ""
 
 #: rhodecode/templates/email_templates/main.html:8
 msgid "This is a notification from RhodeCode."
 msgstr ""
 
 #: rhodecode/templates/email_templates/password_reset.html:4
 msgid "Hello"
 msgstr ""
 
 #: rhodecode/templates/email_templates/password_reset.html:6
 msgid "We received a request to create a new password for your account."
 msgstr ""
 
 #: rhodecode/templates/email_templates/password_reset.html:8
 msgid "You can generate it by clicking following URL"
 msgstr ""
 
 #: rhodecode/templates/email_templates/password_reset.html:12
 msgid "If you didn't request new password please ignore this email."
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:4
 #, python-format
 msgid ""
 "User %s opened pull request for repository %s and wants you to review "
 "changes."
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:5
 msgid "title"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:6
 #: rhodecode/templates/pullrequests/pullrequest.html:115
 msgid "description"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:11
 msgid "revisions for reviewing"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:18
 msgid "View this pull request here"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.html:4
 #, python-format
 msgid "User %s commented on pull request #%s for repository %s"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.html:10
 msgid "New status"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.html:14
 msgid "View this comment here"
 msgstr ""
 
 #: rhodecode/templates/email_templates/registration.html:4
 msgid "A new user have registered in RhodeCode"
 msgstr ""
 
 #: rhodecode/templates/email_templates/registration.html:9
 msgid "View this user here"
 msgstr ""
 
 #: rhodecode/templates/errors/error_document.html:46
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr ""
 
 #: rhodecode/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File diff"
 msgstr ""
 
 #: rhodecode/templates/files/file_diff.html:12
 msgid "File diff"
 msgstr ""
 
 #: rhodecode/templates/files/files.html:4
 #: rhodecode/templates/files/files.html:74
 #, python-format
 msgid "%s files"
 msgstr ""
 
 #: rhodecode/templates/files/files.html:12
 #: rhodecode/templates/summary/summary.html:351
 msgid "files"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:4
 #: rhodecode/templates/files/files_edit.html:4
 #, python-format
 msgid "%s Edit file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:19
 msgid "add file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:40
 msgid "Add new file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:45
 msgid "File Name"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:49
 #: rhodecode/templates/files/files_add.html:58
 msgid "or"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:49
 #: rhodecode/templates/files/files_add.html:54
 msgid "Upload file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:58
 msgid "Create new file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:63
 #: rhodecode/templates/files/files_edit.html:39
 #: rhodecode/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:67
 msgid "use / to separate directories"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:77
 #: rhodecode/templates/files/files_edit.html:63
 #: rhodecode/templates/shortlog/shortlog_data.html:6
 msgid "commit message"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:81
 #: rhodecode/templates/files/files_edit.html:67
 msgid "Commit changes"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:13
 msgid "view"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:14
 msgid "previous revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:16
 msgid "next revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:23
 msgid "follow current branch"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:27
 msgid "search file list"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:31
 #: rhodecode/templates/shortlog/shortlog_data.html:78
 msgid "add new file"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:35
 msgid "Loading file list..."
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:48
 msgid "Size"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:49
 msgid "Mimetype"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:50
 msgid "Last Revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:51
 msgid "Last modified"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:52
 msgid "Last commiter"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:19
 msgid "edit file"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:49
 #: rhodecode/templates/files/files_source.html:23
 msgid "show annotation"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:50
 #: rhodecode/templates/files/files_source.html:25
 #: rhodecode/templates/files/files_source.html:53
 msgid "show as raw"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:51
 #: rhodecode/templates/files/files_source.html:26
 msgid "download as raw"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:54
 msgid "source"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:59
 msgid "Editing file"
 msgstr ""
 
 #: rhodecode/templates/files/files_history_box.html:2
 msgid "History"
 msgstr ""
 
 #: rhodecode/templates/files/files_history_box.html:9
 msgid "diff to revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_history_box.html:10
 #, fuzzy
 msgid "show at revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_history_box.html:11
 msgid "show full history"
 msgstr ""
 
 #: rhodecode/templates/files/files_history_box.html:16
 #, fuzzy, python-format
 msgid "%s author"
 msgid_plural "%s authors"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/files/files_source.html:6
 msgid "Load file history"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:21
 msgid "show source"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:44
 #, python-format
 msgid "Binary file (%s)"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:53
 msgid "File is too big to display"
 msgstr ""
 
 #: rhodecode/templates/files/files_ypjax.html:5
 msgid "annotation"
 msgstr ""
 
 #: rhodecode/templates/files/files_ypjax.html:15
 msgid "Go back"
 msgstr ""
 
 #: rhodecode/templates/files/files_ypjax.html:16
 msgid "No files at given path"
 msgstr ""
 
 #: rhodecode/templates/followers/followers.html:5
 #, python-format
 msgid "%s Followers"
 msgstr ""
 
 #: rhodecode/templates/followers/followers.html:13
 msgid "followers"
 msgstr ""
 
 #: rhodecode/templates/followers/followers_data.html:12
 msgid "Started following -"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:5
 #, python-format
 msgid "%s Fork"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:31
 msgid "Fork name"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:68
 msgid "Private"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:77
 msgid "Copy permissions"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:81
 msgid "Copy permissions from forked repository"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:86
 msgid "Update after clone"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:90
 msgid "Checkout source after making a clone"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:94
 msgid "fork this repository"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.html:5
 #, python-format
 msgid "%s Forks"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.html:13
 msgid "forks"
 msgstr ""
 
 #: rhodecode/templates/forks/forks_data.html:17
 msgid "forked"
 msgstr ""
 
 #: rhodecode/templates/forks/forks_data.html:42
 msgid "There are no forks yet"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:13
+#: rhodecode/templates/journal/journal.html:21
 msgid "ATOM journal feed"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:14
+#: rhodecode/templates/journal/journal.html:22
 msgid "RSS journal feed"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:24
+#: rhodecode/templates/journal/journal.html:32
 #: rhodecode/templates/pullrequests/pullrequest.html:55
 msgid "Refresh"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:27
+#: rhodecode/templates/journal/journal.html:35
 #: rhodecode/templates/journal/public_journal.html:24
 msgid "RSS feed"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:30
+#: rhodecode/templates/journal/journal.html:38
 #: rhodecode/templates/journal/public_journal.html:27
 msgid "ATOM feed"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:41
+#: rhodecode/templates/journal/journal.html:49
 msgid "Watched"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:46
+#: rhodecode/templates/journal/journal.html:54
 msgid "ADD"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:69
+#: rhodecode/templates/journal/journal.html:77
 msgid "following user"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:69
+#: rhodecode/templates/journal/journal.html:77
 msgid "user"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:102
+#: rhodecode/templates/journal/journal.html:110
 msgid "You are not following any users or repositories"
 msgstr ""
 
-#: rhodecode/templates/journal/journal_data.html:51
+#: rhodecode/templates/journal/journal_data.html:55
 msgid "No entries yet"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.html:13
 msgid "ATOM public journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.html:14
 msgid "RSS public journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.html:21
 msgid "Public Journal"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:4
 #: rhodecode/templates/pullrequests/pullrequest.html:12
 msgid "New pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:54
 msgid "refresh overview"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:66
 msgid "Detailed compare view"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:70
 #: rhodecode/templates/pullrequests/pullrequest_show.html:100
 msgid "Pull request reviewers"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:79
 #: rhodecode/templates/pullrequests/pullrequest_show.html:112
 msgid "owner"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:91
 #: rhodecode/templates/pullrequests/pullrequest_show.html:127
 msgid "Add reviewer to this pull request."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:97
 msgid "Create new pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:106
 #: rhodecode/templates/pullrequests/pullrequest_show.html:25
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
 msgid "Title"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:123
 msgid "Send pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:23
 #, python-format
 msgid "Closed %s"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:23
 #, python-format
 msgid "with status %s"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:31
 msgid "Status"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Pull request status"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:44
 msgid "Still not reviewed by"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:48
 #, python-format
 msgid "%d reviewer"
 msgid_plural "%d reviewers"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:50
 msgid "pull request was reviewed by all reviewers"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:58
 msgid "Created on"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:65
 msgid "Compare view"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#, fuzzy
+msgid "reviewer"
+msgstr ""
+
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
 msgid "all pull requests"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
 msgid "All pull requests"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:27
 msgid "Closed"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:6
 #, python-format
 msgid "Search \"%s\" in repository: %s"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:8
 #, python-format
 msgid "Search \"%s\" in all repositories"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:12
 #: rhodecode/templates/search/search.html:32
 #, python-format
 msgid "Search in repository: %s"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:14
 #: rhodecode/templates/search/search.html:34
 msgid "Search in all repositories"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:48
 msgid "Search term"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:60
 msgid "Search in"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:63
 msgid "File contents"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:64
 msgid "Commit messages"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:65
 msgid "File names"
 msgstr ""
 
 #: rhodecode/templates/search/search_commit.html:35
 #: rhodecode/templates/search/search_content.html:21
 #: rhodecode/templates/search/search_path.html:15
 msgid "Permission denied"
 msgstr ""
 
 #: rhodecode/templates/settings/repo_settings.html:5
 #, python-format
 msgid "%s Settings"
 msgstr ""
 
+#: rhodecode/templates/settings/repo_settings.html:102
+msgid "Delete repository"
+msgstr ""
+
+#: rhodecode/templates/settings/repo_settings.html:109
+msgid "Remove repo"
+msgstr ""
+
 #: rhodecode/templates/shortlog/shortlog.html:5
 #, python-format
 msgid "%s Shortlog"
 msgstr ""
 
 #: rhodecode/templates/shortlog/shortlog.html:15
 #: rhodecode/templates/shortlog/shortlog.html:19
 msgid "shortlog"
 msgstr ""
 
 #: rhodecode/templates/shortlog/shortlog_data.html:5
 msgid "revision"
 msgstr ""
 
 #: rhodecode/templates/shortlog/shortlog_data.html:7
 msgid "age"
 msgstr ""
 
 #: rhodecode/templates/shortlog/shortlog_data.html:8
 msgid "author"
 msgstr ""
 
 #: rhodecode/templates/shortlog/shortlog_data.html:75
 msgid "Add or upload files directly via RhodeCode"
 msgstr ""
 
 #: rhodecode/templates/shortlog/shortlog_data.html:84
 msgid "Push new repo"
 msgstr ""
 
 #: rhodecode/templates/shortlog/shortlog_data.html:92
 msgid "Existing repository?"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
 msgid "%s Summary"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:12
 msgid "summary"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:20
 #, python-format
 msgid "repo %s ATOM feed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:21
 #, python-format
 msgid "repo %s RSS feed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:49
 #: rhodecode/templates/summary/summary.html:52
 msgid "ATOM"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:70
 #, python-format
 msgid "Repository locked by %s"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:72
 msgid "Repository unlocked"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:91
 #, python-format
 msgid "Non changable ID %s"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:96
 msgid "public"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:104
 msgid "remote clone"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:125
 msgid "Contact"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:139
 msgid "Clone url"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:142
 msgid "Show by Name"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:143
 msgid "Show by ID"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:151
 msgid "Trending files"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:159
 #: rhodecode/templates/summary/summary.html:175
 #: rhodecode/templates/summary/summary.html:203
 msgid "enable"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:167
 msgid "Download"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:171
 msgid "There are no downloads yet"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:173
 msgid "Downloads are disabled for this repository"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:179
 msgid "Download as zip"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:182
 msgid "Check this to download archive with subrepos"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:182
 msgid "with subrepos"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:195
 msgid "Commit activity by day / author"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:206
 msgid "Stats gathered: "
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:227
 msgid "Shortlog"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:229
 msgid "Quick start"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:243
 #, python-format
 msgid "Readme file at revision '%s'"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:246
 msgid "Permalink to this readme"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:304
 #, python-format
 msgid "Download %s as %s"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:661
 msgid "commits"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:662
 msgid "files added"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:663
 msgid "files changed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:664
 msgid "files removed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:667
 msgid "commit"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:668
 msgid "file added"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:669
 msgid "file changed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:670
 msgid "file removed"
 msgstr ""
 
 #: rhodecode/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr ""
 
 #: rhodecode/templates/tags/tags.html:29
 msgid "Compare tags"
 msgstr ""
 
+#~ msgid ""
+#~ "%s repository is not mapped to db"
+#~ " perhaps it was created or renamed"
+#~ " from the file system please run "
+#~ "the application again in order to "
+#~ "rescan repositories"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%s repository is not mapped to db"
+#~ " perhaps it was moved or renamed  "
+#~ "from the filesystem please run the "
+#~ "application again in order to rescan "
+#~ "repositories"
+#~ msgstr ""
+

rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po

@@ -1,4300 +1,4349 b''
 # French translations for RhodeCode.
 # Copyright (C) 2011 ORGANIZATION
 # This file is distributed under the same license as the RhodeCode project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: RhodeCode 1.1.5\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-12-03 03:21+0100\n"
+"POT-Creation-Date: 2012-12-14 04:19+0100\n"
 "PO-Revision-Date: 2012-10-02 11:32+0100\n"
 "Last-Translator: Vincent Duvert <[e-mail]>\n"
 "Language-Team: fr <[e-mail]>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
 #: rhodecode/controllers/changelog.py:95
 msgid "All Branches"
 msgstr "Toutes les branches"
 
-#: rhodecode/controllers/changeset.py:84
+#: rhodecode/controllers/changeset.py:83
 msgid "show white space"
 msgstr "Afficher les espaces et tabulations"
 
-#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
+#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
 msgid "ignore white space"
 msgstr "Ignorer les espaces et tabulations"
 
-#: rhodecode/controllers/changeset.py:164
+#: rhodecode/controllers/changeset.py:163
 #, python-format
 msgid "%s line context"
 msgstr "Afficher %s lignes de contexte"
 
-#: rhodecode/controllers/changeset.py:315
-#: rhodecode/controllers/pullrequests.py:411
+#: rhodecode/controllers/changeset.py:314
+#: rhodecode/controllers/pullrequests.py:417
 #, python-format
 msgid "Status change -> %s"
 msgstr "Changement de statut -> %s"
 
-#: rhodecode/controllers/changeset.py:346
+#: rhodecode/controllers/changeset.py:345
 msgid ""
 "Changing status on a changeset associated witha closed pull request is "
 "not allowed"
 msgstr ""
 "Le changement de statut d’un changeset associé à une pull request fermée "
 "n’est pas autorisé."
 
 #: rhodecode/controllers/compare.py:75
-#: rhodecode/controllers/pullrequests.py:117
+#: rhodecode/controllers/pullrequests.py:121
 #: rhodecode/controllers/shortlog.py:100
 msgid "There are no changesets yet"
 msgstr "Il n’y a aucun changement pour le moment"
 
 #: rhodecode/controllers/error.py:69
 msgid "Home page"
 msgstr "Accueil"
 
 #: rhodecode/controllers/error.py:98
 msgid "The request could not be understood by the server due to malformed syntax."
 msgstr ""
 "Le serveur n’a pas pu interpréter la requête à cause d’une erreur de "
 "syntaxe"
 
 #: rhodecode/controllers/error.py:101
 msgid "Unauthorized access to resource"
 msgstr "Accès interdit à cet ressource"
 
 #: rhodecode/controllers/error.py:103
 msgid "You don't have permission to view this page"
 msgstr "Vous n’avez pas la permission de voir cette page"
 
 #: rhodecode/controllers/error.py:105
 msgid "The resource could not be found"
 msgstr "Ressource introuvable"
 
 #: rhodecode/controllers/error.py:107
 msgid ""
 "The server encountered an unexpected condition which prevented it from "
 "fulfilling the request."
 msgstr ""
 "La requête n’a pu être traitée en raison d’une erreur survenue sur le "
 "serveur."
 
 #: rhodecode/controllers/feed.py:52
 #, python-format
 msgid "Changes on %s repository"
 msgstr "Changements sur le dépôt %s"
 
 #: rhodecode/controllers/feed.py:53
 #, python-format
 msgid "%s %s feed"
 msgstr "Flux %s de %s"
 
 #: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:126
-#: rhodecode/templates/changeset/changeset.html:138
+#: rhodecode/templates/changeset/changeset.html:137
+#: 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
 msgid "Changeset was too big and was cut off..."
 msgstr "Cet ensemble de changements était trop important et a été découpé…"
 
 #: rhodecode/controllers/feed.py:92
 msgid "commited on"
 msgstr "a commité, le"
 
 #: rhodecode/controllers/files.py:86
 msgid "click here to add new file"
 msgstr "Ajouter un nouveau fichier"
 
 #: rhodecode/controllers/files.py:87
 #, python-format
 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
 #, 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"
 msgstr "%s édité via RhodeCode"
 
 #: rhodecode/controllers/files.py:297
 msgid "No changes"
 msgstr "Aucun changement"
 
 #: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372
 #, 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
 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"
 msgstr "%s ajouté par RhodeCode"
 
 #: rhodecode/controllers/files.py:358
 msgid "No content"
 msgstr "Aucun contenu"
 
 #: rhodecode/controllers/files.py:362
 msgid "No filename"
 msgstr "Aucun nom de fichier"
 
 #: rhodecode/controllers/files.py:404
 msgid "downloads disabled"
 msgstr "Les téléchargements sont désactivés"
 
 #: rhodecode/controllers/files.py:415
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Révision %s inconnue."
 
 #: rhodecode/controllers/files.py:417
 msgid "Empty repository"
 msgstr "Dépôt vide."
 
 #: rhodecode/controllers/files.py:419
 msgid "Unknown archive type"
 msgstr "Type d’archive inconnu"
 
 #: rhodecode/controllers/files.py:564
 #: 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:76
+#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74
 #: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550
 msgid "Branches"
 msgstr "Branches"
 
-#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80
+#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78
 #: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561
 msgid "Tags"
 msgstr "Tags"
 
-#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:92
-#, python-format
-msgid ""
-"%s repository is not mapped to db perhaps it was created or renamed from "
-"the filesystem please run the application again in order to rescan "
-"repositories"
-msgstr ""
-"Le dépôt %s n’est pas représenté dans la base de données. Il a "
-"probablement été créé ou renommé manuellement. Veuillez relancer "
-"l’application pour rescanner les dépôts."
-
-#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73
-#, python-format
-msgid ""
-"%s repository is not mapped to db perhaps it was created or renamed from "
-"the file system please run the application again in order to rescan "
-"repositories"
-msgstr ""
-"Le dépôt %s n’est pas représenté dans la base de données. Il a "
-"probablement été créé ou renommé manuellement. Veuillez relancer "
-"l’application pour rescanner les dépôts."
-
-#: rhodecode/controllers/forks.py:168
+#: rhodecode/controllers/forks.py:158
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "dépôt %s forké en tant que %s"
 
-#: rhodecode/controllers/forks.py:182
+#: rhodecode/controllers/forks.py:172
 #, 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:206 rhodecode/controllers/journal.py:243
+#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261
 msgid "public journal"
 msgstr "Journal public"
 
-#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247
+#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265
 #: rhodecode/templates/base/base.html:232
+#: rhodecode/templates/journal/journal.html:12
 msgid "journal"
 msgstr "Journal"
 
 #: rhodecode/controllers/login.py:143
 msgid "You have successfully registered into rhodecode"
 msgstr "Vous vous êtes inscrits avec succès à RhodeCode"
 
 #: rhodecode/controllers/login.py:164
 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
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
 msgstr ""
 "Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a "
 "été envoyé par e-mail."
 
-#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556
+#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556
 msgid "Bookmarks"
 msgstr "Signets"
 
-#: rhodecode/controllers/pullrequests.py:186
+#: rhodecode/controllers/pullrequests.py:190
 msgid "Pull request requires a title with min. 3 chars"
 msgstr "Les requêtes de pull nécessitent un titre d’au moins 3 caractères."
 
-#: rhodecode/controllers/pullrequests.py:188
+#: rhodecode/controllers/pullrequests.py:192
 msgid "error during creation of pull request"
 msgstr "Une erreur est survenue lors de la création de la requête de pull."
 
-#: rhodecode/controllers/pullrequests.py:220
+#: rhodecode/controllers/pullrequests.py:224
 msgid "Successfully opened new pull request"
 msgstr "La requête de pull a été ouverte avec succès."
 
-#: rhodecode/controllers/pullrequests.py:223
+#: rhodecode/controllers/pullrequests.py:227
 msgid "Error occurred during sending pull request"
 msgstr "Une erreur est survenue durant l’envoi de la requête de pull."
 
-#: rhodecode/controllers/pullrequests.py:256
+#: rhodecode/controllers/pullrequests.py:260
 msgid "Successfully deleted pull request"
 msgstr "La requête de pull a été supprimée avec succès."
 
+#: rhodecode/controllers/pullrequests.py:452
+msgid "Closing pull request on other statuses than rejected or approved forbidden"
+msgstr ""
+
 #: rhodecode/controllers/search.py:134
 msgid "Invalid search query. Try quoting it."
 msgstr "Requête invalide. Essayer de la mettre entre guillemets."
 
 #: rhodecode/controllers/search.py:139
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr ""
 "L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de "
 "code Whoosh."
 
 #: rhodecode/controllers/search.py:143
 msgid "An error occurred during this search operation"
 msgstr "Une erreur est survenue durant l’opération de recherche."
 
-#: rhodecode/controllers/settings.py:108
-#: rhodecode/controllers/admin/repos.py:268
+#: rhodecode/controllers/settings.py:119
+#: rhodecode/controllers/admin/repos.py:272
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "Dépôt %s mis à jour avec succès."
 
-#: rhodecode/controllers/settings.py:126
-#: rhodecode/controllers/admin/repos.py:286
+#: rhodecode/controllers/settings.py:137
+#: rhodecode/controllers/admin/repos.py:290
 #, 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:144
-#: rhodecode/controllers/admin/repos.py:304
-#, python-format
-msgid ""
-"%s repository is not mapped to db perhaps it was moved or renamed  from "
-"the filesystem please run the application again in order to rescan "
-"repositories"
-msgstr ""
-"Le dépôt %s n’est pas représenté dans la base de données. Il a "
-"probablement été déplacé ou renommé manuellement. Veuillez relancer "
-"l’application pour rescanner les dépôts."
-
-#: rhodecode/controllers/settings.py:156
-#: rhodecode/controllers/admin/repos.py:316
+#: rhodecode/controllers/settings.py:162
+#: rhodecode/controllers/admin/repos.py:315
 #, python-format
 msgid "deleted repository %s"
 msgstr "Dépôt %s supprimé"
 
-#: rhodecode/controllers/settings.py:160
-#: rhodecode/controllers/admin/repos.py:326
-#: rhodecode/controllers/admin/repos.py:332
+#: rhodecode/controllers/settings.py:166
+#: rhodecode/controllers/admin/repos.py:325
+#: rhodecode/controllers/admin/repos.py:331
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "Erreur pendant la suppression de %s"
 
-#: rhodecode/controllers/settings.py:179
+#: rhodecode/controllers/settings.py:185
 msgid "unlocked"
 msgstr "déverrouillé"
 
-#: rhodecode/controllers/settings.py:182
+#: rhodecode/controllers/settings.py:188
 msgid "locked"
 msgstr "verrouillé"
 
-#: rhodecode/controllers/settings.py:184
+#: rhodecode/controllers/settings.py:190
 #, python-format
 msgid "Repository has been %s"
 msgstr "Le dépôt a été %s."
 
-#: rhodecode/controllers/settings.py:188
-#: rhodecode/controllers/admin/repos.py:424
+#: rhodecode/controllers/settings.py:194
+#: rhodecode/controllers/admin/repos.py:423
 msgid "An error occurred during unlocking"
 msgstr "Une erreur est survenue durant le déverrouillage."
 
 #: rhodecode/controllers/summary.py:140
 msgid "No data loaded yet"
 msgstr "Aucune donnée actuellement disponible."
 
 #: rhodecode/controllers/summary.py:144
 #: rhodecode/templates/summary/summary.html:157
 msgid "Statistics are disabled for this repository"
 msgstr "La mise à jour des statistiques est désactivée pour ce dépôt."
 
 #: rhodecode/controllers/admin/defaults.py:96
 #, fuzzy
 msgid "Default settings updated successfully"
 msgstr "Mise à jour réussie des réglages LDAP"
 
 #: rhodecode/controllers/admin/defaults.py:110
 #, fuzzy
 msgid "error occurred during update of defaults"
 msgstr "Une erreur est survenue durant la mise à jour de l’utilisateur %s."
 
 #: rhodecode/controllers/admin/ldap_settings.py:50
 msgid "BASE"
 msgstr "Base"
 
 #: rhodecode/controllers/admin/ldap_settings.py:51
 msgid "ONELEVEL"
 msgstr "Un niveau"
 
 #: rhodecode/controllers/admin/ldap_settings.py:52
 msgid "SUBTREE"
 msgstr "Sous-arbre"
 
 #: rhodecode/controllers/admin/ldap_settings.py:56
 msgid "NEVER"
 msgstr "NEVER"
 
 #: rhodecode/controllers/admin/ldap_settings.py:57
 msgid "ALLOW"
 msgstr "Autoriser"
 
 #: rhodecode/controllers/admin/ldap_settings.py:58
 msgid "TRY"
 msgstr "TRY"
 
 #: rhodecode/controllers/admin/ldap_settings.py:59
 msgid "DEMAND"
 msgstr "DEMAND"
 
 #: rhodecode/controllers/admin/ldap_settings.py:60
 msgid "HARD"
 msgstr "HARD"
 
 #: rhodecode/controllers/admin/ldap_settings.py:64
 msgid "No encryption"
 msgstr "Pas de chiffrement"
 
 #: rhodecode/controllers/admin/ldap_settings.py:65
 msgid "LDAPS connection"
 msgstr "Connection LDAPS"
 
 #: rhodecode/controllers/admin/ldap_settings.py:66
 msgid "START_TLS on LDAP connection"
 msgstr "START_TLS à la connexion"
 
 #: rhodecode/controllers/admin/ldap_settings.py:126
 msgid "Ldap settings updated successfully"
 msgstr "Mise à jour réussie des réglages LDAP"
 
 #: rhodecode/controllers/admin/ldap_settings.py:130
 msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
 msgstr "Impossible d’activer LDAP. La bibliothèque « python-ldap » est manquante."
 
 #: rhodecode/controllers/admin/ldap_settings.py:147
 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
 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"
 
 #: rhodecode/controllers/admin/permissions.py:62
 #: rhodecode/controllers/admin/permissions.py:66
 #: rhodecode/templates/admin/defaults/defaults.html:9
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
 #: rhodecode/templates/admin/repos/repo_add.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:9
 #: rhodecode/templates/admin/repos/repos.html:9
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
 #: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:9
 #: rhodecode/templates/admin/users/user_add.html:8
 #: rhodecode/templates/admin/users/user_edit.html:9
 #: rhodecode/templates/admin/users/user_edit.html:126
 #: 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
 msgid "Admin"
 msgstr "Administration"
 
 #: rhodecode/controllers/admin/permissions.py:69
 msgid "disabled"
 msgstr "Désactivé"
 
 #: rhodecode/controllers/admin/permissions.py:71
 msgid "allowed with manual account activation"
 msgstr "Autorisé avec activation manuelle du compte"
 
 #: rhodecode/controllers/admin/permissions.py:73
 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 "Enabled"
 msgstr "Autorisée"
 
 #: rhodecode/controllers/admin/permissions.py:122
 msgid "Default permissions updated successfully"
 msgstr "Permissions par défaut mises à jour avec succès"
 
 #: rhodecode/controllers/admin/permissions.py:136
 msgid "error occurred during update of permissions"
 msgstr "erreur pendant la mise à jour des permissions"
 
-#: rhodecode/controllers/admin/repos.py:125
+#: rhodecode/controllers/admin/repos.py:121
 msgid "--REMOVE FORK--"
 msgstr "[Pas un fork]"
 
-#: rhodecode/controllers/admin/repos.py:194
+#: rhodecode/controllers/admin/repos.py:190
 #, python-format
 msgid "created repository %s from %s"
 msgstr "Le dépôt %s a été créé depuis %s."
 
-#: rhodecode/controllers/admin/repos.py:198
+#: rhodecode/controllers/admin/repos.py:194
 #, python-format
 msgid "created repository %s"
 msgstr "Le dépôt %s a été créé."
 
-#: rhodecode/controllers/admin/repos.py:229
+#: rhodecode/controllers/admin/repos.py:225
 #, 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:321
+#: rhodecode/controllers/admin/repos.py:320
 #, 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:350
+#: rhodecode/controllers/admin/repos.py:349
 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:369
+#: rhodecode/controllers/admin/repos.py:368
 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:387
+#: rhodecode/controllers/admin/repos.py:386
 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:404
+#: rhodecode/controllers/admin/repos.py:403
 msgid "An error occurred during cache invalidation"
 msgstr "Une erreur est survenue durant l’invalidation du cache."
 
-#: rhodecode/controllers/admin/repos.py:444
+#: rhodecode/controllers/admin/repos.py:443
 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:448
+#: rhodecode/controllers/admin/repos.py:447
 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:453 rhodecode/model/validators.py:300
+#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300
 msgid "Token mismatch"
 msgstr "Jeton d’authentification incorrect."
 
-#: rhodecode/controllers/admin/repos.py:466
+#: rhodecode/controllers/admin/repos.py:465
 msgid "Pulled from remote location"
 msgstr "Les changements distants ont été récupérés."
 
-#: rhodecode/controllers/admin/repos.py:468
+#: 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:484
+#: rhodecode/controllers/admin/repos.py:483
 msgid "Nothing"
 msgstr "[Aucun dépôt]"
 
-#: rhodecode/controllers/admin/repos.py:486
+#: 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:490
+#: rhodecode/controllers/admin/repos.py:489
 msgid "An error occurred during this operation"
 msgstr "Une erreur est survenue durant cette opération."
 
 #: rhodecode/controllers/admin/repos_groups.py:120
 #, 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
 #, 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
 #, 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
 #, 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
 #, 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
 #, 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
 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
 #, 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
 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
 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"
 msgstr "Après re-scan : %s ajouté(s), %s enlevé(s)"
 
 #: rhodecode/controllers/admin/settings.py:131
 msgid "Whoosh reindex task scheduled"
 msgstr "La tâche de réindexation Whoosh a été planifiée."
 
 #: rhodecode/controllers/admin/settings.py:162
 msgid "Updated application settings"
 msgstr "Réglages mis à jour"
 
 #: rhodecode/controllers/admin/settings.py:166
 #: rhodecode/controllers/admin/settings.py:299
 msgid "error occurred during updating application settings"
 msgstr "Une erreur est survenue durant la mise à jour des options."
 
 #: rhodecode/controllers/admin/settings.py:207
 msgid "Updated visualisation settings"
 msgstr "Réglages d’affichage mis à jour."
 
 #: rhodecode/controllers/admin/settings.py:212
 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
 msgid "Updated VCS settings"
 msgstr "Réglages des gestionnaires de versions mis à jour."
 
 #: rhodecode/controllers/admin/settings.py:309
 msgid "Added new hook"
 msgstr "Le nouveau hook a été ajouté."
 
 #: rhodecode/controllers/admin/settings.py:321
 msgid "Updated hooks"
 msgstr "Hooks mis à jour"
 
 #: rhodecode/controllers/admin/settings.py:325
 msgid "error occurred during hook creation"
 msgstr "Une erreur est survenue durant la création du hook."
 
 #: rhodecode/controllers/admin/settings.py:344
 msgid "Email task created"
 msgstr "La tâche d’e-mail a été créée."
 
 #: rhodecode/controllers/admin/settings.py:399
 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
 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
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr "Une erreur est survenue durant la mise à jour de l’utilisateur %s."
 
 #: rhodecode/controllers/admin/users.py:130
 #, python-format
 msgid "created user %s"
 msgstr "utilisateur %s créé"
 
 #: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "error occurred during creation of user %s"
 msgstr "Une erreur est survenue durant la création de l’utilisateur %s."
 
 #: rhodecode/controllers/admin/users.py:176
 msgid "User updated successfully"
 msgstr "L’utilisateur a été mis à jour avec succès."
 
 #: rhodecode/controllers/admin/users.py:212
 msgid "successfully deleted user"
 msgstr "L’utilisateur a été supprimé avec succès."
 
 #: rhodecode/controllers/admin/users.py:217
 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
 msgid "You can't edit this user"
 msgstr "Vous ne pouvez pas éditer cet utilisateur"
 
 #: rhodecode/controllers/admin/users.py:272
 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
 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
 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
 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_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
 #, python-format
 msgid "Added email %s to user"
 msgstr "L’e-mail « %s » a été ajouté à l’utilisateur."
 
 #: rhodecode/controllers/admin/users.py:315
 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
 msgid "Removed email 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"
 msgstr "Le groupe d’utilisateurs %s a été créé."
 
 #: rhodecode/controllers/admin/users_groups.py:97
 #, python-format
 msgid "error occurred during creation of users group %s"
 msgstr "Une erreur est survenue durant la création du groupe d’utilisateurs %s."
 
 #: rhodecode/controllers/admin/users_groups.py:164
 #, python-format
 msgid "updated users group %s"
 msgstr "Le groupe d’utilisateurs %s a été mis à jour."
 
 #: rhodecode/controllers/admin/users_groups.py:186
 #, python-format
 msgid "error occurred during update of users group %s"
 msgstr "Une erreur est survenue durant la mise à jour du groupe d’utilisateurs %s."
 
 #: rhodecode/controllers/admin/users_groups.py:203
 msgid "successfully deleted users group"
 msgstr "Le groupe d’utilisateurs a été supprimé avec succès."
 
 #: rhodecode/controllers/admin/users_groups.py:208
 msgid "An error occurred during deletion of users group"
 msgstr "Une erreur est survenue lors de la suppression du groupe d’utilisateurs."
 
 #: rhodecode/controllers/admin/users_groups.py:257
 msgid "Granted 'repository create' permission to users group"
 msgstr ""
 "La permission de création de dépôts a été accordée au groupe "
 "d’utilisateurs."
 
 #: rhodecode/controllers/admin/users_groups.py:262
 msgid "Revoked 'repository create' permission to users group"
 msgstr ""
 "La permission de création de dépôts a été révoquée au groupe "
 "d’utilisateurs."
 
 #: rhodecode/controllers/admin/users_groups.py:268
 msgid "Granted 'repository fork' permission to users group"
 msgstr "La permission de fork de dépôts a été accordée au groupe d’utilisateur."
 
 #: rhodecode/controllers/admin/users_groups.py:273
 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
 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
 msgid "You need to be a signed in to view this page"
 msgstr "Vous devez être connecté pour visualiser cette page."
 
 #: rhodecode/lib/diffs.py:74
 msgid "binary file"
 msgstr "Fichier binaire"
 
 #: rhodecode/lib/diffs.py:90
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 "Cet ensemble de changements était trop gros pour être affiché et a été "
 "découpé, utilisez le menu « Diff » pour afficher les différences."
 
 #: rhodecode/lib/diffs.py:100
 msgid "No changes detected"
 msgstr "Aucun changement détecté."
 
-#: rhodecode/lib/helpers.py:373
+#: rhodecode/lib/helpers.py:374
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr "%d/%m/%Y à %H:%M:%S"
 
-#: rhodecode/lib/helpers.py:485
+#: rhodecode/lib/helpers.py:486
 msgid "True"
 msgstr "Vrai"
 
-#: rhodecode/lib/helpers.py:489
+#: rhodecode/lib/helpers.py:490
 msgid "False"
 msgstr "Faux"
 
-#: rhodecode/lib/helpers.py:529
+#: rhodecode/lib/helpers.py:530
 #, fuzzy, python-format
 msgid "Deleted branch: %s"
 msgstr "Dépôt %s supprimé"
 
-#: rhodecode/lib/helpers.py:532
+#: rhodecode/lib/helpers.py:533
 #, fuzzy, python-format
 msgid "Created tag: %s"
 msgstr "utilisateur %s créé"
 
-#: rhodecode/lib/helpers.py:545
+#: rhodecode/lib/helpers.py:546
 msgid "Changeset not found"
 msgstr "Ensemble de changements non trouvé"
 
-#: rhodecode/lib/helpers.py:588
+#: rhodecode/lib/helpers.py:589
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "Afficher les changements combinés %s->%s"
 
-#: rhodecode/lib/helpers.py:594
+#: rhodecode/lib/helpers.py:595
 msgid "compare view"
 msgstr "vue de comparaison"
 
-#: rhodecode/lib/helpers.py:614
+#: rhodecode/lib/helpers.py:615
 msgid "and"
 msgstr "et"
 
-#: rhodecode/lib/helpers.py:615
+#: rhodecode/lib/helpers.py:616
 #, python-format
 msgid "%s more"
 msgstr "%s de plus"
 
-#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51
+#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51
 msgid "revisions"
 msgstr "révisions"
 
-#: rhodecode/lib/helpers.py:640
+#: rhodecode/lib/helpers.py:641
 #, fuzzy, python-format
 msgid "fork name %s"
 msgstr "Nom du fork %s"
 
-#: rhodecode/lib/helpers.py:653
+#: rhodecode/lib/helpers.py:658
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
 #: rhodecode/templates/pullrequests/pullrequest_show.html:12
 #, python-format
 msgid "Pull request #%s"
 msgstr "Requête de pull #%s"
 
-#: rhodecode/lib/helpers.py:659
+#: rhodecode/lib/helpers.py:664
 msgid "[deleted] repository"
 msgstr "[a supprimé] le dépôt"
 
-#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671
+#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676
 msgid "[created] repository"
 msgstr "[a créé] le dépôt"
 
-#: rhodecode/lib/helpers.py:663
+#: rhodecode/lib/helpers.py:668
 msgid "[created] repository as fork"
 msgstr "[a créé] le dépôt en tant que fork"
 
-#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673
+#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678
 msgid "[forked] repository"
 msgstr "[a forké] le dépôt"
 
-#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675
+#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680
 msgid "[updated] repository"
 msgstr "[a mis à jour] le dépôt"
 
-#: rhodecode/lib/helpers.py:669
+#: rhodecode/lib/helpers.py:674
 msgid "[delete] repository"
 msgstr "[a supprimé] le dépôt"
 
-#: rhodecode/lib/helpers.py:677
+#: rhodecode/lib/helpers.py:682
 msgid "[created] user"
 msgstr "[a créé] l’utilisateur"
 
-#: rhodecode/lib/helpers.py:679
+#: rhodecode/lib/helpers.py:684
 msgid "[updated] user"
 msgstr "[a mis à jour] l’utilisateur"
 
-#: rhodecode/lib/helpers.py:681
+#: rhodecode/lib/helpers.py:686
 msgid "[created] users group"
 msgstr "[a créé] le groupe d’utilisateurs"
 
-#: rhodecode/lib/helpers.py:683
+#: rhodecode/lib/helpers.py:688
 msgid "[updated] users group"
 msgstr "[a mis à jour] le groupe d’utilisateurs"
 
-#: rhodecode/lib/helpers.py:685
+#: rhodecode/lib/helpers.py:690
 msgid "[commented] on revision in repository"
 msgstr "[a commenté] une révision du dépôt"
 
-#: rhodecode/lib/helpers.py:687
+#: rhodecode/lib/helpers.py:692
 msgid "[commented] on pull request for"
 msgstr "[a commenté] la requête de pull pour"
 
-#: rhodecode/lib/helpers.py:689
+#: rhodecode/lib/helpers.py:694
 msgid "[closed] pull request for"
 msgstr "[a fermé] la requête de pull de"
 
-#: rhodecode/lib/helpers.py:691
+#: rhodecode/lib/helpers.py:696
 msgid "[pushed] into"
 msgstr "[a pushé] dans"
 
-#: rhodecode/lib/helpers.py:693
+#: rhodecode/lib/helpers.py:698
 msgid "[committed via RhodeCode] into repository"
 msgstr "[a commité via RhodeCode] dans le dépôt"
 
-#: rhodecode/lib/helpers.py:695
+#: rhodecode/lib/helpers.py:700
 msgid "[pulled from remote] into repository"
 msgstr "[a pullé depuis un site distant] dans le dépôt"
 
-#: rhodecode/lib/helpers.py:697
+#: rhodecode/lib/helpers.py:702
 msgid "[pulled] from"
 msgstr "[a pullé] depuis"
 
-#: rhodecode/lib/helpers.py:699
+#: rhodecode/lib/helpers.py:704
 msgid "[started following] repository"
 msgstr "[suit maintenant] le dépôt"
 
-#: rhodecode/lib/helpers.py:701
+#: rhodecode/lib/helpers.py:706
 msgid "[stopped following] repository"
 msgstr "[ne suit plus] le dépôt"
 
-#: rhodecode/lib/helpers.py:877
+#: rhodecode/lib/helpers.py:883
 #, python-format
 msgid " and %s more"
 msgstr "et %s de plus"
 
-#: rhodecode/lib/helpers.py:881
+#: rhodecode/lib/helpers.py:887
 msgid "No Files"
 msgstr "Aucun fichier"
 
+#: rhodecode/lib/helpers.py:1163
+#, python-format
+msgid ""
+"%s repository is not mapped to db perhaps it was created or renamed from "
+"the filesystem please run the application again in order to rescan "
+"repositories"
+msgstr ""
+"Le dépôt %s n’est pas représenté dans la base de données. Il a "
+"probablement été créé ou renommé manuellement. Veuillez relancer "
+"l’application pour rescanner les dépôts."
+
 #: rhodecode/lib/utils2.py:403
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d an"
 msgstr[1] "%d ans"
 
 #: rhodecode/lib/utils2.py:404
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mois"
 msgstr[1] "%d mois"
 
 #: rhodecode/lib/utils2.py:405
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
 #: rhodecode/lib/utils2.py:406
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
 #: rhodecode/lib/utils2.py:407
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
 #: rhodecode/lib/utils2.py:408
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d secondes"
 
 #: rhodecode/lib/utils2.py:424
 #, fuzzy, python-format
 msgid "in %s"
 msgstr "à la ligne %s"
 
 #: rhodecode/lib/utils2.py:426
 #, python-format
 msgid "%s ago"
 msgstr "Il y a %s"
 
 #: rhodecode/lib/utils2.py:428
 #, fuzzy, python-format
 msgid "in %s and %s"
 msgstr "Il y a %s et %s"
 
 #: rhodecode/lib/utils2.py:431
 #, python-format
 msgid "%s and %s ago"
 msgstr "Il y a %s et %s"
 
 #: rhodecode/lib/utils2.py:434
 msgid "just now"
 msgstr "à l’instant"
 
 #: rhodecode/lib/celerylib/tasks.py:270
 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:1180
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183
 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:1181
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184
 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:1182
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185
 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:1183
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186
 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:1185
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188
 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:1186
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189
 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:1187
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190
 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:1188
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191
 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:1190
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193
 msgid "RhodeCode Administrator"
 msgstr "Administrateur RhodeCode"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194
 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:1192
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195
 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:1193
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196
 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:1194
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197
 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:1195
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198
 msgid "Register disabled"
 msgstr "Enregistrement désactivé"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1196
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199
 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:1199
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202
 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:1640
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643
 msgid "Not Reviewed"
 msgstr "Pas encore relue"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1641
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644
 msgid "Approved"
 msgstr "Approuvée "
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1642
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645
 msgid "Rejected"
 msgstr "Rejetée"
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646
 msgid "Under Review"
 msgstr "En cours de relecture"
 
 #: rhodecode/model/comment.py:110
 #, python-format
 msgid "on line %s"
 msgstr "à la ligne %s"
 
 #: rhodecode/model/comment.py:173
 msgid "[Mention]"
 msgstr "[Mention]"
 
 #: rhodecode/model/forms.py:43
 msgid "Please enter a login"
 msgstr "Veuillez entrer un identifiant"
 
 #: rhodecode/model/forms.py:44
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr "Entrez une valeur d’au moins %(min)i caractères de long."
 
 #: rhodecode/model/forms.py:52
 msgid "Please enter a password"
 msgstr "Veuillez entrer un mot de passe"
 
 #: rhodecode/model/forms.py:53
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr "Entrez au moins %(min)i caractères"
 
 #: rhodecode/model/notification.py:220
 #, fuzzy, python-format
 msgid "commented on commit at %(when)s"
 msgstr "a posté un commentaire sur le commit %(when)s"
 
 #: rhodecode/model/notification.py:221
 #, fuzzy, python-format
 msgid "sent message at %(when)s"
 msgstr "a envoyé un message  %(when)s"
 
 #: rhodecode/model/notification.py:222
 #, fuzzy, python-format
 msgid "mentioned you at %(when)s"
 msgstr "vous a mentioné %(when)s"
 
 #: rhodecode/model/notification.py:223
 #, fuzzy, python-format
 msgid "registered in RhodeCode at %(when)s"
 msgstr "s’est enregistré sur RhodeCode %(when)s"
 
 #: rhodecode/model/notification.py:224
 #, fuzzy, python-format
 msgid "opened new pull request at %(when)s"
 msgstr "a ouvert une nouvelle requête de pull %(when)s"
 
 #: rhodecode/model/notification.py:225
 #, fuzzy, python-format
 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
 #, 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
 msgid "latest tip"
 msgstr "Dernier sommet"
 
-#: rhodecode/model/user.py:230
+#: rhodecode/model/user.py:232
 msgid "new user registration"
 msgstr "Nouveau compte utilisateur enregistré"
 
-#: rhodecode/model/user.py:255 rhodecode/model/user.py:279
-#: rhodecode/model/user.py:301
+#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
+#: rhodecode/model/user.py:303
 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:325
+#: rhodecode/model/user.py:327
 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:331
+#: rhodecode/model/user.py:333
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories. %s"
 msgstr ""
 "L’utilisateur « %s » possède %s dépôts et ne peut être supprimé. Changez "
 "les propriétaires de ces dépôts. %s"
 
 #: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37
 msgid "Value cannot be an empty list"
 msgstr "Cette valeur ne peut être une liste vide."
 
 #: rhodecode/model/validators.py:83
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "Le nom d’utilisateur « %(username)s » existe déjà."
 
 #: rhodecode/model/validators.py:85
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr "Le nom d’utilisateur « %(username)s » n’est pas autorisé"
 
 #: rhodecode/model/validators.py:87
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
 msgstr ""
 "Le nom d’utilisateur peut contenir uniquement des caractères alpha-"
 "numériques ainsi que les caractères suivants : « _ . - ». Il doit "
 "commencer par un caractère alpha-numérique."
 
 #: rhodecode/model/validators.py:115
 #, 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
 msgid "Invalid users group name"
 msgstr "Nom de groupe d’utilisateurs invalide."
 
 #: rhodecode/model/validators.py:135
 #, python-format
 msgid "Users group \"%(usersgroup)s\" already exists"
 msgstr "Le groupe d’utilisateurs « %(usersgroup)s » existe déjà."
 
 #: rhodecode/model/validators.py:137
 msgid ""
 "users group name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr ""
 "Le nom de groupe d’utilisateurs peut contenir uniquement des caractères "
 "alpha-numériques ainsi que les caractères suivants : « _ . - ». Il doit "
 "commencer par un caractère alpha-numérique."
 
 #: rhodecode/model/validators.py:175
 msgid "Cannot assign this group as parent"
 msgstr "Impossible d’assigner ce groupe en tant que parent."
 
 #: rhodecode/model/validators.py:176
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr "Le groupe « %(group_name)s » existe déjà."
 
 #: rhodecode/model/validators.py:178
 #, 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
 msgid "Invalid characters (non-ascii) in password"
 msgstr "Caractères incorrects (non-ASCII) dans le mot de passe."
 
 #: rhodecode/model/validators.py:251
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas."
 
 #: rhodecode/model/validators.py:268
 msgid "invalid password"
 msgstr "mot de passe invalide"
 
 #: rhodecode/model/validators.py:269
 msgid "invalid user name"
 msgstr "nom d’utilisateur invalide"
 
 #: rhodecode/model/validators.py:270
 msgid "Your account is disabled"
 msgstr "Votre compte est désactivé"
 
 #: rhodecode/model/validators.py:314
 #, 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
 #, 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
 #, 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
 #, 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
 msgid "invalid clone url"
 msgstr "URL de clonage invalide."
 
 #: rhodecode/model/validators.py:433
 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
 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
 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
 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:582
+#: rhodecode/model/validators.py:591
 msgid "This is not a valid path"
 msgstr "Ceci n’est pas un chemin valide"
 
-#: rhodecode/model/validators.py:597
+#: rhodecode/model/validators.py:606
 msgid "This e-mail address is already taken"
 msgstr "Cette adresse e-mail est déjà enregistrée"
 
-#: rhodecode/model/validators.py:617
+#: rhodecode/model/validators.py:626
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "L’adresse e-mail « %(email)s » n’existe pas"
 
-#: rhodecode/model/validators.py:654
+#: rhodecode/model/validators.py:663
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom"
 " d’utilisateur."
 
-#: rhodecode/model/validators.py:673
+#: rhodecode/model/validators.py:682
 #, 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/templates/index.html:3
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/repo_switcher_list.html:4
 #: rhodecode/templates/admin/repos/repos.html:9
 #: rhodecode/templates/admin/users/user_edit_my_account.html:31
 #: rhodecode/templates/admin/users/users.html:9
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 #: rhodecode/templates/branches/branches.html:9
-#: rhodecode/templates/journal/journal.html:40
+#: rhodecode/templates/journal/journal.html:9
+#: rhodecode/templates/journal/journal.html:48
 #: 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
 msgid "repositories"
 msgstr "Dépôts"
 
 #: rhodecode/templates/index_base.html:13
 #: rhodecode/templates/index_base.html:15
 #: 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
 #: 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_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/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_groups/repos_groups_add.html:41
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
 #: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:66
 #: rhodecode/templates/summary/summary.html:114
 msgid "Description"
 msgstr "Description"
 
 #: rhodecode/templates/index_base.html:40
 #: 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/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/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:62
-#: rhodecode/templates/journal/journal.html:168
+#: rhodecode/templates/journal/journal.html:70
+#: rhodecode/templates/journal/journal.html:196
 #: rhodecode/templates/journal/journal_page_repos.html:7
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:43
 #: rhodecode/templates/summary/summary.html:132
 #: rhodecode/templates/tags/tags.html:51
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
 msgstr "Nom"
 
 #: rhodecode/templates/index_base.html:73
 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:170
+#: rhodecode/templates/journal/journal.html:198
 msgid "Tip"
 msgstr "Sommet"
 
 #: rhodecode/templates/index_base.html:75
 #: rhodecode/templates/index_base.html:181
 #: rhodecode/templates/index_base.html:269
 #: rhodecode/templates/admin/repos/repo_edit.html:121
 #: rhodecode/templates/admin/repos/repos.html:73
 msgid "Owner"
 msgstr "Propriétaire"
 
 #: rhodecode/templates/index_base.html:76
 #: rhodecode/templates/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr "RSS"
 
 #: rhodecode/templates/index_base.html:77
 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/admin/users/users.html:107
 #: rhodecode/templates/bookmarks/bookmarks.html:60
 #: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:193
+#: rhodecode/templates/journal/journal.html:221
 #: 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/admin/users/users.html:108
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:194
+#: rhodecode/templates/journal/journal.html:222
 #: 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
 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/admin/users/users.html:109
 #: rhodecode/templates/bookmarks/bookmarks.html:62
 #: rhodecode/templates/branches/branches.html:78
-#: rhodecode/templates/journal/journal.html:195
+#: rhodecode/templates/journal/journal.html:223
 #: 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/admin/users/users.html:110
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:79
-#: rhodecode/templates/journal/journal.html:196
+#: rhodecode/templates/journal/journal.html:224
 #: 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/admin/users/users.html:111
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:80
-#: rhodecode/templates/journal/journal.html:54
-#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/journal/journal.html:62
+#: rhodecode/templates/journal/journal.html:225
 #: rhodecode/templates/tags/tags.html:81
 msgid "Loading..."
 msgstr "Chargement…"
 
 #: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54
 msgid "Sign In"
 msgstr "Connexion"
 
 #: rhodecode/templates/login.html:21
 msgid "Sign In to"
 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_my_account_form.html:26
 #: rhodecode/templates/base/base.html:83
 #: rhodecode/templates/summary/summary.html:131
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
 #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
 #: rhodecode/templates/admin/ldap/ldap.html:46
 #: rhodecode/templates/admin/users/user_add.html:41
 #: rhodecode/templates/base/base.html:92
 msgid "Password"
 msgstr "Mot de passe"
 
 #: rhodecode/templates/login.html:50
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
 #: rhodecode/templates/login.html:60
 msgid "Forgot your password ?"
 msgstr "Mot de passe oublié ?"
 
 #: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103
 msgid "Don't have an account ?"
 msgstr "Vous n’avez pas de compte ?"
 
 #: rhodecode/templates/password_reset.html:5
 msgid "Reset your password"
 msgstr "Mot de passe oublié ?"
 
 #: rhodecode/templates/password_reset.html:11
 msgid "Reset your password to"
 msgstr "Réinitialiser votre mot de passe"
 
 #: rhodecode/templates/password_reset.html:21
 msgid "Email address"
 msgstr "Adresse e-mail"
 
 #: rhodecode/templates/password_reset.html:30
 msgid "Reset my password"
 msgstr "Réinitialiser mon mot de passe"
 
 #: rhodecode/templates/password_reset.html:31
 msgid "Password reset link will be send to matching email address"
 msgstr "Votre nouveau mot de passe sera envoyé à l’adresse correspondante."
 
 #: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74
 msgid "Sign Up"
 msgstr "Inscription"
 
 #: rhodecode/templates/register.html:11
 msgid "Sign Up to"
 msgstr "Inscription à"
 
 #: rhodecode/templates/register.html:38
 msgid "Re-enter password"
 msgstr "Confirmation"
 
 #: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:59
 #: rhodecode/templates/admin/users/user_edit.html:90
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
 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
 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/summary/summary.html:133
 msgid "Email"
 msgstr "E-mail"
 
 #: rhodecode/templates/register.html:76
 msgid "Your account will be activated right after registration"
 msgstr "Votre compte utilisateur sera actif dès la fin de l’enregistrement."
 
 #: rhodecode/templates/register.html:78
 msgid "Your account must wait for activation by administrator"
 msgstr "Votre compte utilisateur devra être activé par un administrateur."
 
 #: rhodecode/templates/repo_switcher_list.html:11
 #: rhodecode/templates/admin/defaults/defaults.html:44
 #: rhodecode/templates/admin/repos/repo_add_base.html:65
 #: rhodecode/templates/admin/repos/repo_edit.html:85
 #: rhodecode/templates/settings/repo_settings.html:76
 msgid "Private repository"
 msgstr "Dépôt privé"
 
 #: rhodecode/templates/repo_switcher_list.html:16
 msgid "Public repository"
 msgstr "Dépôt public"
 
 #: rhodecode/templates/switch_to_list.html:3
 #: rhodecode/templates/branches/branches.html:14
 msgid "branches"
 msgstr "Branches"
 
 #: rhodecode/templates/switch_to_list.html:10
 #: rhodecode/templates/branches/branches_data.html:57
 msgid "There are no branches yet"
 msgstr "Aucune branche n’a été créée pour le moment."
 
 #: rhodecode/templates/switch_to_list.html:15
 #: rhodecode/templates/shortlog/shortlog_data.html:10
 #: rhodecode/templates/tags/tags.html:15
 msgid "tags"
 msgstr "Tags"
 
 #: rhodecode/templates/switch_to_list.html:22
 #: rhodecode/templates/tags/tags_data.html:38
 msgid "There are no tags yet"
 msgstr "Aucun tag n’a été créé pour le moment."
 
 #: rhodecode/templates/switch_to_list.html:28
 #: rhodecode/templates/bookmarks/bookmarks.html:15
 msgid "bookmarks"
 msgstr "Signets"
 
 #: rhodecode/templates/switch_to_list.html:35
 #: rhodecode/templates/bookmarks/bookmarks_data.html:32
 msgid "There are no bookmarks yet"
 msgstr "Aucun signet n’a été créé."
 
 #: rhodecode/templates/admin/admin.html:5
-#: rhodecode/templates/admin/admin.html:9
+#: rhodecode/templates/admin/admin.html:13
 msgid "Admin journal"
 msgstr "Historique d’administration"
 
+#: rhodecode/templates/admin/admin.html:10
+#, fuzzy
+msgid "journal filter..."
+msgstr "Filtre rapide…"
+
+#: rhodecode/templates/admin/admin.html:12
+#: rhodecode/templates/journal/journal.html:11
+#, fuzzy
+msgid "filter"
+msgstr "Fichiers"
+
+#: rhodecode/templates/admin/admin.html:13
+#: rhodecode/templates/journal/journal.html:12
+#, python-format
+msgid "%s entry"
+msgid_plural "%s entries"
+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
 msgid "Action"
 msgstr "Action"
 
 #: rhodecode/templates/admin/admin_log.html:7
 #: rhodecode/templates/admin/permissions/permissions.html:41
 msgid "Repository"
 msgstr "Dépôt"
 
 #: rhodecode/templates/admin/admin_log.html:8
 #: rhodecode/templates/bookmarks/bookmarks.html:37
 #: rhodecode/templates/bookmarks/bookmarks_data.html:7
 #: rhodecode/templates/branches/branches.html:51
 #: rhodecode/templates/branches/branches_data.html:7
 #: rhodecode/templates/tags/tags.html:52
 #: rhodecode/templates/tags/tags_data.html:7
 msgid "Date"
 msgstr "Date"
 
 #: rhodecode/templates/admin/admin_log.html:9
 msgid "From IP"
 msgstr "Depuis l’adresse IP"
 
-#: rhodecode/templates/admin/admin_log.html:57
+#: rhodecode/templates/admin/admin_log.html:63
 msgid "No actions yet"
 msgstr "Aucune action n’a été enregistrée pour le moment."
 
 #: rhodecode/templates/admin/defaults/defaults.html:5
 #: rhodecode/templates/admin/defaults/defaults.html:25
 #, fuzzy
 msgid "Repositories defaults"
 msgstr "Groupes de dépôts"
 
 #: rhodecode/templates/admin/defaults/defaults.html:11
 #, fuzzy
 msgid "Defaults"
 msgstr "[Par défaut]"
 
 #: rhodecode/templates/admin/defaults/defaults.html:35
 #: rhodecode/templates/admin/repos/repo_add_base.html:38
 #: rhodecode/templates/admin/repos/repo_edit.html:58
 msgid "Type"
 msgstr "Type"
 
 #: rhodecode/templates/admin/defaults/defaults.html:48
 #: rhodecode/templates/admin/repos/repo_add_base.html:69
 #: rhodecode/templates/admin/repos/repo_edit.html:89
 #: rhodecode/templates/forks/fork.html:72
 #: rhodecode/templates/settings/repo_settings.html:80
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
 msgstr ""
 "Les dépôts privés sont visibles seulement par les utilisateurs ajoutés "
 "comme collaborateurs."
 
 #: rhodecode/templates/admin/defaults/defaults.html:55
 #: rhodecode/templates/admin/repos/repo_edit.html:94
 msgid "Enable statistics"
 msgstr "Activer les statistiques"
 
 #: rhodecode/templates/admin/defaults/defaults.html:59
 #: rhodecode/templates/admin/repos/repo_edit.html:98
 msgid "Enable statistics window on summary page."
 msgstr "Afficher les statistiques sur la page du dépôt."
 
 #: rhodecode/templates/admin/defaults/defaults.html:65
 #: rhodecode/templates/admin/repos/repo_edit.html:103
 msgid "Enable downloads"
 msgstr "Activer les téléchargements"
 
 #: rhodecode/templates/admin/defaults/defaults.html:69
 #: rhodecode/templates/admin/repos/repo_edit.html:107
 msgid "Enable download menu on summary page."
 msgstr "Afficher le menu de téléchargements sur la page du dépôt."
 
 #: rhodecode/templates/admin/defaults/defaults.html:75
 #: rhodecode/templates/admin/repos/repo_edit.html:112
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
 msgid "Enable locking"
 msgstr "Activer le verrouillage"
 
 #: rhodecode/templates/admin/defaults/defaults.html:79
 #: rhodecode/templates/admin/repos/repo_edit.html:116
 msgid "Enable lock-by-pulling on repository."
 msgstr "Activer le verrouillage lors d’un pull sur le dépôt."
 
 #: rhodecode/templates/admin/defaults/defaults.html:84
 #: rhodecode/templates/admin/ldap/ldap.html:89
 #: rhodecode/templates/admin/repos/repo_edit.html:141
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
 #: 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_groups/users_group_edit.html:135
-#: rhodecode/templates/settings/repo_settings.html:93
+#: rhodecode/templates/settings/repo_settings.html:94
 msgid "Save"
 msgstr "Enregistrer"
 
 #: rhodecode/templates/admin/ldap/ldap.html:5
 msgid "LDAP administration"
 msgstr "Administration LDAP"
 
 #: rhodecode/templates/admin/ldap/ldap.html:11
 msgid "Ldap"
 msgstr "LDAP"
 
 #: rhodecode/templates/admin/ldap/ldap.html:28
 msgid "Connection settings"
 msgstr "Options de connexion"
 
 #: rhodecode/templates/admin/ldap/ldap.html:30
 msgid "Enable LDAP"
 msgstr "Activer le LDAP"
 
 #: rhodecode/templates/admin/ldap/ldap.html:34
 msgid "Host"
 msgstr "Serveur"
 
 #: rhodecode/templates/admin/ldap/ldap.html:38
 msgid "Port"
 msgstr "Port"
 
 #: rhodecode/templates/admin/ldap/ldap.html:42
 msgid "Account"
 msgstr "Compte"
 
 #: rhodecode/templates/admin/ldap/ldap.html:50
 msgid "Connection security"
 msgstr "Connexion sécurisée"
 
 #: rhodecode/templates/admin/ldap/ldap.html:54
 msgid "Certificate Checks"
 msgstr "Vérif. des certificats"
 
 #: rhodecode/templates/admin/ldap/ldap.html:57
 msgid "Search settings"
 msgstr "Réglages de recherche"
 
 #: rhodecode/templates/admin/ldap/ldap.html:59
 msgid "Base DN"
 msgstr "Base de recherche"
 
 #: rhodecode/templates/admin/ldap/ldap.html:63
 msgid "LDAP Filter"
 msgstr "Filtre de recherche"
 
 #: rhodecode/templates/admin/ldap/ldap.html:67
 msgid "LDAP Search Scope"
 msgstr "Portée de recherche"
 
 #: rhodecode/templates/admin/ldap/ldap.html:70
 msgid "Attribute mappings"
 msgstr "Correspondance des attributs"
 
 #: rhodecode/templates/admin/ldap/ldap.html:72
 msgid "Login Attribute"
 msgstr "Attribut pour le nom d’utilisateur"
 
 #: rhodecode/templates/admin/ldap/ldap.html:76
 msgid "First Name Attribute"
 msgstr "Attribut pour le prénom"
 
 #: rhodecode/templates/admin/ldap/ldap.html:80
 msgid "Last Name Attribute"
 msgstr "Attribut pour le nom de famille"
 
 #: rhodecode/templates/admin/ldap/ldap.html:84
 msgid "E-mail Attribute"
 msgstr "Attribut pour l’e-mail"
 
 #: rhodecode/templates/admin/notifications/notifications.html:5
 #: rhodecode/templates/admin/notifications/notifications.html:9
 msgid "My Notifications"
 msgstr "Mes notifications"
 
 #: rhodecode/templates/admin/notifications/notifications.html:29
 msgid "All"
 msgstr "Tous"
 
 #: rhodecode/templates/admin/notifications/notifications.html:30
 msgid "Comments"
 msgstr "Commentaires"
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
 #: rhodecode/templates/base/base.html:267
 #: rhodecode/templates/base/base.html:269
 msgid "Pull requests"
 msgstr "Requêtes de pull"
 
 #: rhodecode/templates/admin/notifications/notifications.html:35
 msgid "Mark all read"
 msgstr "Tout marquer comme lu"
 
 #: rhodecode/templates/admin/notifications/notifications_data.html:39
 msgid "No notifications here yet"
 msgstr "Aucune notification pour le moment."
 
 #: rhodecode/templates/admin/notifications/show_notification.html:5
 #: rhodecode/templates/admin/notifications/show_notification.html:11
 msgid "Show notification"
 msgstr "Notification"
 
 #: rhodecode/templates/admin/notifications/show_notification.html:9
 msgid "Notifications"
 msgstr "Notifications"
 
 #: rhodecode/templates/admin/permissions/permissions.html:5
 msgid "Permissions administration"
 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/users_groups/users_group_edit.html:100
 #: rhodecode/templates/settings/repo_settings.html:86
 msgid "Permissions"
 msgstr "Permissions"
 
 #: rhodecode/templates/admin/permissions/permissions.html:24
 msgid "Default permissions"
 msgstr "Permissions par défaut"
 
 #: rhodecode/templates/admin/permissions/permissions.html:31
 msgid "Anonymous access"
 msgstr "Accès anonyme"
 
 #: rhodecode/templates/admin/permissions/permissions.html:49
 msgid ""
 "All default permissions on each repository will be reset to choosen "
 "permission, note that all custom default permission on repositories will "
 "be lost"
 msgstr ""
 "Les permissions par défaut de chaque dépôt vont être remplacées par la "
 "permission choisie. Toutes les permissions par défaut des dépôts seront "
 "perdues."
 
 #: rhodecode/templates/admin/permissions/permissions.html:50
 #: rhodecode/templates/admin/permissions/permissions.html:63
 msgid "overwrite existing settings"
 msgstr "Écraser les permissions existantes"
 
 #: rhodecode/templates/admin/permissions/permissions.html:55
 #: rhodecode/templates/admin/repos/repo_add_base.html:29
 #: rhodecode/templates/admin/repos/repo_edit.html:49
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:4
 #: rhodecode/templates/forks/fork.html:50
 #: rhodecode/templates/settings/repo_settings.html:48
 msgid "Repository group"
 msgstr "Groupe de dépôt"
 
 #: rhodecode/templates/admin/permissions/permissions.html:62
 #, fuzzy
 msgid ""
 "All default permissions on each repository group will be reset to choosen"
 " permission, note that all custom default permission on repositories "
 "group will be lost"
 msgstr ""
 "Les permissions par défaut de chaque dépôt vont être remplacées par la "
 "permission choisie. Toutes les permissions par défaut des dépôts seront "
 "perdues."
 
 #: rhodecode/templates/admin/permissions/permissions.html:69
 msgid "Registration"
 msgstr "Enregistrement"
 
 #: rhodecode/templates/admin/permissions/permissions.html:77
 msgid "Repository creation"
 msgstr "Création de dépôt"
 
 #: rhodecode/templates/admin/permissions/permissions.html:85
 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/repos/repo_add.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:11
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
 msgid "Repositories"
 msgstr "Dépôts"
 
 #: rhodecode/templates/admin/repos/repo_add.html:13
 msgid "add new"
 msgstr "ajouter un nouveau"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
 #: rhodecode/templates/summary/summary.html:104
 #: rhodecode/templates/summary/summary.html:105
 msgid "Clone from"
 msgstr "Cloner depuis"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:24
 #: rhodecode/templates/admin/repos/repo_edit.html:44
 #: rhodecode/templates/settings/repo_settings.html:43
 msgid "Optional http[s] url from which repository should be cloned."
 msgstr "URL http(s) depuis laquelle le dépôt doit être cloné."
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:33
 #: rhodecode/templates/forks/fork.html:54
 msgid "Optionaly select a group to put this repository into."
 msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt."
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:42
 msgid "Type of repository to create."
 msgstr "Type de dépôt à créer."
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:47
 #: rhodecode/templates/admin/repos/repo_edit.html:66
 #: rhodecode/templates/forks/fork.html:41
 #: rhodecode/templates/settings/repo_settings.html:57
 msgid "Landing revision"
 msgstr "Révision d’arrivée"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:51
 #: rhodecode/templates/admin/repos/repo_edit.html:70
 #: rhodecode/templates/forks/fork.html:45
 #: rhodecode/templates/settings/repo_settings.html:61
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 "Révision par défaut pour les pages de fichiers, de téléchargements, de "
 "recherche et de documentation."
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:60
 #: rhodecode/templates/admin/repos/repo_edit.html:79
 #: rhodecode/templates/forks/fork.html:63
 #: rhodecode/templates/settings/repo_settings.html:70
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 "Gardez cette description précise et concise. Utilisez un fichier README "
 "pour des descriptions plus détaillées."
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:73
 msgid "add"
 msgstr "Ajouter"
 
 #: rhodecode/templates/admin/repos/repo_add_create_repository.html:9
 msgid "add new repository"
 msgstr "ajouter un nouveau dépôt"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:5
 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"
 msgstr "URL de clone"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:53
 #: rhodecode/templates/settings/repo_settings.html:52
 msgid "Optional select a group to put this repository into."
 msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt."
 
 #: rhodecode/templates/admin/repos/repo_edit.html:126
 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:94
+#: rhodecode/templates/settings/repo_settings.html:95
 msgid "Reset"
 msgstr "Réinitialiser"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr "Administration"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:155
 msgid "Statistics"
 msgstr "Statistiques"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Reset current statistics"
 msgstr "Réinitialiser les statistiques"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Confirm to remove current statistics"
 msgstr "Souhaitez-vous vraiment réinitialiser les statistiques de ce dépôt ?"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:162
 msgid "Fetched to rev"
 msgstr "Parcouru jusqu’à la révision"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:163
 msgid "Stats gathered"
 msgstr "Statistiques obtenues"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:171
 msgid "Remote"
 msgstr "Dépôt distant"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Pull changes from remote location"
 msgstr "Récupérer les changements depuis le site distant"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:175
 msgid "Confirm to pull changes from remote side"
 msgstr "Voulez-vous vraiment récupérer les changements depuis le site distant ?"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:186
 msgid "Cache"
 msgstr "Cache"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:190
 msgid "Invalidate repository cache"
 msgstr "Invalider le cache du dépôt"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:190
 msgid "Confirm to invalidate repository cache"
 msgstr "Voulez-vous vraiment invalider le cache du dépôt ?"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:193
 msgid ""
 "Manually invalidate cache for this repository. On first access repository"
 " will be cached again"
 msgstr ""
 "Invalide manuellement le cache de ce dépôt. Au prochain accès sur ce "
 "dépôt, il sera à nouveau mis en cache."
 
 #: rhodecode/templates/admin/repos/repo_edit.html:198
 msgid "List of cached values"
 msgstr "Liste des valeurs en cache"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:201
 msgid "Prefix"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:202
 #, fuzzy
 msgid "Key"
 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_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
 msgid "Public journal"
 msgstr "Journal public"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:224
 msgid "Remove from public journal"
 msgstr "Supprimer du journal public"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:226
 msgid "Add to public journal"
 msgstr "Ajouter le dépôt au journal public"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:231
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
 msgstr ""
 "Le descriptif des actions réalisées sur ce dépôt sera visible à tous "
 "depuis le journal public."
 
 #: rhodecode/templates/admin/repos/repo_edit.html:238
 msgid "Locking"
 msgstr "Verrouillage"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:243
 msgid "Unlock locked repo"
 msgstr "Déverrouiller le dépôt"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:243
 msgid "Confirm to unlock repository"
 msgstr "Veuillez confirmer le déverrouillage de ce dépôt."
 
 #: rhodecode/templates/admin/repos/repo_edit.html:246
 msgid "lock repo"
 msgstr "Verrouiller le dépôt"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:246
 msgid "Confirm to lock repository"
 msgstr "Veuillez confirmer le verrouillage de ce dépôt."
 
 #: rhodecode/templates/admin/repos/repo_edit.html:247
 msgid "Repository is not locked"
 msgstr "Ce dépôt n’est pas verrouillé."
 
 #: rhodecode/templates/admin/repos/repo_edit.html:252
 msgid "Force locking on repository. Works only when anonymous access is disabled"
 msgstr ""
 "Forcer le verrouillage du dépôt. Ce réglage fonctionne uniquement quand "
 "l‘accès anonyme est désactivé."
 
 #: rhodecode/templates/admin/repos/repo_edit.html:259
 msgid "Set as fork of"
 msgstr "Indiquer comme fork"
 
 #: 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
 msgid "Delete"
 msgstr "Supprimer"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:278
+#: rhodecode/templates/settings/repo_settings.html:115
 msgid "Remove this repository"
 msgstr "Supprimer ce dépôt"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:278
+#: rhodecode/templates/settings/repo_settings.html:115
 msgid "Confirm to delete this repository"
 msgstr "Voulez-vous vraiment supprimer ce dépôt ?"
 
 #: rhodecode/templates/admin/repos/repo_edit.html:282
+#: rhodecode/templates/settings/repo_settings.html:119
+#, fuzzy
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for RhodeCode and VCS systems.\n"
-"                         If you need fully delete it from filesystem "
-"please do it manually"
+"unaccesible for RhodeCode and VCS systems. If you need fully delete it "
+"from file system please do it manually"
 msgstr ""
 "Ce dépôt sera renommé de manière à le rendre inaccessible à RhodeCode et "
 "au système de gestion de versions.\n"
 "Si vous voulez le supprimer complètement, effectuez la suppression "
 "manuellement. Ce dépôt sera renommé de manière à le rendre inaccessible à"
 " RhodeCode et au système de gestion de versions.\n"
 "Si vous voulez le supprimer complètement, effectuez la suppression "
 "manuellement."
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
 msgid "none"
 msgstr "Aucune"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:4
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4
 msgid "read"
 msgstr "Lecture"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:5
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5
 msgid "write"
 msgstr "Écriture"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:6
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
 #: rhodecode/templates/admin/users/users.html:85
 #: rhodecode/templates/base/base.html:229
 msgid "admin"
 msgstr "Administration"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:7
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html: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:87
+#: rhodecode/templates/journal/journal.html:95
 #: rhodecode/templates/summary/summary.html:85
 msgid "private repository"
 msgstr "Dépôt privé"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:19
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:28
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18
 msgid "default"
 msgstr "[Par défaut]"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:33
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42
 msgid "revoke"
 msgstr "Révoquer"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:83
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67
 msgid "Add another member"
 msgstr "Ajouter un utilisateur"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:97
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
 msgid "Failed to remove user"
 msgstr "Échec de suppression de l’utilisateur"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:112
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103
 msgid "Failed to remove users group"
 msgstr "Erreur lors de la suppression du groupe d’utilisateurs."
 
 #: rhodecode/templates/admin/repos/repos.html:5
 msgid "Repositories administration"
 msgstr "Administration des dépôts"
 
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73
 msgid "apply to children"
 msgstr "Appliquer aux enfants"
 
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74
 msgid ""
 "Set or revoke permission to all children of that group, including "
 "repositories and other groups"
 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/bookmarks/bookmarks.html:11
 #: rhodecode/templates/branches/branches.html:10
 #: rhodecode/templates/changelog/changelog.html:10
 #: rhodecode/templates/changeset/changeset.html:10
 #: rhodecode/templates/changeset/changeset_range.html:9
 #: rhodecode/templates/compare/compare_diff.html:9
 #: rhodecode/templates/files/file_diff.html:8
 #: rhodecode/templates/files/files.html:8
 #: rhodecode/templates/files/files_add.html:15
 #: rhodecode/templates/files/files_edit.html:15
 #: rhodecode/templates/followers/followers.html:9
 #: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9
 #: rhodecode/templates/pullrequests/pullrequest.html:8
 #: rhodecode/templates/pullrequests/pullrequest_show.html:8
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
 #: rhodecode/templates/settings/repo_settings.html:9
 #: rhodecode/templates/shortlog/shortlog.html:10
 #: rhodecode/templates/summary/summary.html:8
 #: rhodecode/templates/tags/tags.html:11
 msgid "Home"
 msgstr "Accueil"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:13
 msgid "with"
 msgstr "comprenant"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
 msgid "Add repos group"
 msgstr "Créer un groupe de dépôt"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10
 msgid "Repos groups"
 msgstr "Groupes de dépôts"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12
 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
 msgid "Group parent"
 msgstr "Parent du groupe"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58
 #: 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
 msgid "save"
 msgstr "Enregistrer"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
 msgid "Edit repos group"
 msgstr "Éditer le groupe de dépôt"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12
 msgid "edit repos group"
 msgstr "Édition du groupe de dépôt"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
 msgid ""
 "Enable lock-by-pulling on group. This option will be applied to all other"
 " groups and repositories inside"
 msgstr ""
 "Activer le verrou lors d’un pull sur le groupe. Cette option sera "
 "appliquée à tous les sous-groupes et dépôts de ce groupe."
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
 msgid "Repositories groups administration"
 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"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
 msgid "Number of toplevel repositories"
 msgstr "Nombre de sous-dépôts"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
 #: rhodecode/templates/admin/users/users.html:87
 #: rhodecode/templates/admin/users_groups/users_groups.html:35
 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
 #, 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
 msgid "There are no repositories groups yet"
 msgstr "Aucun groupe de dépôts n’a été créé pour le moment."
 
 #: rhodecode/templates/admin/settings/hooks.html:5
 #: rhodecode/templates/admin/settings/settings.html:5
 msgid "Settings administration"
 msgstr "Administration générale"
 
 #: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:9
 #: rhodecode/templates/settings/repo_settings.html:13
 msgid "Settings"
 msgstr "Options"
 
 #: rhodecode/templates/admin/settings/hooks.html:24
 msgid "Built in hooks - read only"
 msgstr "Hooks prédéfinis (lecture seule)"
 
 #: rhodecode/templates/admin/settings/hooks.html:40
 msgid "Custom hooks"
 msgstr "Hooks personnalisés"
 
 #: rhodecode/templates/admin/settings/hooks.html:56
 msgid "remove"
 msgstr "Enlever"
 
 #: rhodecode/templates/admin/settings/hooks.html:88
 msgid "Failed to remove hook"
 msgstr "Erreur lors de la suppression du hook."
 
 #: rhodecode/templates/admin/settings/settings.html:24
 msgid "Remap and rescan repositories"
 msgstr "Ré-associer et re-scanner les dépôts"
 
 #: rhodecode/templates/admin/settings/settings.html:32
 msgid "rescan option"
 msgstr "Option de re-scan"
 
 #: rhodecode/templates/admin/settings/settings.html:38
 msgid ""
 "In case a repository was deleted from filesystem and there are leftovers "
 "in the database check this option to scan obsolete data in database and "
 "remove it."
 msgstr ""
 "Cochez cette option pour supprimer d’éventuelles données obsolètes "
 "(concernant des dépôts manuellement supprimés) de la base de données."
 
 #: rhodecode/templates/admin/settings/settings.html:39
 msgid "destroy old data"
 msgstr "Supprimer les données obsolètes"
 
 #: rhodecode/templates/admin/settings/settings.html:41
 msgid ""
 "Rescan repositories location for new repositories. Also deletes obsolete "
 "if `destroy` flag is checked "
 msgstr ""
 "Rescanner le dossier contenant les dépôts pour en trouver de nouveaux. "
 "Supprime égalements les entrées de dépôts obsolètes si « Supprimer les "
 "données obsolètes » est coché."
 
 #: rhodecode/templates/admin/settings/settings.html:46
 msgid "Rescan repositories"
 msgstr "Re-scanner les dépôts"
 
 #: rhodecode/templates/admin/settings/settings.html:52
 msgid "Whoosh indexing"
 msgstr "Indexation Whoosh"
 
 #: rhodecode/templates/admin/settings/settings.html:60
 msgid "index build option"
 msgstr "Option d’indexation"
 
 #: rhodecode/templates/admin/settings/settings.html:65
 msgid "build from scratch"
 msgstr "Purger et reconstruire l’index"
 
 #: rhodecode/templates/admin/settings/settings.html:71
 msgid "Reindex"
 msgstr "Mettre à jour l’index"
 
 #: rhodecode/templates/admin/settings/settings.html:77
 msgid "Global application settings"
 msgstr "Réglages d’application globaux"
 
 #: rhodecode/templates/admin/settings/settings.html:86
 msgid "Application name"
 msgstr "Nom de l’application"
 
 #: rhodecode/templates/admin/settings/settings.html:95
 msgid "Realm text"
 msgstr "Texte du royaume"
 
 #: rhodecode/templates/admin/settings/settings.html:104
 msgid "GA code"
 msgstr "Code GA"
 
 #: rhodecode/templates/admin/settings/settings.html:112
 #: rhodecode/templates/admin/settings/settings.html:178
 #: rhodecode/templates/admin/settings/settings.html:268
 msgid "Save settings"
 msgstr "Enregister les options"
 
 #: rhodecode/templates/admin/settings/settings.html:119
 msgid "Visualisation settings"
 msgstr "Réglages d’affichage"
 
 #: rhodecode/templates/admin/settings/settings.html:127
 #, fuzzy
 msgid "General"
 msgstr "Activer"
 
 #: rhodecode/templates/admin/settings/settings.html:132
 msgid "Use lightweight dashboard"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:139
 msgid "Icons"
 msgstr "Icônes"
 
 #: rhodecode/templates/admin/settings/settings.html:144
 msgid "Show public repo icon on repositories"
 msgstr "Afficher l’icône de dépôt public sur les dépôts"
 
 #: rhodecode/templates/admin/settings/settings.html:148
 msgid "Show private repo icon on repositories"
 msgstr "Afficher l’icône de dépôt privé sur les dépôts"
 
 #: rhodecode/templates/admin/settings/settings.html:155
 msgid "Meta-Tagging"
 msgstr "Meta-Tagging"
 
 #: rhodecode/templates/admin/settings/settings.html:160
 msgid "Stylify recognised metatags:"
 msgstr "Styliser les méta-tags reconnus :"
 
 #: rhodecode/templates/admin/settings/settings.html:187
 msgid "VCS settings"
 msgstr "Réglages de gestionnaire de version"
 
 #: rhodecode/templates/admin/settings/settings.html:196
 msgid "Web"
 msgstr "Web"
 
 #: rhodecode/templates/admin/settings/settings.html:201
 msgid "require ssl for vcs operations"
 msgstr "SSL requis pour les opérations de push/pull"
 
 #: rhodecode/templates/admin/settings/settings.html:203
 msgid ""
 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it "
 "will return HTTP Error 406: Not Acceptable"
 msgstr ""
 "RhodeCode requièrera SSL pour les pushs et pulls. Si le SSL n’est pas "
 "utilisé l’erreur HTTP 406 (Non Acceptable) sera renvoyée."
 
 #: rhodecode/templates/admin/settings/settings.html:209
 msgid "Hooks"
 msgstr "Hooks"
 
 #: rhodecode/templates/admin/settings/settings.html:214
 msgid "Update repository after push (hg update)"
 msgstr "Mettre à jour les dépôts après un push (hg update)"
 
 #: rhodecode/templates/admin/settings/settings.html:218
 msgid "Show repository size after push"
 msgstr "Afficher la taille du dépôt après un push"
 
 #: rhodecode/templates/admin/settings/settings.html:222
 msgid "Log user push commands"
 msgstr "Journaliser les commandes de push"
 
 #: rhodecode/templates/admin/settings/settings.html:226
 msgid "Log user pull commands"
 msgstr "Journaliser les commandes de pull"
 
 #: rhodecode/templates/admin/settings/settings.html:230
 msgid "advanced setup"
 msgstr "Avancé"
 
 #: rhodecode/templates/admin/settings/settings.html:235
 msgid "Mercurial Extensions"
 msgstr "Extensions Mercurial"
 
 #: rhodecode/templates/admin/settings/settings.html:240
 msgid "largefiles extensions"
 msgstr "Extensions largefiles"
 
 #: rhodecode/templates/admin/settings/settings.html:244
 msgid "hgsubversion extensions"
 msgstr "Extensions hgsubversion"
 
 #: rhodecode/templates/admin/settings/settings.html:246
 msgid ""
 "Requires hgsubversion library installed. Allows clonning from svn remote "
 "locations"
 msgstr ""
 "Ceci nécessite l’installation de la bibliothèque hgsubversion. Permet de "
 "clôner à partir de dépôts Suversion."
 
 #: rhodecode/templates/admin/settings/settings.html:256
 msgid "Repositories location"
 msgstr "Emplacement des dépôts"
 
 #: rhodecode/templates/admin/settings/settings.html:261
 msgid ""
 "This a crucial application setting. If you are really sure you need to "
 "change this, you must restart application in order to make this setting "
 "take effect. Click this label to unlock."
 msgstr ""
 "Ce réglage ne devrait pas être modifié en temps normal. Si vous devez "
 "vraiment le faire, redémarrer l’application une fois le changement "
 "effectué. Cliquez sur ce texte pour déverrouiller."
 
 #: rhodecode/templates/admin/settings/settings.html:262
 #: rhodecode/templates/base/base.html:221
 msgid "unlock"
 msgstr "Déverrouiller"
 
 #: rhodecode/templates/admin/settings/settings.html:263
 msgid ""
 "Location where repositories are stored. After changing this value a "
 "restart, and rescan is required"
 msgstr ""
 "Emplacement de stockage des dépôts. Si cette valeur est changée, "
 "Rhodecode devra être redémarré les les dépôts rescannés."
 
 #: rhodecode/templates/admin/settings/settings.html:283
 msgid "Test Email"
 msgstr "E-mail de test"
 
 #: rhodecode/templates/admin/settings/settings.html:291
 msgid "Email to"
 msgstr "Envoyer l’e-mail à"
 
 #: rhodecode/templates/admin/settings/settings.html:299
 msgid "Send"
 msgstr "Envoyer"
 
 #: rhodecode/templates/admin/settings/settings.html:305
 msgid "System Info and Packages"
 msgstr "Information système et paquets"
 
 #: rhodecode/templates/admin/settings/settings.html:308
 msgid "show"
 msgstr "Montrer"
 
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr "Ajouter un utilisateur"
 
 #: rhodecode/templates/admin/users/user_add.html:10
 #: rhodecode/templates/admin/users/user_edit.html:11
 msgid "Users"
 msgstr "Utilisateurs"
 
 #: rhodecode/templates/admin/users/user_add.html:12
 msgid "add new user"
 msgstr "nouvel utilisateur"
 
 #: rhodecode/templates/admin/users/user_add.html:50
 msgid "Password confirmation"
 msgstr "Confirmation"
 
 #: rhodecode/templates/admin/users/user_edit.html:5
 msgid "Edit user"
 msgstr "Éditer l'utilisateur"
 
 #: rhodecode/templates/admin/users/user_edit.html:34
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10
 msgid "Change your avatar at"
 msgstr "Vous pouvez changer votre avatar sur"
 
 #: rhodecode/templates/admin/users/user_edit.html:35
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:11
 msgid "Using"
 msgstr "en utilisant l’adresse"
 
 #: rhodecode/templates/admin/users/user_edit.html:43
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:20
 msgid "API key"
 msgstr "Clé d’API"
 
 #: rhodecode/templates/admin/users/user_edit.html:63
 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
 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
 msgid "New password confirmation"
 msgstr "Confirmation du nouveau mot de passe"
 
 #: rhodecode/templates/admin/users/user_edit.html:151
 #: 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_groups/users_group_edit.html:113
 #, python-format
 msgid ""
 "Select to inherit permissions from %s settings. With this selected below "
 "options does not have any action"
 msgstr ""
 "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_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_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
 msgid "Email addresses"
 msgstr "Adresses e-mail"
 
 #: rhodecode/templates/admin/users/user_edit.html:260
 #, 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
 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
 msgid "My account"
 msgstr "Mon compte"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:9
 msgid "My Account"
 msgstr "Mon compte"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:35
 msgid "My permissions"
 msgstr "Mes permissions"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:41
+#: rhodecode/templates/journal/journal.html:49
 msgid "My repos"
 msgstr "Mes dépôts"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:41
 msgid "My pull requests"
 msgstr "Mes requêtes de pull"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:45
 msgid "Add repo"
 msgstr "Ajouter un dépôt"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
 msgid "Opened by me"
 msgstr "Ouvertes par moi"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10
 #, python-format
 msgid "Pull request #%s opened on %s"
 msgstr "Requête de pull nº%s ouverte le %s"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
 msgid "Confirm to delete this pull request"
 msgstr "Veuillez confirmer la suppression de cette requête de pull."
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26
 msgid "I participate in"
 msgstr "Je participe à"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
 msgstr "Requête de pull nº%s ouverte par %s le %s"
 
 #: rhodecode/templates/admin/users/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
 msgid "users"
 msgstr "Utilisateurs"
 
 #: rhodecode/templates/admin/users/users.html:23
 msgid "ADD NEW USER"
 msgstr "NOUVEL UTILISATEUR"
 
 #: rhodecode/templates/admin/users/users.html:77
 msgid "username"
 msgstr "Nom d’utilisateur"
 
 #: rhodecode/templates/admin/users/users.html:80
 msgid "firstname"
 msgstr "Prénom"
 
 #: rhodecode/templates/admin/users/users.html:81
 msgid "lastname"
 msgstr "Nom de famille"
 
 #: rhodecode/templates/admin/users/users.html:82
 msgid "last login"
 msgstr "Dernière connexion"
 
 #: rhodecode/templates/admin/users/users.html:84
 #: rhodecode/templates/admin/users_groups/users_groups.html:34
 msgid "active"
 msgstr "Actif"
 
 #: rhodecode/templates/admin/users/users.html:86
 #: rhodecode/templates/base/base.html:238
 msgid "ldap"
 msgstr "LDAP"
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:5
 msgid "Add users group"
 msgstr "Ajouter un groupe d’utilisateur"
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:10
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
 msgid "Users groups"
 msgstr "Groupes d’utilisateurs"
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:12
 msgid "add new users group"
 msgstr "Ajouter un nouveau groupe"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:5
 msgid "Edit users group"
 msgstr "Éditer le groupe d’utilisateurs"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:11
 msgid "UsersGroups"
 msgstr "UsersGroups"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:50
 msgid "Members"
 msgstr "Membres"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:58
 msgid "Choosen group members"
 msgstr "Membres du groupe"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:61
 msgid "Remove all elements"
 msgstr "Tout enlever"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:75
 msgid "Available members"
 msgstr "Membres disponibles"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:79
 msgid "Add all elements"
 msgstr "Tout ajouter"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:146
 msgid "Group members"
 msgstr "Membres du groupe"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:163
 #, fuzzy
 msgid "No members yet"
 msgstr "Membres"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:171
 #, fuzzy
 msgid "Permissions defined for this group"
 msgstr "Gestion des permissions"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:178
 #, fuzzy
 msgid "No permissions set yet"
 msgstr "Copier les permissions"
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:5
 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"
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:32
 msgid "group name"
 msgstr "Nom du groupe"
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:33
 #: rhodecode/templates/base/root.html:46
 msgid "members"
 msgstr "Membres"
 
 #: rhodecode/templates/admin/users_groups/users_groups.html:45
 #, python-format
 msgid "Confirm to delete this users group: %s"
 msgstr "Voulez-vous vraiment supprimer le groupe d‘utilisateurs « %s » ?"
 
 #: rhodecode/templates/base/base.html:41
 msgid "Submit a bug"
 msgstr "Signaler un bogue"
 
 #: rhodecode/templates/base/base.html:77
 msgid "Login to your account"
 msgstr "Connexion à votre compte"
 
 #: rhodecode/templates/base/base.html:100
 msgid "Forgot password ?"
 msgstr "Mot de passe oublié ?"
 
 #: rhodecode/templates/base/base.html:107
 msgid "Log In"
 msgstr "Connexion"
 
 #: rhodecode/templates/base/base.html:118
 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/journal/journal.html:4
-#: rhodecode/templates/journal/journal.html:21
 #: rhodecode/templates/journal/public_journal.html:4
 msgid "Journal"
 msgstr "Historique"
 
 #: rhodecode/templates/base/base.html:125
 msgid "Log Out"
 msgstr "Se déconnecter"
 
 #: rhodecode/templates/base/base.html:144
 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…"
 
 #: 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:166
 #: rhodecode/templates/base/base.html:168
 #: rhodecode/templates/base/base.html:170
 #: 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
 msgid "Changelog"
 msgstr "Historique"
 
 #: rhodecode/templates/base/base.html:175
 #: rhodecode/templates/base/base.html:177
 #: rhodecode/templates/base/base.html:179
 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
 msgid "Files"
 msgstr "Fichiers"
 
 #: rhodecode/templates/base/base.html:195
 #: rhodecode/templates/base/base.html:199
 msgid "Options"
 msgstr "Options"
 
 #: rhodecode/templates/base/base.html:204
 #: rhodecode/templates/base/base.html:206
 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/forks/fork.html:13
 msgid "fork"
 msgstr "Fork"
 
 #: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50
 #: rhodecode/templates/changelog/changelog.html:43
 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"
 msgstr "Comparer le fork"
 
 #: rhodecode/templates/base/base.html:217
 msgid "search"
 msgstr "Rechercher"
 
 #: rhodecode/templates/base/base.html:223
 msgid "lock"
 msgstr "Verrouiller"
 
 #: rhodecode/templates/base/base.html:234
 msgid "repositories groups"
 msgstr "Groupes de dépôts"
 
 #: rhodecode/templates/base/base.html:236
 msgid "users groups"
 msgstr "Groupes d’utilisateurs"
 
 #: rhodecode/templates/base/base.html:237
 msgid "permissions"
 msgstr "Permissions"
 
 #: rhodecode/templates/base/base.html:239
 #, fuzzy
 msgid "defaults"
 msgstr "[Par défaut]"
 
 #: rhodecode/templates/base/base.html:240
 msgid "settings"
 msgstr "Réglages"
 
 #: rhodecode/templates/base/base.html:251
 #: rhodecode/templates/base/base.html:253
 msgid "Followers"
 msgstr "Followers"
 
 #: rhodecode/templates/base/base.html:259
 #: rhodecode/templates/base/base.html:261
 msgid "Forks"
 msgstr "Forks"
 
 #: rhodecode/templates/base/base.html:340
 #: rhodecode/templates/base/base.html:342
 #: rhodecode/templates/base/base.html:344
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "Rechercher"
 
 #: rhodecode/templates/base/root.html:42
 msgid "add another comment"
 msgstr "Nouveau commentaire"
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:75
+#: rhodecode/templates/journal/journal.html:83
 #: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr "Arrêter de suivre ce dépôt"
 
 #: rhodecode/templates/base/root.html:44
 #: rhodecode/templates/summary/summary.html:61
 msgid "Start following this repository"
 msgstr "Suivre ce dépôt"
 
 #: rhodecode/templates/base/root.html:45
 msgid "Group"
 msgstr "Groupe"
 
 #: rhodecode/templates/base/root.html:48
 msgid "search truncated"
 msgstr "Résultats tronqués"
 
 #: rhodecode/templates/base/root.html:49
 msgid "no matching files"
 msgstr "Aucun fichier ne correspond"
 
 #: rhodecode/templates/base/root.html:51
 #, fuzzy
 msgid "Open new pull request for selected changesets"
 msgstr "a ouvert une nouvelle requête de pull"
 
 #: rhodecode/templates/base/root.html:52
 msgid "Show selected changes __S -> __E"
 msgstr "Afficher les changements sélections de __S à __E"
 
 #: rhodecode/templates/base/root.html:53
 msgid "Selection link"
 msgstr "Lien vers la sélection"
 
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr "Signets de %s"
 
 #: rhodecode/templates/bookmarks/bookmarks.html:39
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
 #: rhodecode/templates/branches/branches.html:53
 #: rhodecode/templates/branches/branches_data.html:8
 #: rhodecode/templates/tags/tags.html:54
 #: rhodecode/templates/tags/tags_data.html:8
 msgid "Author"
 msgstr "Auteur"
 
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
 msgstr "Branches de %s"
 
 #: rhodecode/templates/branches/branches.html:29
 msgid "Compare branches"
 msgstr "Comparer les branches"
 
 #: rhodecode/templates/branches/branches.html:56
 #: rhodecode/templates/branches/branches_data.html:10
 #: rhodecode/templates/compare/compare_diff.html:5
 #: rhodecode/templates/compare/compare_diff.html:13
 #: rhodecode/templates/tags/tags.html:57
 #: rhodecode/templates/tags/tags_data.html:10
 msgid "Compare"
 msgstr "Comparer"
 
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr "Historique de %s"
 
 #: rhodecode/templates/changelog/changelog.html:15
 #, python-format
 msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
 msgstr[0] "Affichage de %d révision sur %d"
 msgstr[1] "Affichage de %d révisions sur %d"
 
 #: rhodecode/templates/changelog/changelog.html:37
 #, fuzzy
 msgid "Clear selection"
 msgstr "Réglages de recherche"
 
 #: rhodecode/templates/changelog/changelog.html:40
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
 msgid "compare fork with %s"
 msgstr "Comparer le fork avec %s"
 
 #: rhodecode/templates/changelog/changelog.html:40
 #, fuzzy
 msgid "Compare fork with parent"
 msgstr "Comparer le fork avec %s"
 
 #: rhodecode/templates/changelog/changelog.html:49
 msgid "Show"
 msgstr "Afficher"
 
 #: rhodecode/templates/changelog/changelog.html:74
 #: rhodecode/templates/summary/summary.html:375
 msgid "show more"
 msgstr "montrer plus"
 
 #: rhodecode/templates/changelog/changelog.html:78
 msgid "Affected number of files, click to show more details"
 msgstr "Nombre de fichiers modifiés, cliquez pour plus de détails"
 
 #: rhodecode/templates/changelog/changelog.html:91
-#: rhodecode/templates/changeset/changeset.html:44
+#: rhodecode/templates/changeset/changeset.html:65
 #: rhodecode/templates/changeset/changeset_file_comment.html:20
 #: rhodecode/templates/changeset/changeset_range.html:46
 msgid "Changeset status"
 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."
 
 #: rhodecode/templates/changelog/changelog.html:104
-#: rhodecode/templates/changeset/changeset.html:85
 msgid "Parent"
 msgstr "Parent"
 
 #: rhodecode/templates/changelog/changelog.html:110
-#: rhodecode/templates/changeset/changeset.html:91
+#: rhodecode/templates/changeset/changeset.html:42
 msgid "No parents"
 msgstr "Aucun parent"
 
 #: rhodecode/templates/changelog/changelog.html:115
-#: rhodecode/templates/changeset/changeset.html:95
+#: rhodecode/templates/changeset/changeset.html:106
 #: rhodecode/templates/changeset/changeset_range.html:79
 msgid "merge"
 msgstr "Fusion"
 
 #: rhodecode/templates/changelog/changelog.html:118
-#: rhodecode/templates/changeset/changeset.html:98
+#: rhodecode/templates/changeset/changeset.html:109
 #: rhodecode/templates/changeset/changeset_range.html:82
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_add.html:33
 #: rhodecode/templates/files/files_edit.html:33
 #: rhodecode/templates/shortlog/shortlog_data.html:9
 msgid "branch"
 msgstr "Branche"
 
 #: rhodecode/templates/changelog/changelog.html:124
 #: rhodecode/templates/changeset/changeset_range.html:88
 msgid "bookmark"
 msgstr "Signet"
 
 #: rhodecode/templates/changelog/changelog.html:130
-#: rhodecode/templates/changeset/changeset.html:103
+#: rhodecode/templates/changeset/changeset.html:114
 #: rhodecode/templates/changeset/changeset_range.html:94
 msgid "tag"
 msgstr "Tag"
 
 #: rhodecode/templates/changelog/changelog.html:301
 msgid "There are no changes yet"
 msgstr "Il n’y a aucun changement pour le moment"
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:73
+#: rhodecode/templates/changeset/changeset.html:94
 msgid "removed"
 msgstr "Supprimés"
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:74
+#: rhodecode/templates/changeset/changeset.html:95
 msgid "changed"
 msgstr "Modifiés"
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:75
+#: rhodecode/templates/changeset/changeset.html:96
 msgid "added"
 msgstr "Ajoutés"
 
 #: rhodecode/templates/changelog/changelog_details.html:8
 #: rhodecode/templates/changelog/changelog_details.html:9
 #: rhodecode/templates/changelog/changelog_details.html:10
-#: rhodecode/templates/changeset/changeset.html:77
-#: rhodecode/templates/changeset/changeset.html:78
-#: rhodecode/templates/changeset/changeset.html:79
+#: rhodecode/templates/changeset/changeset.html:98
+#: rhodecode/templates/changeset/changeset.html:99
+#: rhodecode/templates/changeset/changeset.html:100
 #, python-format
 msgid "affected %s files"
 msgstr "%s fichiers affectés"
 
 #: rhodecode/templates/changeset/changeset.html:6
 #, python-format
 msgid "%s Changeset"
 msgstr "Changeset de %s"
 
 #: rhodecode/templates/changeset/changeset.html:14
 msgid "Changeset"
 msgstr "Changements"
 
-#: rhodecode/templates/changeset/changeset.html:49
+#: rhodecode/templates/changeset/changeset.html:52
+#, fuzzy
+msgid "No children"
+msgstr "Appliquer aux enfants"
+
+#: rhodecode/templates/changeset/changeset.html:70
 #: rhodecode/templates/changeset/diff_block.html:20
 msgid "raw diff"
 msgstr "Diff brut"
 
-#: rhodecode/templates/changeset/changeset.html:50
+#: rhodecode/templates/changeset/changeset.html:71
 #, fuzzy
 msgid "patch diff"
 msgstr "Diff brut"
 
-#: rhodecode/templates/changeset/changeset.html:51
+#: rhodecode/templates/changeset/changeset.html:72
 #: rhodecode/templates/changeset/diff_block.html:21
 msgid "download diff"
 msgstr "Télécharger le diff"
 
-#: rhodecode/templates/changeset/changeset.html:55
+#: rhodecode/templates/changeset/changeset.html:76
 #: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d commentaire"
 msgstr[1] "%d commentaires"
 
-#: rhodecode/templates/changeset/changeset.html:55
+#: rhodecode/templates/changeset/changeset.html:76
 #: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
 msgstr[0] "(et %d en ligne)"
 msgstr[1] "(et %d en ligne)"
 
-#: rhodecode/templates/changeset/changeset.html:111
+#: rhodecode/templates/changeset/changeset.html:122
 #: rhodecode/templates/compare/compare_diff.html:44
 #: rhodecode/templates/pullrequests/pullrequest_show.html:76
 #, fuzzy, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
 msgstr[0] "%s fichié modifié"
 msgstr[1] "%s fichié modifié"
 
-#: rhodecode/templates/changeset/changeset.html:113
+#: rhodecode/templates/changeset/changeset.html:124
 #: rhodecode/templates/compare/compare_diff.html:46
 #: rhodecode/templates/pullrequests/pullrequest_show.html:78
 #, 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
 msgid "Submitting..."
 msgstr "Envoi…"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:45
 msgid "Commenting on line {1}."
 msgstr "Commentaire sur la ligne {1}."
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:46
 #: rhodecode/templates/changeset/changeset_file_comment.html:121
 #, 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
 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:138
+#: rhodecode/templates/changeset/changeset_file_comment.html:143
 msgid "Comment"
 msgstr "Commentaire"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:60
 #: rhodecode/templates/changeset/changeset_file_comment.html:71
 msgid "Hide"
 msgstr "Masquer"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "You need to be logged in to comment."
 msgstr "Vous devez être connecté pour poster des commentaires."
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "Login now"
 msgstr "Se connecter maintenant"
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:118
 msgid "Leave a comment"
 msgstr "Laisser un commentaire"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:124
+#: rhodecode/templates/changeset/changeset_file_comment.html:125
 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:124
+#: rhodecode/templates/changeset/changeset_file_comment.html:125
 msgid "change status"
 msgstr "Modifier le statut"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:140
+#: rhodecode/templates/changeset/changeset_file_comment.html:145
 msgid "Comment and close"
 msgstr "Commenter et fermer"
 
 #: rhodecode/templates/changeset/changeset_range.html:5
 #, python-format
 msgid "%s Changesets"
 msgstr "Changesets de %s"
 
 #: rhodecode/templates/changeset/changeset_range.html:29
 #: rhodecode/templates/compare/compare_diff.html:29
 msgid "Compare View"
 msgstr "Comparaison"
 
 #: rhodecode/templates/changeset/changeset_range.html:29
 #, fuzzy
 msgid "Show combined compare"
 msgstr "Afficher les commentaires"
 
 #: rhodecode/templates/changeset/changeset_range.html:54
 msgid "Files affected"
 msgstr "Fichiers affectés"
 
 #: rhodecode/templates/changeset/diff_block.html:19
 msgid "show full diff for this file"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:27
 msgid "show inline comments"
 msgstr "Afficher les commentaires"
 
 #: rhodecode/templates/compare/compare_cs.html:5
 msgid "No changesets"
 msgstr "Aucun changeset"
 
 #: rhodecode/templates/compare/compare_diff.html:37
 #: rhodecode/templates/pullrequests/pullrequest_show.html:69
 #, fuzzy, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
 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
 #, 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
 msgid "Fork"
 msgstr "Fork"
 
 #: rhodecode/templates/data_table/_dt_elements.html:60
-#: rhodecode/templates/journal/journal.html:81
+#: rhodecode/templates/journal/journal.html:89
 #: 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:83
+#: rhodecode/templates/journal/journal.html:91
 #: 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:89
+#: rhodecode/templates/journal/journal.html:97
 #: rhodecode/templates/summary/summary.html:87
 msgid "public repository"
 msgstr "Dépôt public"
 
 #: rhodecode/templates/data_table/_dt_elements.html:80
 #: 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
 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
 #, 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
 #, 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 user: %s"
 msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?"
 
 #: rhodecode/templates/email_templates/changeset_comment.html:10
 #, fuzzy
 msgid "New status$"
 msgstr "Modifier le statut"
 
 #: rhodecode/templates/email_templates/main.html:8
 #, fuzzy
 msgid "This is a notification from RhodeCode."
 msgstr "Ceci est une notification de RhodeCode."
 
 #: rhodecode/templates/email_templates/password_reset.html:4
 msgid "Hello"
 msgstr ""
 
 #: rhodecode/templates/email_templates/password_reset.html:6
 msgid "We received a request to create a new password for your account."
 msgstr ""
 
 #: rhodecode/templates/email_templates/password_reset.html:8
 msgid "You can generate it by clicking following URL"
 msgstr ""
 
 #: rhodecode/templates/email_templates/password_reset.html:12
 msgid "If you didn't request new password please ignore this email."
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:4
 #, python-format
 msgid ""
 "User %s opened pull request for repository %s and wants you to review "
 "changes."
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:5
 #, fuzzy
 msgid "title"
 msgstr "Titre"
 
 #: rhodecode/templates/email_templates/pull_request.html:6
 #: rhodecode/templates/pullrequests/pullrequest.html:115
 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
 #, fuzzy
 msgid "View this pull request here"
 msgstr "Ajouter un relecteur à cette requête de pull."
 
 #: rhodecode/templates/email_templates/pull_request_comment.html:4
 #, fuzzy, python-format
 msgid "User %s commented on pull request #%s for repository %s"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.html:10
 #, fuzzy
 msgid "New status"
 msgstr "Modifier le statut"
 
 #: rhodecode/templates/email_templates/pull_request_comment.html:14
 msgid "View this comment here"
 msgstr ""
 
 #: rhodecode/templates/email_templates/registration.html:4
 #, fuzzy
 msgid "A new user have registered in RhodeCode"
 msgstr "Vous vous êtes inscrits avec succès à RhodeCode"
 
 #: rhodecode/templates/email_templates/registration.html:9
 msgid "View this user here"
 msgstr ""
 
 #: rhodecode/templates/errors/error_document.html:46
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr "Vous serez redirigé vers %s dans %s secondes."
 
 #: rhodecode/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File diff"
 msgstr "Diff de fichier de %s"
 
 #: rhodecode/templates/files/file_diff.html:12
 msgid "File diff"
 msgstr "Diff de fichier"
 
 #: rhodecode/templates/files/files.html:4
 #: rhodecode/templates/files/files.html:74
 #, python-format
 msgid "%s files"
 msgstr "Fichiers de %s"
 
 #: rhodecode/templates/files/files.html:12
 #: rhodecode/templates/summary/summary.html:351
 msgid "files"
 msgstr "Fichiers"
 
 #: rhodecode/templates/files/files_add.html:4
 #: rhodecode/templates/files/files_edit.html:4
 #, python-format
 msgid "%s Edit file"
 msgstr "Edition de fichier de %s"
 
 #: rhodecode/templates/files/files_add.html:19
 msgid "add file"
 msgstr "Ajouter un fichier"
 
 #: rhodecode/templates/files/files_add.html:40
 msgid "Add new file"
 msgstr "Ajouter un nouveau fichier"
 
 #: rhodecode/templates/files/files_add.html:45
 msgid "File Name"
 msgstr "Nom de fichier"
 
 #: rhodecode/templates/files/files_add.html:49
 #: rhodecode/templates/files/files_add.html:58
 msgid "or"
 msgstr "ou"
 
 #: rhodecode/templates/files/files_add.html:49
 #: rhodecode/templates/files/files_add.html:54
 msgid "Upload file"
 msgstr "Téléverser un fichier"
 
 #: rhodecode/templates/files/files_add.html:58
 msgid "Create new file"
 msgstr "Créer un nouveau fichier"
 
 #: rhodecode/templates/files/files_add.html:63
 #: rhodecode/templates/files/files_edit.html:39
 #: rhodecode/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr "Emplacement"
 
 #: rhodecode/templates/files/files_add.html:67
 msgid "use / to separate directories"
 msgstr "Utilisez / pour séparer les répertoires"
 
 #: rhodecode/templates/files/files_add.html:77
 #: rhodecode/templates/files/files_edit.html:63
 #: rhodecode/templates/shortlog/shortlog_data.html:6
 msgid "commit message"
 msgstr "Message de commit"
 
 #: rhodecode/templates/files/files_add.html:81
 #: rhodecode/templates/files/files_edit.html:67
 msgid "Commit changes"
 msgstr "Commiter les changements"
 
 #: rhodecode/templates/files/files_browser.html:13
 msgid "view"
 msgstr "voir"
 
 #: rhodecode/templates/files/files_browser.html:14
 msgid "previous revision"
 msgstr "révision précédente"
 
 #: rhodecode/templates/files/files_browser.html:16
 msgid "next revision"
 msgstr "révision suivante"
 
 #: rhodecode/templates/files/files_browser.html:23
 msgid "follow current branch"
 msgstr "Suivre la branche actuelle"
 
 #: rhodecode/templates/files/files_browser.html:27
 msgid "search file list"
 msgstr "Rechercher un fichier"
 
 #: rhodecode/templates/files/files_browser.html:31
 #: rhodecode/templates/shortlog/shortlog_data.html:78
 msgid "add new file"
 msgstr "Ajouter un fichier"
 
 #: rhodecode/templates/files/files_browser.html:35
 msgid "Loading file list..."
 msgstr "Chargement de la liste des fichiers…"
 
 #: rhodecode/templates/files/files_browser.html:48
 msgid "Size"
 msgstr "Taille"
 
 #: rhodecode/templates/files/files_browser.html:49
 msgid "Mimetype"
 msgstr "Type MIME"
 
 #: rhodecode/templates/files/files_browser.html:50
 msgid "Last Revision"
 msgstr "Dernière révision"
 
 #: rhodecode/templates/files/files_browser.html:51
 msgid "Last modified"
 msgstr "Dernière modification"
 
 #: rhodecode/templates/files/files_browser.html:52
 msgid "Last commiter"
 msgstr "Dernier commiteur"
 
 #: rhodecode/templates/files/files_edit.html:19
 msgid "edit file"
 msgstr "Éditer le fichier"
 
 #: rhodecode/templates/files/files_edit.html:49
 #: rhodecode/templates/files/files_source.html:23
 msgid "show annotation"
 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
 msgid "show as raw"
 msgstr "montrer le fichier brut"
 
 #: rhodecode/templates/files/files_edit.html:51
 #: rhodecode/templates/files/files_source.html:26
 msgid "download as raw"
 msgstr "télécharger le fichier brut"
 
 #: rhodecode/templates/files/files_edit.html:54
 msgid "source"
 msgstr "Source"
 
 #: rhodecode/templates/files/files_edit.html:59
 msgid "Editing file"
 msgstr "Édition du fichier"
 
 #: rhodecode/templates/files/files_history_box.html:2
 msgid "History"
 msgstr "Historique"
 
 #: rhodecode/templates/files/files_history_box.html:9
 msgid "diff to revision"
 msgstr "Diff avec la révision"
 
 #: rhodecode/templates/files/files_history_box.html:10
 msgid "show at revision"
 msgstr "Afficher à la révision"
 
 #: rhodecode/templates/files/files_history_box.html:11
 #, fuzzy
 msgid "show full history"
 msgstr "Chargement de la liste des fichiers…"
 
 #: rhodecode/templates/files/files_history_box.html:16
 #, python-format
 msgid "%s author"
 msgid_plural "%s authors"
 msgstr[0] "%s auteur"
 msgstr[1] "%s auteurs"
 
 #: rhodecode/templates/files/files_source.html:6
 #, fuzzy
 msgid "Load file history"
 msgstr "Chargement de la liste des fichiers…"
 
 #: rhodecode/templates/files/files_source.html:21
 msgid "show source"
 msgstr "montrer les sources"
 
 #: rhodecode/templates/files/files_source.html:44
 #, python-format
 msgid "Binary file (%s)"
 msgstr "Fichier binaire (%s)"
 
 #: rhodecode/templates/files/files_source.html:53
 msgid "File is too big to display"
 msgstr "Ce fichier est trop gros pour être affiché."
 
 #: rhodecode/templates/files/files_ypjax.html:5
 msgid "annotation"
 msgstr "annotation"
 
 #: rhodecode/templates/files/files_ypjax.html:15
 msgid "Go back"
 msgstr "Revenir en arrière"
 
 #: rhodecode/templates/files/files_ypjax.html:16
 msgid "No files at given path"
 msgstr "Aucun fichier à cet endroit"
 
 #: rhodecode/templates/followers/followers.html:5
 #, python-format
 msgid "%s Followers"
 msgstr "Followers de %s"
 
 #: rhodecode/templates/followers/followers.html:13
 msgid "followers"
 msgstr "followers"
 
 #: rhodecode/templates/followers/followers_data.html:12
 msgid "Started following -"
 msgstr "A commencé à suivre le dépôt :"
 
 #: rhodecode/templates/forks/fork.html:5
 #, python-format
 msgid "%s Fork"
 msgstr "Fork de %s"
 
 #: rhodecode/templates/forks/fork.html:31
 msgid "Fork name"
 msgstr "Nom du fork"
 
 #: rhodecode/templates/forks/fork.html:68
 msgid "Private"
 msgstr "Privé"
 
 #: rhodecode/templates/forks/fork.html:77
 msgid "Copy permissions"
 msgstr "Copier les permissions"
 
 #: rhodecode/templates/forks/fork.html:81
 msgid "Copy permissions from forked repository"
 msgstr "Copier les permissions depuis le dépôt forké"
 
 #: rhodecode/templates/forks/fork.html:86
 msgid "Update after clone"
 msgstr "MÀJ après le clonage"
 
 #: rhodecode/templates/forks/fork.html:90
 msgid "Checkout source after making a clone"
 msgstr "Mettre à jour depuis la source après clonage"
 
 #: rhodecode/templates/forks/fork.html:94
 msgid "fork this repository"
 msgstr "Forker ce dépôt"
 
 #: rhodecode/templates/forks/forks.html:5
 #, python-format
 msgid "%s Forks"
 msgstr "Forks de %s"
 
 #: rhodecode/templates/forks/forks.html:13
 msgid "forks"
 msgstr "forks"
 
 #: rhodecode/templates/forks/forks_data.html:17
 msgid "forked"
 msgstr "forké"
 
 #: rhodecode/templates/forks/forks_data.html:42
 msgid "There are no forks yet"
 msgstr "Il n’y a pas encore de forks."
 
-#: rhodecode/templates/journal/journal.html:13
+#: rhodecode/templates/journal/journal.html:21
 msgid "ATOM journal feed"
 msgstr "Flux ATOM du journal"
 
-#: rhodecode/templates/journal/journal.html:14
+#: rhodecode/templates/journal/journal.html:22
 msgid "RSS journal feed"
 msgstr "Flux RSS du journal"
 
-#: rhodecode/templates/journal/journal.html:24
+#: rhodecode/templates/journal/journal.html:32
 #: rhodecode/templates/pullrequests/pullrequest.html:55
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: rhodecode/templates/journal/journal.html:27
+#: rhodecode/templates/journal/journal.html:35
 #: rhodecode/templates/journal/public_journal.html:24
 msgid "RSS feed"
 msgstr "Flux RSS"
 
-#: rhodecode/templates/journal/journal.html:30
+#: rhodecode/templates/journal/journal.html:38
 #: rhodecode/templates/journal/public_journal.html:27
 msgid "ATOM feed"
 msgstr "Flux ATOM"
 
-#: rhodecode/templates/journal/journal.html:41
+#: rhodecode/templates/journal/journal.html:49
 msgid "Watched"
 msgstr "Surveillé"
 
-#: rhodecode/templates/journal/journal.html:46
+#: rhodecode/templates/journal/journal.html:54
 msgid "ADD"
 msgstr "AJOUTER"
 
-#: rhodecode/templates/journal/journal.html:69
+#: rhodecode/templates/journal/journal.html:77
 msgid "following user"
 msgstr "utilisateur suivant"
 
-#: rhodecode/templates/journal/journal.html:69
+#: rhodecode/templates/journal/journal.html:77
 msgid "user"
 msgstr "utilisateur"
 
-#: rhodecode/templates/journal/journal.html:102
+#: 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:51
+#: rhodecode/templates/journal/journal_data.html:55
 msgid "No entries yet"
 msgstr "Aucune entrée pour le moment"
 
 #: rhodecode/templates/journal/public_journal.html:13
 msgid "ATOM public journal feed"
 msgstr "Flux ATOM du journal public"
 
 #: rhodecode/templates/journal/public_journal.html:14
 msgid "RSS public journal feed"
 msgstr "Flux RSS du journal public"
 
 #: rhodecode/templates/journal/public_journal.html:21
 msgid "Public Journal"
 msgstr "Journal public"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:4
 #: rhodecode/templates/pullrequests/pullrequest.html:12
 msgid "New pull request"
 msgstr "Nouvelle requête de pull"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:54
 msgid "refresh overview"
 msgstr "Rafraîchir les informations"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:66
 msgid "Detailed compare view"
 msgstr "Comparaison détaillée"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:70
 #: rhodecode/templates/pullrequests/pullrequest_show.html:100
 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
 msgid "owner"
 msgstr "Propriétaire"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:91
 #: rhodecode/templates/pullrequests/pullrequest_show.html:127
 msgid "Add reviewer to this pull request."
 msgstr "Ajouter un relecteur à cette requête de pull."
 
 #: rhodecode/templates/pullrequests/pullrequest.html:97
 msgid "Create new pull request"
 msgstr "Nouvelle requête de pull"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:106
 #: rhodecode/templates/pullrequests/pullrequest_show.html:25
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
 msgid "Title"
 msgstr "Titre"
 
 #: rhodecode/templates/pullrequests/pullrequest.html:123
 msgid "Send pull request"
 msgstr "Envoyer la requête de pull"
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:23
 #, python-format
 msgid "Closed %s"
 msgstr "Fermée %s"
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:23
 #, python-format
 msgid "with status %s"
 msgstr "avec %s comme statut."
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:31
 msgid "Status"
 msgstr "Statut"
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Pull request status"
 msgstr "Statut de la requête de pull"
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:44
 msgid "Still not reviewed by"
 msgstr "Pas encore relue par"
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:48
 #, python-format
 msgid "%d reviewer"
 msgid_plural "%d reviewers"
 msgstr[0] "%d relecteur"
 msgstr[1] "%d relecteurs"
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:50
 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
 msgid "Created on"
 msgstr "Créé le"
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:65
 msgid "Compare view"
 msgstr "Vue de comparaison"
 
+#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#, fuzzy
+msgid "reviewer"
+msgstr "%d relecteur"
+
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
 msgid "all pull requests"
 msgstr "Requêtes de pull"
 
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
 msgid "All pull requests"
 msgstr "Toutes les requêtes de pull"
 
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:27
 msgid "Closed"
 msgstr "Fermée"
 
 #: rhodecode/templates/search/search.html:6
 #, python-format
 msgid "Search \"%s\" in repository: %s"
 msgstr "Rechercher « %s » dans le dépôt : %s"
 
 #: rhodecode/templates/search/search.html:8
 #, python-format
 msgid "Search \"%s\" in all repositories"
 msgstr "Rechercher « %s » dans tous les dépôts"
 
 #: rhodecode/templates/search/search.html:12
 #: rhodecode/templates/search/search.html:32
 #, python-format
 msgid "Search in repository: %s"
 msgstr "Rechercher dans le dépôt : %s"
 
 #: rhodecode/templates/search/search.html:14
 #: rhodecode/templates/search/search.html:34
 msgid "Search in all repositories"
 msgstr "Rechercher dans tous les dépôts"
 
 #: rhodecode/templates/search/search.html:48
 msgid "Search term"
 msgstr "Termes de la recherches"
 
 #: rhodecode/templates/search/search.html:60
 msgid "Search in"
 msgstr "Rechercher dans"
 
 #: rhodecode/templates/search/search.html:63
 msgid "File contents"
 msgstr "Le contenu des fichiers"
 
 #: rhodecode/templates/search/search.html:64
 msgid "Commit messages"
 msgstr "Les messages de commit"
 
 #: rhodecode/templates/search/search.html:65
 msgid "File names"
 msgstr "Les noms de fichiers"
 
 #: rhodecode/templates/search/search_commit.html:35
 #: rhodecode/templates/search/search_content.html:21
 #: rhodecode/templates/search/search_path.html:15
 msgid "Permission denied"
 msgstr "Permission refusée"
 
 #: rhodecode/templates/settings/repo_settings.html:5
 #, python-format
 msgid "%s Settings"
 msgstr "Réglages de %s"
 
+#: rhodecode/templates/settings/repo_settings.html:102
+#, fuzzy
+msgid "Delete repository"
+msgstr "[a supprimé] le dépôt"
+
+#: rhodecode/templates/settings/repo_settings.html:109
+#, fuzzy
+msgid "Remove repo"
+msgstr "Enlever"
+
 #: rhodecode/templates/shortlog/shortlog.html:5
 #, python-format
 msgid "%s Shortlog"
 msgstr "Résumé de %s"
 
 #: rhodecode/templates/shortlog/shortlog.html:15
 #: rhodecode/templates/shortlog/shortlog.html:19
 msgid "shortlog"
 msgstr "Résumé"
 
 #: rhodecode/templates/shortlog/shortlog_data.html:5
 msgid "revision"
 msgstr "Révision"
 
 #: rhodecode/templates/shortlog/shortlog_data.html:7
 msgid "age"
 msgstr "Âge"
 
 #: rhodecode/templates/shortlog/shortlog_data.html:8
 msgid "author"
 msgstr "Auteur"
 
 #: rhodecode/templates/shortlog/shortlog_data.html:75
 msgid "Add or upload files directly via RhodeCode"
 msgstr "Ajouter ou téléverser des fichiers directement via RhodeCode…"
 
 #: rhodecode/templates/shortlog/shortlog_data.html:84
 msgid "Push new repo"
 msgstr "Pusher le nouveau dépôt"
 
 #: rhodecode/templates/shortlog/shortlog_data.html:92
 msgid "Existing repository?"
 msgstr "Le dépôt existe déjà ?"
 
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
 msgid "%s Summary"
 msgstr "Résumé de %s"
 
 #: rhodecode/templates/summary/summary.html:12
 msgid "summary"
 msgstr "résumé"
 
 #: rhodecode/templates/summary/summary.html:20
 #, python-format
 msgid "repo %s ATOM feed"
 msgstr "Flux ATOM du dépôt %s"
 
 #: rhodecode/templates/summary/summary.html:21
 #, python-format
 msgid "repo %s RSS feed"
 msgstr "Flux RSS du dépôt %s"
 
 #: rhodecode/templates/summary/summary.html:49
 #: rhodecode/templates/summary/summary.html:52
 msgid "ATOM"
 msgstr "ATOM"
 
 #: rhodecode/templates/summary/summary.html:70
 #, fuzzy, python-format
 msgid "Repository locked by %s"
 msgstr "Ce dépôt n’est pas verrouillé %s."
 
 #: rhodecode/templates/summary/summary.html:72
 #, fuzzy
 msgid "Repository unlocked"
 msgstr "Ce dépôt n’est pas verrouillé."
 
 #: rhodecode/templates/summary/summary.html:91
 #, python-format
 msgid "Non changable ID %s"
 msgstr "Identifiant permanent : %s"
 
 #: rhodecode/templates/summary/summary.html:96
 msgid "public"
 msgstr "publique"
 
 #: rhodecode/templates/summary/summary.html:104
 msgid "remote clone"
 msgstr "Clone distant"
 
 #: rhodecode/templates/summary/summary.html:125
 msgid "Contact"
 msgstr "Contact"
 
 #: rhodecode/templates/summary/summary.html:139
 msgid "Clone url"
 msgstr "URL de clone"
 
 #: rhodecode/templates/summary/summary.html:142
 msgid "Show by Name"
 msgstr "Afficher par nom"
 
 #: rhodecode/templates/summary/summary.html:143
 msgid "Show by ID"
 msgstr "Afficher par ID"
 
 #: rhodecode/templates/summary/summary.html:151
 msgid "Trending files"
 msgstr "Populaires"
 
 #: rhodecode/templates/summary/summary.html:159
 #: rhodecode/templates/summary/summary.html:175
 #: rhodecode/templates/summary/summary.html:203
 msgid "enable"
 msgstr "Activer"
 
 #: rhodecode/templates/summary/summary.html:167
 msgid "Download"
 msgstr "Téléchargements"
 
 #: rhodecode/templates/summary/summary.html:171
 msgid "There are no downloads yet"
 msgstr "Il n’y a pas encore de téléchargements proposés."
 
 #: rhodecode/templates/summary/summary.html:173
 msgid "Downloads are disabled for this repository"
 msgstr "Les téléchargements sont désactivés pour ce dépôt."
 
 #: rhodecode/templates/summary/summary.html:179
 msgid "Download as zip"
 msgstr "Télécharger en ZIP"
 
 #: rhodecode/templates/summary/summary.html:182
 msgid "Check this to download archive with subrepos"
 msgstr "Télécharger une archive contenant également les sous-dépôts éventuels"
 
 #: rhodecode/templates/summary/summary.html:182
 msgid "with subrepos"
 msgstr "avec les sous-dépôts"
 
 #: rhodecode/templates/summary/summary.html:195
 msgid "Commit activity by day / author"
 msgstr "Activité de commit par jour et par auteur"
 
 #: rhodecode/templates/summary/summary.html:206
 msgid "Stats gathered: "
 msgstr "Statistiques obtenues :"
 
 #: rhodecode/templates/summary/summary.html:227
 msgid "Shortlog"
 msgstr "Résumé des changements"
 
 #: rhodecode/templates/summary/summary.html:229
 msgid "Quick start"
 msgstr "Démarrage rapide"
 
 #: rhodecode/templates/summary/summary.html:243
 #, python-format
 msgid "Readme file at revision '%s'"
 msgstr "Fichier « Lisez-moi » à la révision « %s »"
 
 #: rhodecode/templates/summary/summary.html:246
 msgid "Permalink to this readme"
 msgstr "Lien permanent vers ce fichier « Lisez-moi »"
 
 #: rhodecode/templates/summary/summary.html:304
 #, python-format
 msgid "Download %s as %s"
 msgstr "Télécharger %s comme archive %s"
 
 #: rhodecode/templates/summary/summary.html:661
 msgid "commits"
 msgstr "commits"
 
 #: rhodecode/templates/summary/summary.html:662
 msgid "files added"
 msgstr "fichiers ajoutés"
 
 #: rhodecode/templates/summary/summary.html:663
 msgid "files changed"
 msgstr "fichiers modifiés"
 
 #: rhodecode/templates/summary/summary.html:664
 msgid "files removed"
 msgstr "fichiers supprimés"
 
 #: rhodecode/templates/summary/summary.html:667
 msgid "commit"
 msgstr "commit"
 
 #: rhodecode/templates/summary/summary.html:668
 msgid "file added"
 msgstr "fichier ajouté"
 
 #: rhodecode/templates/summary/summary.html:669
 msgid "file changed"
 msgstr "fichié modifié"
 
 #: rhodecode/templates/summary/summary.html:670
 msgid "file removed"
 msgstr "fichier supprimé"
 
 #: rhodecode/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr "Tags de %s"
 
 #: rhodecode/templates/tags/tags.html:29
 #, fuzzy
 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."
+