kallithea Changeset - 9f37281195a2

Changeset - 9f37281195a2

Parent rev.

Child rev.

[Not reviewed]

Merge codereview

0 62 1

Marcin Kuzminski - 13 years ago 2012-06-09 15:30:22
marcin@python-works.com

merge with beta

11 files changed:

docs/changelog.rst

rhodecode/config/post_receive_tmpl.py

rhodecode/config/rcextensions/__init__.py

rhodecode/config/rcextensions/make_rcextensions.py

rhodecode/config/routing.py

rhodecode/controllers/admin/settings.py

rhodecode/controllers/feed.py

rhodecode/controllers/files.py

rhodecode/controllers/journal.py

100

rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo

bin+mod

rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po

151

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)

docs/changelog.rst

➞

Show inline comments

 .. _changelog:
 =========
 Changelog
 =========
 .4.0 (**2012-XX-XX**)
 ----------------------
 :status: in-progress
 :branch: beta
 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
 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
 .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
 .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
 .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
 .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
 .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
 .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
 .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

rhodecode/config/post_receive_tmpl.py

➞

Show inline comments

@@ new file 100644 @@
 #!/usr/bin/env python
 import os
 import sys
 try:
     import rhodecode
     from rhodecode.lib.hooks import handle_git_post_receive
 except ImportError:
     rhodecode = None
 def main():
     if rhodecode is None:
         # exit with success if we cannot import rhodecode !!
         # this allows simply push to this repo even without
         # rhodecode
         sys.exit(0)
     repo_path = os.path.abspath('.')
     push_data = sys.stdin.read().strip().split(' ')
     # os.environ is modified here by a subprocess call that
     # runs git and later git executes this hook.
     # Environ get's some additional info from rhodecode system
     # like IP or username from basic-auth
     handle_git_post_receive(repo_path, push_data, os.environ)
     sys.exit(0)
 if __name__ == '__main__':
     main()

rhodecode/config/rcextensions/__init__.py

➞

Show inline comments

 # Additional mappings that are not present in the pygments lexers
 # used for building stats
 # format is {'ext':'Name'} eg. {'py':'Python'}
 # format is {'ext':['Names']} eg. {'py':['Python']} note: there can be
 # more than one name for extension
 # NOTE: that this will overide any mappings in LANGUAGES_EXTENSIONS_MAP
 # build by pygments
 EXTRA_MAPPINGS = {}
 #==============================================================================
 # WHOOSH INDEX EXTENSIONS
 #==============================================================================
 # if INDEX_EXTENSIONS is [] it'll use pygments lexers extensions by default.
 # To set your own just add to this list extensions to index with content
 INDEX_EXTENSIONS = []
 # additional extensions for indexing besides the default from pygments
 # those get's added to INDEX_EXTENSIONS
 EXTRA_INDEX_EXTENSIONS = []
 #==============================================================================
 # POST CREATE REPOSITORY HOOK
 #==============================================================================
 # this function will be executed after each repository is created
 def _crhook(*args, **kwargs):
     """
     Post create repository HOOK
     kwargs available:
      :param repo_name:
      :param repo_type:
      :param description:
      :param private:
      :param created_on:
      :param enable_downloads:
      :param repo_id:
      :param user_id:
      :param enable_statistics:
      :param clone_uri:
      :param fork_id:
      :param group_id:
      :param created_by:
     """
     return 0
 CREATE_REPO_HOOK = _crhook
 #==============================================================================
 # POST PUSH HOOK
 #==============================================================================
 # this function will be executed after each push it's runned after the build-in
 # hook that rhodecode uses for logging pushes
 def _pushhook(*args, **kwargs):
     """
     Post push hook
     kwargs available:
       :param username: name of user who pushed
       :param ip: ip of who pushed
       :param action: pull
       :param repository: repository name
       :param pushed_revs: generator of pushed revisions
     """
     return 0
 PUSH_HOOK = _pushhook
 #==============================================================================
 # POST PULL HOOK
 #==============================================================================
 # this function will be executed after each push it's runned after the build-in
 # hook that rhodecode uses for logging pushes
 def _pullhook(*args, **kwargs):
     """
     Post pull hook
     kwargs available::
       :param username: name of user who pulled
       :param ip: ip of who pushed
       :param action: pull
       :param repository: repository name
     """
     return 0
 PULL_HOOK = _pullhook

rhodecode/config/rcextensions/make_rcextensions.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.config.rcextensions.make_rcextensions
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Whoosh indexing module for RhodeCode
     :created_on: Mar 6, 2012
     :author: marcink
     :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com>
     :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/>.
 from __future__ import with_statement
 import os
 import sys
 import pkg_resources
 import traceback
 import logging
 from os.path import dirname as dn, join as jn
 #to get the rhodecode import
 sys.path.append(dn(dn(dn(os.path.realpath(__file__)))))
 from rhodecode.lib.utils import BasePasterCommand, Command, ask_ok
 log = logging.getLogger(__name__)
 class MakeRcExt(BasePasterCommand):
     max_args = 1
     min_args = 1
     usage = "CONFIG_FILE"
     summary = "Creates additional extensions for rhodecode"
     group_name = "RhodeCode"
     takes_config_file = -1
     parser = Command.standard_parser(verbose=True)
     def command(self):
         logging.config.fileConfig(self.path_to_ini_file)
         from pylons import config
         def _make_file(ext_file):
+        def _make_file(ext_file, tmpl):
             bdir = os.path.split(ext_file)[0]
             if not os.path.isdir(bdir):
                 os.makedirs(bdir)
             with open(ext_file, 'wb') as f:
                 f.write(tmpl)
                 log.info('Writen new extensions file to %s' % ext_file)
         here = config['here']
         tmpl = pkg_resources.resource_string(
             'rhodecode', jn('config', 'rcextensions', '__init__.py')
+        )
         ext_file = jn(here, 'rcextensions', '__init__.py')
         if os.path.exists(ext_file):
             msg = ('Extension file already exists, do you want '
                    'to overwrite it ? [y/n]')
             if ask_ok(msg):
                 _make_file(ext_file)
+                _make_file(ext_file, tmpl)
             else:
                 log.info('nothing done...')
         else:
             _make_file(ext_file)
+            _make_file(ext_file, tmpl)
     def update_parser(self):
         pass

rhodecode/config/routing.py

➞

Show inline comments

@@ @@ -152,379 +152,384 @@ def make_map(config): @@
         m.connect("formatted_new_repos_group", "/repos_groups/new.{format}",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("update_repos_group", "/repos_groups/{id}",
                   action="update", conditions=dict(method=["PUT"],
                                                    function=check_int))
         m.connect("delete_repos_group", "/repos_groups/{id}",
                   action="delete", conditions=dict(method=["DELETE"],
                                                    function=check_int))
         m.connect("edit_repos_group", "/repos_groups/{id}/edit",
                   action="edit", conditions=dict(method=["GET"],
                                                  function=check_int))
         m.connect("formatted_edit_repos_group",
                   "/repos_groups/{id}.{format}/edit",
                   action="edit", conditions=dict(method=["GET"],
                                                  function=check_int))
         m.connect("repos_group", "/repos_groups/{id}",
                   action="show", conditions=dict(method=["GET"],
                                                  function=check_int))
         m.connect("formatted_repos_group", "/repos_groups/{id}.{format}",
                   action="show", conditions=dict(method=["GET"],
                                                  function=check_int))
         # ajax delete repos group perm user
         m.connect('delete_repos_group_user_perm',
                   "/delete_repos_group_user_perm/{group_name:.*}",
              action="delete_repos_group_user_perm",
              conditions=dict(method=["DELETE"], function=check_group))
         # ajax delete repos group perm users_group
         m.connect('delete_repos_group_users_group_perm',
                   "/delete_repos_group_users_group_perm/{group_name:.*}",
                   action="delete_repos_group_users_group_perm",
                   conditions=dict(method=["DELETE"], function=check_group))
     #ADMIN USER REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/users') as m:
         m.connect("users", "/users",
                   action="create", conditions=dict(method=["POST"]))
         m.connect("users", "/users",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("formatted_users", "/users.{format}",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("new_user", "/users/new",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("formatted_new_user", "/users/new.{format}",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("update_user", "/users/{id}",
                   action="update", conditions=dict(method=["PUT"]))
         m.connect("delete_user", "/users/{id}",
                   action="delete", conditions=dict(method=["DELETE"]))
         m.connect("edit_user", "/users/{id}/edit",
                   action="edit", conditions=dict(method=["GET"]))
         m.connect("formatted_edit_user",
                   "/users/{id}.{format}/edit",
                   action="edit", conditions=dict(method=["GET"]))
         m.connect("user", "/users/{id}",
                   action="show", conditions=dict(method=["GET"]))
         m.connect("formatted_user", "/users/{id}.{format}",
                   action="show", conditions=dict(method=["GET"]))
         #EXTRAS USER ROUTES
         m.connect("user_perm", "/users_perm/{id}",
                   action="update_perm", conditions=dict(method=["PUT"]))
         m.connect("user_emails", "/users_emails/{id}",
                   action="add_email", conditions=dict(method=["PUT"]))
         m.connect("user_emails_delete", "/users_emails/{id}",
                   action="delete_email", conditions=dict(method=["DELETE"]))
     #ADMIN USERS GROUPS REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/users_groups') as m:
         m.connect("users_groups", "/users_groups",
                   action="create", conditions=dict(method=["POST"]))
         m.connect("users_groups", "/users_groups",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("formatted_users_groups", "/users_groups.{format}",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("new_users_group", "/users_groups/new",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("formatted_new_users_group", "/users_groups/new.{format}",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("update_users_group", "/users_groups/{id}",
                   action="update", conditions=dict(method=["PUT"]))
         m.connect("delete_users_group", "/users_groups/{id}",
                   action="delete", conditions=dict(method=["DELETE"]))
         m.connect("edit_users_group", "/users_groups/{id}/edit",
                   action="edit", conditions=dict(method=["GET"]))
         m.connect("formatted_edit_users_group",
                   "/users_groups/{id}.{format}/edit",
                   action="edit", conditions=dict(method=["GET"]))
         m.connect("users_group", "/users_groups/{id}",
                   action="show", conditions=dict(method=["GET"]))
         m.connect("formatted_users_group", "/users_groups/{id}.{format}",
                   action="show", conditions=dict(method=["GET"]))
         #EXTRAS USER ROUTES
         m.connect("users_group_perm", "/users_groups_perm/{id}",
                   action="update_perm", conditions=dict(method=["PUT"]))
     #ADMIN GROUP REST ROUTES
     rmap.resource('group', 'groups',
                   controller='admin/groups', path_prefix=ADMIN_PREFIX)
     #ADMIN PERMISSIONS REST ROUTES
     rmap.resource('permission', 'permissions',
                   controller='admin/permissions', path_prefix=ADMIN_PREFIX)
     ##ADMIN LDAP SETTINGS
     rmap.connect('ldap_settings', '%s/ldap' % ADMIN_PREFIX,
                  controller='admin/ldap_settings', action='ldap_settings',
                  conditions=dict(method=["POST"]))
     rmap.connect('ldap_home', '%s/ldap' % ADMIN_PREFIX,
                  controller='admin/ldap_settings')
     #ADMIN SETTINGS REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/settings') as m:
         m.connect("admin_settings", "/settings",
                   action="create", conditions=dict(method=["POST"]))
         m.connect("admin_settings", "/settings",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("formatted_admin_settings", "/settings.{format}",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("admin_new_setting", "/settings/new",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("formatted_admin_new_setting", "/settings/new.{format}",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("/settings/{setting_id}",
                   action="update", conditions=dict(method=["PUT"]))
         m.connect("/settings/{setting_id}",
                   action="delete", conditions=dict(method=["DELETE"]))
         m.connect("admin_edit_setting", "/settings/{setting_id}/edit",
                   action="edit", conditions=dict(method=["GET"]))
         m.connect("formatted_admin_edit_setting",
                   "/settings/{setting_id}.{format}/edit",
                   action="edit", conditions=dict(method=["GET"]))
         m.connect("admin_setting", "/settings/{setting_id}",
                   action="show", conditions=dict(method=["GET"]))
         m.connect("formatted_admin_setting", "/settings/{setting_id}.{format}",
                   action="show", conditions=dict(method=["GET"]))
         m.connect("admin_settings_my_account", "/my_account",
                   action="my_account", conditions=dict(method=["GET"]))
         m.connect("admin_settings_my_account_update", "/my_account_update",
                   action="my_account_update", conditions=dict(method=["PUT"]))
         m.connect("admin_settings_create_repository", "/create_repository",
                   action="create_repository", conditions=dict(method=["GET"]))
     #NOTIFICATION REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/notifications') as m:
         m.connect("notifications", "/notifications",
                   action="create", conditions=dict(method=["POST"]))
         m.connect("notifications", "/notifications",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("notifications_mark_all_read", "/notifications/mark_all_read",
                   action="mark_all_read", conditions=dict(method=["GET"]))
         m.connect("formatted_notifications", "/notifications.{format}",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("new_notification", "/notifications/new",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("formatted_new_notification", "/notifications/new.{format}",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("/notification/{notification_id}",
                   action="update", conditions=dict(method=["PUT"]))
         m.connect("/notification/{notification_id}",
                   action="delete", conditions=dict(method=["DELETE"]))
         m.connect("edit_notification", "/notification/{notification_id}/edit",
                   action="edit", conditions=dict(method=["GET"]))
         m.connect("formatted_edit_notification",
                   "/notification/{notification_id}.{format}/edit",
                   action="edit", conditions=dict(method=["GET"]))
         m.connect("notification", "/notification/{notification_id}",
                   action="show", conditions=dict(method=["GET"]))
         m.connect("formatted_notification", "/notifications/{notification_id}.{format}",
                   action="show", conditions=dict(method=["GET"]))
     #ADMIN MAIN PAGES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/admin') as m:
         m.connect('admin_home', '', action='index')
         m.connect('admin_add_repo', '/add_repo/{new_repo:[a-z0-9\. _-]*}',
                   action='add_repo')
     #==========================================================================
     # API V2
     #==========================================================================
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='api/api') as m:
         m.connect('api', '/api')
     #USER JOURNAL
     rmap.connect('journal', '%s/journal' % ADMIN_PREFIX, controller='journal')
     rmap.connect('journal', '%s/journal' % ADMIN_PREFIX,
                  controller='journal', action='index')
     rmap.connect('journal_rss', '%s/journal/rss' % ADMIN_PREFIX,
                  controller='journal', action='journal_rss')
     rmap.connect('journal_atom', '%s/journal/atom' % ADMIN_PREFIX,
                  controller='journal', action='journal_atom')
     rmap.connect('public_journal', '%s/public_journal' % ADMIN_PREFIX,
                  controller='journal', action="public_journal")
     rmap.connect('public_journal_rss', '%s/public_journal/rss' % ADMIN_PREFIX,
                  controller='journal', action="public_journal_rss")
     rmap.connect('public_journal_rss_old', '%s/public_journal_rss' % ADMIN_PREFIX,
                  controller='journal', action="public_journal_rss")
     rmap.connect('public_journal_atom',
                  '%s/public_journal/atom' % ADMIN_PREFIX, controller='journal',
                  action="public_journal_atom")
     rmap.connect('public_journal_atom_old',
                  '%s/public_journal_atom' % ADMIN_PREFIX, controller='journal',
                  action="public_journal_atom")
     rmap.connect('toggle_following', '%s/toggle_following' % ADMIN_PREFIX,
                  controller='journal', action='toggle_following',
                  conditions=dict(method=["POST"]))
     #SEARCH
     rmap.connect('search', '%s/search' % ADMIN_PREFIX, controller='search',)
     rmap.connect('search_repo', '%s/search/{search_repo:.*}' % ADMIN_PREFIX,
                   controller='search')
     #LOGIN/LOGOUT/REGISTER/SIGN IN
     rmap.connect('login_home', '%s/login' % ADMIN_PREFIX, controller='login')
     rmap.connect('logout_home', '%s/logout' % ADMIN_PREFIX, controller='login',
                  action='logout')
     rmap.connect('register', '%s/register' % ADMIN_PREFIX, controller='login',
                  action='register')
     rmap.connect('reset_password', '%s/password_reset' % ADMIN_PREFIX,
                  controller='login', action='password_reset')
     rmap.connect('reset_password_confirmation',
                  '%s/password_reset_confirmation' % ADMIN_PREFIX,
                  controller='login', action='password_reset_confirmation')
     #FEEDS
     rmap.connect('rss_feed_home', '/{repo_name:.*}/feed/rss',
                 controller='feed', action='rss',
                 conditions=dict(function=check_repo))
     rmap.connect('atom_feed_home', '/{repo_name:.*}/feed/atom',
                 controller='feed', action='atom',
                 conditions=dict(function=check_repo))
     #==========================================================================
     # REPOSITORY ROUTES
     #==========================================================================
     rmap.connect('summary_home', '/{repo_name:.*}',
                 controller='summary',
                 conditions=dict(function=check_repo))
     rmap.connect('repos_group_home', '/{group_name:.*}',
                 controller='admin/repos_groups', action="show_by_name",
                 conditions=dict(function=check_group))
     rmap.connect('changeset_home', '/{repo_name:.*}/changeset/{revision}',
                 controller='changeset', revision='tip',
                 conditions=dict(function=check_repo))
     rmap.connect('changeset_comment',
                  '/{repo_name:.*}/changeset/{revision}/comment',
                 controller='changeset', revision='tip', action='comment',
                 conditions=dict(function=check_repo))
     rmap.connect('changeset_comment_delete',
                  '/{repo_name:.*}/changeset/comment/{comment_id}/delete',
                 controller='changeset', action='delete_comment',
                 conditions=dict(function=check_repo, method=["DELETE"]))
     rmap.connect('raw_changeset_home',
                  '/{repo_name:.*}/raw-changeset/{revision}',
                  controller='changeset', action='raw_changeset',
                  revision='tip', conditions=dict(function=check_repo))
     rmap.connect('compare_url',
                  '/{repo_name:.*}/compare/{org_ref_type}@{org_ref}...{other_ref_type}@{other_ref}',
                  controller='compare', action='index',
                  conditions=dict(function=check_repo),
                  requirements=dict(org_ref_type='(branch|book|tag)',
                                    other_ref_type='(branch|book|tag)'))
     rmap.connect('pullrequest_home',
                  '/{repo_name:.*}/pull-request/new',
                  controller='pullrequests', action='index',
                  conditions=dict(function=check_repo))
     rmap.connect('summary_home', '/{repo_name:.*}/summary',
                 controller='summary', conditions=dict(function=check_repo))
     rmap.connect('shortlog_home', '/{repo_name:.*}/shortlog',
                 controller='shortlog', conditions=dict(function=check_repo))
     rmap.connect('branches_home', '/{repo_name:.*}/branches',
                 controller='branches', conditions=dict(function=check_repo))
     rmap.connect('tags_home', '/{repo_name:.*}/tags',
                 controller='tags', conditions=dict(function=check_repo))
     rmap.connect('bookmarks_home', '/{repo_name:.*}/bookmarks',
                 controller='bookmarks', conditions=dict(function=check_repo))
     rmap.connect('changelog_home', '/{repo_name:.*}/changelog',
                 controller='changelog', conditions=dict(function=check_repo))
     rmap.connect('changelog_details', '/{repo_name:.*}/changelog_details/{cs}',
                 controller='changelog', action='changelog_details',
                 conditions=dict(function=check_repo))
     rmap.connect('files_home', '/{repo_name:.*}/files/{revision}/{f_path:.*}',
                 controller='files', revision='tip', f_path='',
                 conditions=dict(function=check_repo))
     rmap.connect('files_diff_home', '/{repo_name:.*}/diff/{f_path:.*}',
                 controller='files', action='diff', revision='tip', f_path='',
                 conditions=dict(function=check_repo))
     rmap.connect('files_rawfile_home',
                  '/{repo_name:.*}/rawfile/{revision}/{f_path:.*}',
                  controller='files', action='rawfile', revision='tip',
                  f_path='', conditions=dict(function=check_repo))
     rmap.connect('files_raw_home',
                  '/{repo_name:.*}/raw/{revision}/{f_path:.*}',
                  controller='files', action='raw', revision='tip', f_path='',
                  conditions=dict(function=check_repo))
     rmap.connect('files_annotate_home',
                  '/{repo_name:.*}/annotate/{revision}/{f_path:.*}',
                  controller='files', action='index', revision='tip',
                  f_path='', annotate=True, conditions=dict(function=check_repo))
     rmap.connect('files_edit_home',
                  '/{repo_name:.*}/edit/{revision}/{f_path:.*}',
                  controller='files', action='edit', revision='tip',
                  f_path='', conditions=dict(function=check_repo))
     rmap.connect('files_add_home',
                  '/{repo_name:.*}/add/{revision}/{f_path:.*}',
                  controller='files', action='add', revision='tip',
                  f_path='', conditions=dict(function=check_repo))
     rmap.connect('files_archive_home', '/{repo_name:.*}/archive/{fname}',
                 controller='files', action='archivefile',
                 conditions=dict(function=check_repo))
     rmap.connect('files_nodelist_home',
                  '/{repo_name:.*}/nodelist/{revision}/{f_path:.*}',
                 controller='files', action='nodelist',
                 conditions=dict(function=check_repo))
     rmap.connect('repo_settings_delete', '/{repo_name:.*}/settings',
                 controller='settings', action="delete",
                 conditions=dict(method=["DELETE"], function=check_repo))
     rmap.connect('repo_settings_update', '/{repo_name:.*}/settings',
                 controller='settings', action="update",
                 conditions=dict(method=["PUT"], function=check_repo))
     rmap.connect('repo_settings_home', '/{repo_name:.*}/settings',
                 controller='settings', action='index',
                 conditions=dict(function=check_repo))
     rmap.connect('repo_fork_create_home', '/{repo_name:.*}/fork',
                 controller='forks', action='fork_create',
                 conditions=dict(function=check_repo, method=["POST"]))
     rmap.connect('repo_fork_home', '/{repo_name:.*}/fork',
                 controller='forks', action='fork',
                 conditions=dict(function=check_repo))
     rmap.connect('repo_forks_home', '/{repo_name:.*}/forks',
                  controller='forks', action='forks',
                  conditions=dict(function=check_repo))
     rmap.connect('repo_followers_home', '/{repo_name:.*}/followers',
                  controller='followers', action='followers',
                  conditions=dict(function=check_repo))
     return rmap

rhodecode/controllers/admin/settings.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.admin.settings
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     settings controller for rhodecode admin
     :created_on: Jul 14, 2010
     :author: marcink
     :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com>
     :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
 import pkg_resources
 import platform
 from sqlalchemy import func
 from formencode import htmlfill
 from pylons import request, session, tmpl_context as c, url, config
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
     HasPermissionAnyDecorator, NotAnonymous
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.celerylib import tasks, run_task
 from rhodecode.lib.utils import repo2db_mapper, invalidate_cache, \
     set_rhodecode_config, repo_name_slug
 from rhodecode.model.db import RhodeCodeUi, Repository, RepoGroup, \
     RhodeCodeSetting
 from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \
     ApplicationUiSettingsForm
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.user import UserModel
 from rhodecode.model.db import User
 from rhodecode.model.notification import EmailNotificationModel
 from rhodecode.model.meta import Session
 log = logging.getLogger(__name__)
 class SettingsController(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('setting', 'settings', controller='admin/settings',
     #         path_prefix='/admin', name_prefix='admin_')
     @LoginRequired()
     def __before__(self):
         c.admin_user = session.get('admin_user')
         c.admin_username = session.get('admin_username')
         c.modules = sorted([(p.project_name, p.version)
                             for p in pkg_resources.working_set],
                            key=lambda k: k[0].lower())
         c.py_version = platform.python_version()
         c.platform = platform.platform()
         super(SettingsController, self).__before__()
     @HasPermissionAllDecorator('hg.admin')
     def index(self, format='html'):
         """GET /admin/settings: All items in the collection"""
         # url('admin_settings')
         defaults = RhodeCodeSetting.get_app_settings()
         defaults.update(self.get_hg_ui_settings())
         return htmlfill.render(
             render('admin/settings/settings.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
+        )
     @HasPermissionAllDecorator('hg.admin')
     def create(self):
         """POST /admin/settings: Create a new item"""
         # url('admin_settings')
     @HasPermissionAllDecorator('hg.admin')
     def new(self, format='html'):
         """GET /admin/settings/new: Form to create a new item"""
         # url('admin_new_setting')
     @HasPermissionAllDecorator('hg.admin')
     def update(self, setting_id):
         """PUT /admin/settings/setting_id: 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('admin_setting', setting_id=ID),
         #           method='put')
         # url('admin_setting', setting_id=ID)
         if setting_id == 'mapping':
             rm_obsolete = request.POST.get('destroy', False)
             log.debug('Rescanning directories with destroy=%s' % rm_obsolete)
             initial = ScmModel().repo_scan()
             log.debug('invalidating all repositories')
             for repo_name in initial.keys():
                 invalidate_cache('get_repo_cached_%s' % repo_name)
             added, removed = repo2db_mapper(initial, rm_obsolete)
             h.flash(_('Repositories successfully'
                       ' rescanned added: %s,removed: %s') % (added, removed),
                     category='success')
         if setting_id == 'whoosh':
             repo_location = self.get_hg_ui_settings()['paths_root_path']
             full_index = request.POST.get('full_index', False)
             run_task(tasks.whoosh_index, repo_location, full_index)
             h.flash(_('Whoosh reindex task scheduled'), category='success')
         if setting_id == 'global':
             application_form = ApplicationSettingsForm()()
             try:
                 form_result = application_form.to_python(dict(request.POST))
                 try:
                     hgsettings1 = RhodeCodeSetting.get_by_name('title')
                     hgsettings1.app_settings_value = \
                         form_result['rhodecode_title']
                     hgsettings2 = RhodeCodeSetting.get_by_name('realm')
                     hgsettings2.app_settings_value = \
                         form_result['rhodecode_realm']
                     hgsettings3 = RhodeCodeSetting.get_by_name('ga_code')
                     hgsettings3.app_settings_value = \
                         form_result['rhodecode_ga_code']
                     self.sa.add(hgsettings1)
                     self.sa.add(hgsettings2)
                     self.sa.add(hgsettings3)
                     self.sa.commit()
                     set_rhodecode_config(config)
                     h.flash(_('Updated application settings'),
                             category='success')
                 except Exception:
                     log.error(traceback.format_exc())
                     h.flash(_('error occurred during updating '
                               'application settings'),
                             category='error')
                     self.sa.rollback()
             except formencode.Invalid, errors:
                 return htmlfill.render(
                      render('admin/settings/settings.html'),
                      defaults=errors.value,
                      errors=errors.error_dict or {},
                      prefix_error=False,
                      encoding="UTF-8")
         if setting_id == 'mercurial':
             application_form = ApplicationUiSettingsForm()()
             try:
                 form_result = application_form.to_python(dict(request.POST))
                 # fix namespaces for hooks
                 _f = lambda s: s.replace('.', '_')
                 try:
                     hgsettings1 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key == 'push_ssl').one()
                     hgsettings1.ui_value = form_result['web_push_ssl']
                     hgsettings2 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key == '/').one()
                     hgsettings2.ui_value = form_result['paths_root_path']
                     #HOOKS
                     hgsettings3 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key == 'changegroup.update').one()
                     hgsettings3.ui_active = \
                         bool(form_result['hooks_changegroup_update'])
                     .filter(RhodeCodeUi.ui_key == RhodeCodeUi.HOOK_UPDATE)\
                     .one()
                     hgsettings3.ui_active = bool(form_result[_f('hooks_%s' %
                                                  RhodeCodeUi.HOOK_UPDATE)])
                     hgsettings4 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key ==
                             'changegroup.repo_size').one()
                     hgsettings4.ui_active = \
                         bool(form_result['hooks_changegroup_repo_size'])
                     .filter(RhodeCodeUi.ui_key == RhodeCodeUi.HOOK_REPO_SIZE)\
                     .one()
                     hgsettings4.ui_active = bool(form_result[_f('hooks_%s' %
                                                  RhodeCodeUi.HOOK_REPO_SIZE)])
                     hgsettings5 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key ==
                             'pretxnchangegroup.push_logger').one()
                     hgsettings5.ui_active = \
                         bool(form_result['hooks_pretxnchangegroup'
                                          '_push_logger'])
                     .filter(RhodeCodeUi.ui_key == RhodeCodeUi.HOOK_PUSH)\
                     .one()
                     hgsettings5.ui_active = bool(form_result[_f('hooks_%s' %
                                                  RhodeCodeUi.HOOK_PUSH)])
                     hgsettings6 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key ==
                             'preoutgoing.pull_logger').one()
                     hgsettings6.ui_active = \
                         bool(form_result['hooks_preoutgoing_pull_logger'])
                     .filter(RhodeCodeUi.ui_key == RhodeCodeUi.HOOK_PULL)\
                     .one()
                     hgsettings6.ui_active = bool(form_result[_f('hooks_%s' %
                                                  RhodeCodeUi.HOOK_PULL)])
                     self.sa.add(hgsettings1)
                     self.sa.add(hgsettings2)
                     self.sa.add(hgsettings3)
                     self.sa.add(hgsettings4)
                     self.sa.add(hgsettings5)
                     self.sa.add(hgsettings6)
                     self.sa.commit()
                     h.flash(_('Updated mercurial settings'),
                             category='success')
                 except:
                     log.error(traceback.format_exc())
                     h.flash(_('error occurred during updating '
                               'application settings'), category='error')
                     self.sa.rollback()
             except formencode.Invalid, errors:
                 return htmlfill.render(
                      render('admin/settings/settings.html'),
                      defaults=errors.value,
                      errors=errors.error_dict or {},
                      prefix_error=False,
                      encoding="UTF-8")
         if setting_id == 'hooks':
             ui_key = request.POST.get('new_hook_ui_key')
             ui_value = request.POST.get('new_hook_ui_value')
             try:
                 if ui_value and ui_key:
                     RhodeCodeUi.create_or_update_hook(ui_key, ui_value)
                     h.flash(_('Added new hook'),
                             category='success')
                 # check for edits
                 update = False
                 _d = request.POST.dict_of_lists()
                 for k, v in zip(_d.get('hook_ui_key', []),
                                 _d.get('hook_ui_value_new', [])):
                     RhodeCodeUi.create_or_update_hook(k, v)
                     update = True
                 if update:
                     h.flash(_('Updated hooks'), category='success')
                 self.sa.commit()
             except:
                 log.error(traceback.format_exc())
                 h.flash(_('error occurred during hook creation'),
                         category='error')
             return redirect(url('admin_edit_setting', setting_id='hooks'))
         if setting_id == 'email':
             test_email = request.POST.get('test_email')
             test_email_subj = 'RhodeCode TestEmail'
             test_email_body = 'RhodeCode Email test'
             test_email_html_body = EmailNotificationModel()\
                 .get_email_tmpl(EmailNotificationModel.TYPE_DEFAULT,
                                 body=test_email_body)
             recipients = [test_email] if [test_email] else None
             run_task(tasks.send_email, recipients, test_email_subj,
                      test_email_body, test_email_html_body)
             h.flash(_('Email task created'), category='success')
         return redirect(url('admin_settings'))
     @HasPermissionAllDecorator('hg.admin')
     def delete(self, setting_id):
         """DELETE /admin/settings/setting_id: 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('admin_setting', setting_id=ID),
         #           method='delete')
         # url('admin_setting', setting_id=ID)
         if setting_id == 'hooks':
             hook_id = request.POST.get('hook_id')
             RhodeCodeUi.delete(hook_id)
             self.sa.commit()
     @HasPermissionAllDecorator('hg.admin')
     def show(self, setting_id, format='html'):
         """
         GET /admin/settings/setting_id: Show a specific item"""
         # url('admin_setting', setting_id=ID)
     @HasPermissionAllDecorator('hg.admin')
     def edit(self, setting_id, format='html'):
         """
         GET /admin/settings/setting_id/edit: Form to
         edit an existing item"""
         # url('admin_edit_setting', setting_id=ID)
         c.hooks = RhodeCodeUi.get_builtin_hooks()
         c.custom_hooks = RhodeCodeUi.get_custom_hooks()
         return htmlfill.render(
             render('admin/settings/hooks.html'),
             defaults={},
             encoding="UTF-8",
             force_defaults=False
+        )
     @NotAnonymous()
     def my_account(self):
         """
         GET /_admin/my_account Displays info about my account
         """
         # url('admin_settings_my_account')
         c.user = User.get(self.rhodecode_user.user_id)
         all_repos = self.sa.query(Repository)\
                      .filter(Repository.user_id == c.user.user_id)\
                      .order_by(func.lower(Repository.repo_name)).all()
         c.user_repos = ScmModel().get_repos(all_repos)
         if c.user.username == 'default':
             h.flash(_("You can't edit this user since it's"
               " crucial for entire application"), category='warning')
             return redirect(url('users'))
         defaults = c.user.get_dict()
         c.form = htmlfill.render(
             render('admin/users/user_edit_my_account_form.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
+        )
         return render('admin/users/user_edit_my_account.html')
     def my_account_update(self):
         """PUT /_admin/my_account_update: 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('admin_settings_my_account_update'),
         #           method='put')
         # url('admin_settings_my_account_update', id=ID)
         user_model = UserModel()
         uid = self.rhodecode_user.user_id
         _form = UserForm(edit=True,
                          old_data={'user_id': uid,
                                    'email': self.rhodecode_user.email})()
         form_result = {}
         try:
             form_result = _form.to_python(dict(request.POST))
             user_model.update_my_account(uid, form_result)
             h.flash(_('Your account was updated successfully'),
                     category='success')
             Session.commit()
         except formencode.Invalid, errors:
             c.user = User.get(self.rhodecode_user.user_id)
             all_repos = self.sa.query(Repository)\
                 .filter(Repository.user_id == c.user.user_id)\
                 .order_by(func.lower(Repository.repo_name))\
                 .all()
             c.user_repos = ScmModel().get_repos(all_repos)
             c.form = htmlfill.render(
                 render('admin/users/user_edit_my_account_form.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
             return render('admin/users/user_edit_my_account.html')
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('error occurred during update of user %s') \
                     % form_result.get('username'), category='error')
         return redirect(url('my_account'))
     @NotAnonymous()
     @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository')
     def create_repository(self):
         """GET /_admin/create_repository: Form to create a new item"""
         c.repo_groups = RepoGroup.groups_choices()
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
         new_repo = request.GET.get('repo', '')
         c.new_repo = repo_name_slug(new_repo)
         return render('admin/repos/repo_add_create_repository.html')

rhodecode/controllers/feed.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.feed
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
     Feed controller for rhodecode
     :created_on: Apr 23, 2010
     :author: marcink
     :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com>
     :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
 from pylons import url, response, tmpl_context as c
 from pylons.i18n.translation import _
 from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController
 from rhodecode.lib.diffs import DiffProcessor
 log = logging.getLogger(__name__)
 class FeedController(BaseRepoController):
     @LoginRequired(api_access=True)
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(FeedController, self).__before__()
         #common values for feeds
         self.description = _('Changes on %s repository')
         self.title = self.title = _('%s %s feed') % (c.rhodecode_name, '%s')
         self.language = 'en-us'
         self.ttl = "5"
         self.feed_nr = 20
     def _get_title(self, cs):
         return "%s" % (
             h.shorter(cs.message, 160)
+        )
     def __changes(self, cs):
         changes = []
         diffprocessor = DiffProcessor(cs.diff())
         stats = diffprocessor.prepare(inline_diff=False)
         for st in stats:
             st.update({'added': st['stats'][0],
                        'removed': st['stats'][1]})
             changes.append('\n %(operation)s %(filename)s '
                            '(%(added)s lines added, %(removed)s lines removed)'
                             % st)
         return changes
     def __get_desc(self, cs):
         desc_msg = []
         desc_msg.append('%s %s %s:<br/>' % (cs.author, _('commited on'),
                                            cs.date))
+                                           h.fmt_date(cs.date)))
         desc_msg.append('<pre>')
         desc_msg.append(cs.message)
         desc_msg.append('\n')
         desc_msg.extend(self.__changes(cs))
         desc_msg.append('</pre>')
         return desc_msg
     def atom(self, repo_name):
         """Produce an atom-1.0 feed via feedgenerator module"""
         feed = Atom1Feed(
              title=self.title % repo_name,
              link=url('summary_home', repo_name=repo_name,
                       qualified=True),
              description=self.description % repo_name,
              language=self.language,
              ttl=self.ttl
+        )
         for cs in reversed(list(c.rhodecode_repo[-self.feed_nr:])):
             feed.add_item(title=self._get_title(cs),
                           link=url('changeset_home', repo_name=repo_name,
                                    revision=cs.raw_id, qualified=True),
                           author_name=cs.author,
                           description=''.join(self.__get_desc(cs)),
                           pubdate=cs.date,
+                          )
         response.content_type = feed.mime_type
         return feed.writeString('utf-8')
     def rss(self, repo_name):
         """Produce an rss2 feed via feedgenerator module"""
         feed = Rss201rev2Feed(
             title=self.title % repo_name,
             link=url('summary_home', repo_name=repo_name,
                      qualified=True),
             description=self.description % repo_name,
             language=self.language,
             ttl=self.ttl
+        )
         for cs in reversed(list(c.rhodecode_repo[-self.feed_nr:])):
             feed.add_item(title=self._get_title(cs),
                           link=url('changeset_home', repo_name=repo_name,
                                    revision=cs.raw_id, qualified=True),
                           author_name=cs.author,
                           description=''.join(self.__get_desc(cs)),
                           pubdate=cs.date,
+                         )
         response.content_type = feed.mime_type
         return feed.writeString('utf-8')

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -298,193 +298,193 @@ class FilesController(BaseRepoController @@
             node_path = os.path.join(location, filename)
             author = self.rhodecode_user.full_contact
             if not content:
                 h.flash(_('No content'), category='warning')
                 return redirect(url('changeset_home', repo_name=c.repo_name,
                                     revision='tip'))
             if not filename:
                 h.flash(_('No filename'), category='warning')
                 return redirect(url('changeset_home', repo_name=c.repo_name,
                                     revision='tip'))
             try:
                 self.scm_model.create_node(repo=c.rhodecode_repo,
                                            repo_name=repo_name, cs=c.cs,
                                            user=self.rhodecode_user,
                                            author=author, message=message,
                                            content=content, f_path=node_path)
                 h.flash(_('Successfully committed to %s' % node_path),
                         category='success')
             except NodeAlreadyExistsError, e:
                 h.flash(_(e), category='error')
             except Exception:
                 log.error(traceback.format_exc())
                 h.flash(_('Error occurred during commit'), category='error')
             return redirect(url('changeset_home',
                                 repo_name=c.repo_name, revision='tip'))
         return render('files/files_add.html')
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def archivefile(self, repo_name, fname):
         fileformat = None
         revision = None
         ext = None
         subrepos = request.GET.get('subrepos') == 'true'
         for a_type, ext_data in settings.ARCHIVE_SPECS.items():
             archive_spec = fname.split(ext_data[1])
             if len(archive_spec) == 2 and archive_spec[1] == '':
                 fileformat = a_type or ext_data[1]
                 revision = archive_spec[0]
                 ext = ext_data[1]
         try:
             dbrepo = RepoModel().get_by_repo_name(repo_name)
             if dbrepo.enable_downloads is False:
                 return _('downloads disabled')
             if c.rhodecode_repo.alias == 'hg':
                 # patch and reset hooks section of UI config to not run any
                 # hooks on fetching archives with subrepos
                 for k, v in c.rhodecode_repo._repo.ui.configitems('hooks'):
                     c.rhodecode_repo._repo.ui.setconfig('hooks', k, None)
             cs = c.rhodecode_repo.get_changeset(revision)
             content_type = settings.ARCHIVE_SPECS[fileformat][0]
         except ChangesetDoesNotExistError:
             return _('Unknown revision %s') % revision
         except EmptyRepositoryError:
             return _('Empty repository')
         except (ImproperArchiveTypeError, KeyError):
             return _('Unknown archive type')
         fd, archive = tempfile.mkstemp()
         t = open(archive, 'wb')
         cs.fill_archive(stream=t, kind=fileformat, subrepos=subrepos)
         t.close()
         def get_chunked_archive(archive):
             stream = open(archive, 'rb')
             while True:
                 data = stream.read(16 * 1024)
                 if not data:
                     stream.close()
                     os.close(fd)
                     os.remove(archive)
                     break
                 yield data
         response.content_disposition = str('attachment; filename=%s-%s%s' \
                                            % (repo_name, revision[:12], ext))
         response.content_type = str(content_type)
         return get_chunked_archive(archive)
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def diff(self, repo_name, f_path):
         ignore_whitespace = request.GET.get('ignorews') == '1'
         line_context = request.GET.get('context', 3)
         diff1 = request.GET.get('diff1', '')
         diff2 = request.GET.get('diff2', '')
         c.action = request.GET.get('diff')
         c.no_changes = diff1 == diff2
         c.f_path = f_path
         c.big_diff = False
         c.anchor_url = anchor_url
         c.ignorews_url = _ignorews_url
         c.context_url = _context_url
         c.changes = OrderedDict()
         c.changes[diff2] = []
         try:
             if diff1 not in ['', None, 'None', '0' * 12, '0' * 40]:
                 c.changeset_1 = c.rhodecode_repo.get_changeset(diff1)
                 node1 = c.changeset_1.get_node(f_path)
             else:
                 c.changeset_1 = EmptyChangeset(repo=c.rhodecode_repo)
                 node1 = FileNode('.', '', changeset=c.changeset_1)
             if diff2 not in ['', None, 'None', '0' * 12, '0' * 40]:
                 c.changeset_2 = c.rhodecode_repo.get_changeset(diff2)
                 node2 = c.changeset_2.get_node(f_path)
             else:
                 c.changeset_2 = EmptyChangeset(repo=c.rhodecode_repo)
                 node2 = FileNode('.', '', changeset=c.changeset_2)
         except RepositoryError:
             return redirect(url('files_home', repo_name=c.repo_name,
                                 f_path=f_path))
         if c.action == 'download':
             _diff = diffs.get_gitdiff(node1, node2,
                                       ignore_whitespace=ignore_whitespace,
                                       context=line_context)
             diff = diffs.DiffProcessor(_diff, format='gitdiff')
             diff_name = '%s_vs_%s.diff' % (diff1, diff2)
             response.content_type = 'text/plain'
             response.content_disposition = (
                 'attachment; filename=%s' % diff_name
+            )
             return diff.raw_diff()
         elif c.action == 'raw':
             _diff = diffs.get_gitdiff(node1, node2,
                                       ignore_whitespace=ignore_whitespace,
                                       context=line_context)
             diff = diffs.DiffProcessor(_diff, format='gitdiff')
             response.content_type = 'text/plain'
             return diff.raw_diff()
         else:
             fid = h.FID(diff2, node2.path)
             line_context_lcl = get_line_ctx(fid, request.GET)
             ign_whitespace_lcl = get_ignore_ws(fid, request.GET)
             lim = request.GET.get('fulldiff') or self.cut_off_limit
             _, cs1, cs2, diff, st = diffs.wrapped_diff(filenode_old=node1,
                                          filenode_new=node2,
                                          cut_off_limit=lim,
                                          ignore_whitespace=ign_whitespace_lcl,
                                          line_context=line_context_lcl,
                                          enable_comments=False)
             c.changes = [('', node2, diff, cs1, cs2, st,)]
         return render('files/file_diff.html')
     def _get_node_history(self, cs, f_path):
         changesets = cs.get_file_history(f_path)
         hist_l = []
         changesets_group = ([], _("Changesets"))
         branches_group = ([], _("Branches"))
         tags_group = ([], _("Tags"))
         _hg = cs.repository.alias == 'hg'
         for chs in changesets:
             _branch = '(%s)' % chs.branch if _hg else ''
             n_desc = 'r%s:%s %s' % (chs.revision, chs.short_id, _branch)
             changesets_group[0].append((chs.raw_id, n_desc,))
         hist_l.append(changesets_group)
         for name, chs in c.rhodecode_repo.branches.items():
             branches_group[0].append((chs, name),)
         hist_l.append(branches_group)
         for name, chs in c.rhodecode_repo.tags.items():
             tags_group[0].append((chs, name),)
         hist_l.append(tags_group)
         return hist_l
     @jsonify
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def nodelist(self, repo_name, revision, f_path):
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             cs = self.__get_cs_or_redirect(revision, repo_name)
             _d, _f = ScmModel().get_nodes(repo_name, cs.raw_id, f_path,
                                           flat=False)
             return _d + _f
+            return {'nodes': _d + _f}

rhodecode/controllers/journal.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.journal
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Journal controller for pylons
     :created_on: Nov 21, 2010
     :author: marcink
     :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com>
     :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
 from itertools import groupby
 from sqlalchemy import or_
 from sqlalchemy.orm import joinedload
 from webhelpers.paginate import Page
 from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed
 from webob.exc import HTTPBadRequest
 from pylons import request, tmpl_context as c, response, url
 from pylons.i18n.translation import _
 import rhodecode.lib.helpers as h
 from rhodecode.lib.auth import LoginRequired, NotAnonymous
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import UserLog, UserFollowing, Repository, User
 from rhodecode.model.meta import Session
 from sqlalchemy.sql.expression import func
 from rhodecode.model.scm import ScmModel
 log = logging.getLogger(__name__)
 class JournalController(BaseController):
     def __before__(self):
         super(JournalController, self).__before__()
         self.rhodecode_user = self.rhodecode_user
         self.title = _('%s public journal %s feed') % (c.rhodecode_name, '%s')
         self.language = 'en-us'
         self.ttl = "5"
         self.feed_nr = 20
     @LoginRequired()
     @NotAnonymous()
     def index(self):
         # Return a rendered template
         p = int(request.params.get('page', 1))
         c.user = User.get(self.rhodecode_user.user_id)
         all_repos = self.sa.query(Repository)\
                      .filter(Repository.user_id == c.user.user_id)\
                      .order_by(func.lower(Repository.repo_name)).all()
         c.user_repos = ScmModel().get_repos(all_repos)
         c.following = self.sa.query(UserFollowing)\
             .filter(UserFollowing.user_id == self.rhodecode_user.user_id)\
             .options(joinedload(UserFollowing.follows_repository))\
             .all()
         journal = self._get_journal_data(c.following)
         c.journal_pager = Page(journal, page=p, items_per_page=20)
         c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager)
         c.journal_data = render('journal/journal_data.html')
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return c.journal_data
         return render('journal/journal.html')
     @LoginRequired(api_access=True)
     @NotAnonymous()
     def journal_atom(self):
         """
         Produce an atom-1.0 feed via feedgenerator module
         """
         following = self.sa.query(UserFollowing)\
             .filter(UserFollowing.user_id == self.rhodecode_user.user_id)\
             .options(joinedload(UserFollowing.follows_repository))\
             .all()
         return self._atom_feed(following, public=False)
     @LoginRequired(api_access=True)
     @NotAnonymous()
     def journal_rss(self):
         """
         Produce an rss feed via feedgenerator module
         """
         following = self.sa.query(UserFollowing)\
             .filter(UserFollowing.user_id == self.rhodecode_user.user_id)\
             .options(joinedload(UserFollowing.follows_repository))\
             .all()
         return self._rss_feed(following, public=False)
     def _get_daily_aggregate(self, journal):
         groups = []
         for k, g in groupby(journal, lambda x: x.action_as_day):
             user_group = []
             for k2, g2 in groupby(list(g), lambda x: x.user.email):
                 l = list(g2)
                 user_group.append((l[0].user, l))
             groups.append((k, user_group,))
         return groups
     def _get_journal_data(self, following_repos):
         repo_ids = [x.follows_repository.repo_id for x in following_repos
                     if x.follows_repository is not None]
         user_ids = [x.follows_user.user_id for x in following_repos
                     if x.follows_user is not None]
         filtering_criterion = None
         if repo_ids and user_ids:
             filtering_criterion = or_(UserLog.repository_id.in_(repo_ids),
                         UserLog.user_id.in_(user_ids))
         if repo_ids and not user_ids:
             filtering_criterion = UserLog.repository_id.in_(repo_ids)
         if not repo_ids and user_ids:
             filtering_criterion = UserLog.user_id.in_(user_ids)
         if filtering_criterion is not None:
             journal = self.sa.query(UserLog)\
                 .options(joinedload(UserLog.user))\
                 .options(joinedload(UserLog.repository))\
                 .filter(filtering_criterion)\
                 .order_by(UserLog.action_date.desc())
         else:
             journal = []
         return journal
     @LoginRequired()
     @NotAnonymous()
     def toggle_following(self):
         cur_token = request.POST.get('auth_token')
         token = h.get_token()
         if cur_token == token:
             user_id = request.POST.get('follows_user_id')
             if user_id:
                 try:
                     self.scm_model.toggle_following_user(user_id,
                                                 self.rhodecode_user.user_id)
                     Session.commit()
                     return 'ok'
                 except:
                     raise HTTPBadRequest()
             repo_id = request.POST.get('follows_repo_id')
             if repo_id:
                 try:
                     self.scm_model.toggle_following_repo(repo_id,
                                                 self.rhodecode_user.user_id)
                     Session.commit()
                     return 'ok'
                 except:
                     raise HTTPBadRequest()
         log.debug('token mismatch %s vs %s' % (cur_token, token))
         raise HTTPBadRequest()
     @LoginRequired()
     def public_journal(self):
         # Return a rendered template
         p = int(request.params.get('page', 1))
         c.following = self.sa.query(UserFollowing)\
             .filter(UserFollowing.user_id == self.rhodecode_user.user_id)\
             .options(joinedload(UserFollowing.follows_repository))\
             .all()
         journal = self._get_journal_data(c.following)
         c.journal_pager = Page(journal, page=p, items_per_page=20)
         c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager)
         c.journal_data = render('journal/journal_data.html')
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return c.journal_data
         return render('journal/public_journal.html')
     def _atom_feed(self, repos, public=True):
         journal = self._get_journal_data(repos)
         if public:
             _link = url('public_journal_atom', qualified=True)
             _desc = '%s %s %s' % (c.rhodecode_name, _('public journal'),
                                   'atom feed')
         else:
             _link = url('journal_atom', qualified=True)
             _desc = '%s %s %s' % (c.rhodecode_name, _('journal'), 'atom feed')
         feed = Atom1Feed(title=_desc,
                          link=_link,
                          description=_desc,
                          language=self.language,
                          ttl=self.ttl)
         for entry in journal[:self.feed_nr]:
             action, action_extra, ico = h.action_parser(entry, feed=True)
             title = "%s - %s %s" % (entry.user.short_contact, action(),
                                  entry.repository.repo_name)
             desc = action_extra()
             _url = None
             if entry.repository is not None:
                 _url = url('changelog_home',
                            repo_name=entry.repository.repo_name,
                            qualified=True)
             feed.add_item(title=title,
                           pubdate=entry.action_date,
                           link=_url or url('', qualified=True),
                           author_email=entry.user.email,
                           author_name=entry.user.full_contact,
                           description=desc)
         response.content_type = feed.mime_type
         return feed.writeString('utf-8')
     def _rss_feed(self, repos, public=True):
         journal = self._get_journal_data(repos)
         if public:
             _link = url('public_journal_atom', qualified=True)
             _desc = '%s %s %s' % (c.rhodecode_name, _('public journal'),
                                   'rss feed')
         else:
             _link = url('journal_atom', qualified=True)
             _desc = '%s %s %s' % (c.rhodecode_name, _('journal'), 'rss feed')
         feed = Rss201rev2Feed(title=_desc,
                          link=_link,
                          description=_desc,
                          language=self.language,
                          ttl=self.ttl)
         for entry in journal[:self.feed_nr]:
             action, action_extra, ico = h.action_parser(entry, feed=True)
             title = "%s - %s %s" % (entry.user.short_contact, action(),
                                  entry.repository.repo_name)
             desc = action_extra()
             _url = None
             if entry.repository is not None:
                 _url = url('changelog_home',
                            repo_name=entry.repository.repo_name,
                            qualified=True)
             feed.add_item(title=title,
                           pubdate=entry.action_date,
                           link=_url or url('', qualified=True),
                           author_email=entry.user.email,
                           author_name=entry.user.full_contact,
                           description=desc)
         response.content_type = feed.mime_type
         return feed.writeString('utf-8')
     @LoginRequired(api_access=True)
     def public_journal_atom(self):
         """
         Produce an atom-1.0 feed via feedgenerator module
         """
         c.following = self.sa.query(UserFollowing)\
             .filter(UserFollowing.user_id == self.rhodecode_user.user_id)\
             .options(joinedload(UserFollowing.follows_repository))\
             .all()
         journal = self._get_journal_data(c.following)
         feed = Atom1Feed(title=self.title % 'atom',
                          link=url('public_journal_atom', qualified=True),
                          description=_('Public journal'),
                          language=self.language,
                          ttl=self.ttl)
         for entry in journal[:self.feed_nr]:
             action, action_extra, ico = h.action_parser(entry, feed=True)
             title = "%s - %s %s" % (entry.user.short_contact, action(),
                                  entry.repository.repo_name)
             desc = action_extra()
             feed.add_item(title=title,
                           pubdate=entry.action_date,
                           link=url('', qualified=True),
                           author_email=entry.user.email,
                           author_name=entry.user.full_contact,
                           description=desc)
         response.content_type = feed.mime_type
         return feed.writeString('utf-8')
         return self._atom_feed(c.following)
     @LoginRequired(api_access=True)
     def public_journal_rss(self):
         """
         Produce an rss2 feed via feedgenerator module
         """
         c.following = self.sa.query(UserFollowing)\
             .filter(UserFollowing.user_id == self.rhodecode_user.user_id)\
             .options(joinedload(UserFollowing.follows_repository))\
             .all()
         journal = self._get_journal_data(c.following)
         feed = Rss201rev2Feed(title=self.title % 'rss',
                          link=url('public_journal_rss', qualified=True),
                          description=_('Public journal'),
                          language=self.language,
                          ttl=self.ttl)
         for entry in journal[:self.feed_nr]:
             action, action_extra, ico = h.action_parser(entry, feed=True)
             title = "%s - %s %s" % (entry.user.short_contact, action(),
                                  entry.repository.repo_name)
             desc = action_extra()
             feed.add_item(title=title,
                           pubdate=entry.action_date,
                           link=url('', qualified=True),
                           author_email=entry.user.email,
                           author_name=entry.user.full_contact,
                           description=desc)
         response.content_type = feed.mime_type
         return feed.writeString('utf-8')
         return self._rss_feed(c.following)

rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo

➞

Show inline comments

binary diff not shown

rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po

➞

Show inline comments

 # 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-06-03 01:06+0200\n"
 "PO-Revision-Date: 2012-05-20 11:36+0100\n"
 "POT-Creation-Date: 2012-06-05 20:42+0200\n"
 "PO-Revision-Date: 2012-06-05 20:07+0100\n"
 "Last-Translator: Vincent Duvert <vincent@duvert.net>\n"
 "Language-Team: fr <LL@li.org>\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
+#: rhodecode/controllers/changelog.py:94
 msgid "All Branches"
 msgstr "Toutes les branches"
 #: rhodecode/controllers/changeset.py:80
 msgid "show white space"
 msgstr "afficher les espaces et tabulations"
 #: rhodecode/controllers/changeset.py:87 rhodecode/controllers/changeset.py:94
 msgid "ignore white space"
 msgstr "ignorer les espaces et tabulations"
 #: rhodecode/controllers/changeset.py:154
 #, python-format
 msgid "%s line context"
 msgstr "afficher %s lignes de contexte"
 #: rhodecode/controllers/changeset.py:324
 #: rhodecode/controllers/changeset.py:339 rhodecode/lib/diffs.py:62
 msgid "binary file"
 msgstr "fichier binaire"
 #: 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:48
+#: rhodecode/controllers/feed.py:49
 #, python-format
 msgid "Changes on %s repository"
 msgstr "Changements sur le dépôt %s"
-#: rhodecode/controllers/feed.py:49
+#: rhodecode/controllers/feed.py:50
 #, python-format
 msgid "%s %s feed"
 msgstr "Flux %s de %s"
 #: rhodecode/controllers/feed.py:75
 msgid "commited on"
 msgstr "a commité, le"
 #: rhodecode/controllers/files.py:86
 #: rhodecode/templates/admin/repos/repo_add.html:13
 msgid "add new"
 msgstr "ajouter un nouveau"
 #: 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:247
 #, python-format
 msgid "Edited %s via RhodeCode"
 msgstr "%s édité via RhodeCode"
 #: rhodecode/controllers/files.py:252
 msgid "No changes"
 msgstr "Aucun changement"
 #: rhodecode/controllers/files.py:263 rhodecode/controllers/files.py:316
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Commit réalisé avec succès sur %s"
 #: rhodecode/controllers/files.py:268 rhodecode/controllers/files.py:322
 msgid "Error occurred during commit"
 msgstr "Une erreur est survenue durant le commit"
 #: rhodecode/controllers/files.py:288
 #, python-format
 msgid "Added %s via RhodeCode"
 msgstr "%s ajouté par RhodeCode"
 #: rhodecode/controllers/files.py:302
 msgid "No content"
 msgstr "Aucun contenu"
 #: rhodecode/controllers/files.py:306
 msgid "No filename"
 msgstr "Aucun nom de fichier"
 #: rhodecode/controllers/files.py:347
 msgid "downloads disabled"
 msgstr "Les téléchargements sont désactivés"
 #: rhodecode/controllers/files.py:358
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Révision %s inconnue."
 #: rhodecode/controllers/files.py:360
 msgid "Empty repository"
 msgstr "Dépôt vide."
 #: rhodecode/controllers/files.py:362
 msgid "Unknown archive type"
 msgstr "Type d’archive inconnu"
 #: rhodecode/controllers/files.py:461
 #: rhodecode/templates/changeset/changeset_range.html:5
 #: rhodecode/templates/changeset/changeset_range.html:13
 #: rhodecode/templates/changeset/changeset_range.html:31
 msgid "Changesets"
 msgstr "Changesets"
 #: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:230
 #: rhodecode/templates/branches/branches.html:5
 msgid "Branches"
 msgstr "Branches"
 #: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:231
 #: rhodecode/templates/tags/tags.html:5
 msgid "Tags"
 msgstr "Tags"
 #: rhodecode/controllers/forks.py:69 rhodecode/controllers/admin/repos.py:86
 #, 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:128 rhodecode/controllers/settings.py:69
 #, 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:163
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "dépôt %s forké en tant que %s"
 #: rhodecode/controllers/forks.py:177
 #, 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:53
 #, python-format
 msgid "%s public journal %s feed"
 msgstr "%s — Flux %s du journal public"
 #: rhodecode/controllers/journal.py:190 rhodecode/controllers/journal.py:223
 #: rhodecode/templates/admin/repos/repo_edit.html:177
 #: rhodecode/templates/base/base.html:307
 #: rhodecode/templates/base/base.html:309
 #: rhodecode/templates/base/base.html:311
 msgid "Public journal"
 msgstr "Journal public"
 #: rhodecode/controllers/login.py:116
 msgid "You have successfully registered into rhodecode"
 msgstr "Vous vous êtes inscrits avec succès à RhodeCode"
 #: rhodecode/controllers/login.py:137
 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:157
 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/search.py:114
 msgid "Invalid search query. Try quoting it."
 msgstr "Requête invalide. Essayer de la mettre entre guillemets."
 #: rhodecode/controllers/search.py:119
 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:123
 msgid "An error occurred during this search operation"
 msgstr "Une erreur est survenue durant l’opération de recherche."
 #: rhodecode/controllers/settings.py:103
 #: rhodecode/controllers/admin/repos.py:213
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "Dépôt %s mis à jour avec succès."
 #: rhodecode/controllers/settings.py:121
 #: rhodecode/controllers/admin/repos.py:231
 #, 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:139
 #: rhodecode/controllers/admin/repos.py:249
 #, 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:151
 #: rhodecode/controllers/admin/repos.py:261
 #, python-format
 msgid "deleted repository %s"
 msgstr "Dépôt %s supprimé"
 #: rhodecode/controllers/settings.py:155
 #: rhodecode/controllers/admin/repos.py:271
 #: rhodecode/controllers/admin/repos.py:277
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "Erreur pendant la suppression de %s"
 #: rhodecode/controllers/summary.py:138
 msgid "No data loaded yet"
 msgstr "Aucune donnée actuellement disponible."
 #: rhodecode/controllers/summary.py:142
 #: rhodecode/templates/summary/summary.html:139
 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/ldap_settings.py:49
 msgid "BASE"
 msgstr "Base"
 #: rhodecode/controllers/admin/ldap_settings.py:50
 msgid "ONELEVEL"
 msgstr "Un niveau"
 #: rhodecode/controllers/admin/ldap_settings.py:51
 msgid "SUBTREE"
 msgstr "Sous-arbre"
 #: rhodecode/controllers/admin/ldap_settings.py:55
 msgid "NEVER"
 msgstr "NEVER"
 #: rhodecode/controllers/admin/ldap_settings.py:56
 msgid "ALLOW"
 msgstr "Autoriser"
 #: rhodecode/controllers/admin/ldap_settings.py:57
 msgid "TRY"
 msgstr "TRY"
 #: rhodecode/controllers/admin/ldap_settings.py:58
 msgid "DEMAND"
 msgstr "DEMAND"
 #: rhodecode/controllers/admin/ldap_settings.py:59
 msgid "HARD"
 msgstr "HARD"
 #: rhodecode/controllers/admin/ldap_settings.py:63
 msgid "No encryption"
 msgstr "Pas de chiffrement"
 #: rhodecode/controllers/admin/ldap_settings.py:64
 msgid "LDAPS connection"
 msgstr "Connection LDAPS"
 #: rhodecode/controllers/admin/ldap_settings.py:65
 msgid "START_TLS on LDAP connection"
 msgstr "START_TLS à la connexion"
 #: rhodecode/controllers/admin/ldap_settings.py:125
 msgid "Ldap settings updated successfully"
 msgstr "Mise à jour réussie des réglages LDAP"
 #: rhodecode/controllers/admin/ldap_settings.py:129
 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:146
 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
 msgid "None"
 msgstr "Aucun"
 #: rhodecode/controllers/admin/permissions.py:60
 msgid "Read"
 msgstr "Lire"
 #: rhodecode/controllers/admin/permissions.py:61
 msgid "Write"
 msgstr "Écrire"
@@ @@ -472,781 +473,772 @@ msgstr "Le dépôt %s a été marké comme fork de %s" @@
 #: rhodecode/controllers/admin/repos.py:413
 msgid "An error occurred during this operation"
 msgstr "Une erreur est survenue durant cette opération."
 #: rhodecode/controllers/admin/repos_groups.py:119
 #, python-format
 msgid "created repos group %s"
 msgstr "Le groupe de dépôts %s a été créé."
 #: rhodecode/controllers/admin/repos_groups.py:132
 #, 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:166
 #, 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:179
 #, 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:205
 #, python-format
 msgid "removed repos group %s"
 msgstr "Le groupe de dépôts %s a été supprimé."
 #: rhodecode/controllers/admin/repos_groups.py:210
 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:215
 #: rhodecode/controllers/admin/repos_groups.py:220
 #, 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:240
 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:260
 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:120
 #, 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:129
 msgid "Whoosh reindex task scheduled"
 msgstr "La tâche de réindexation Whoosh a été planifiée."
 #: rhodecode/controllers/admin/settings.py:154
 msgid "Updated application settings"
 msgstr "Réglages mis à jour"
 #: rhodecode/controllers/admin/settings.py:159
 #: rhodecode/controllers/admin/settings.py:226
 msgid "error occurred during updating application settings"
 msgstr "Une erreur est survenue durant la mise à jour des options."
 #: rhodecode/controllers/admin/settings.py:221
 msgid "Updated mercurial settings"
 msgstr "Réglages de Mercurial mis à jour"
 #: rhodecode/controllers/admin/settings.py:246
 msgid "Added new hook"
 msgstr "Le nouveau hook a été ajouté."
 #: rhodecode/controllers/admin/settings.py:258
 msgid "Updated hooks"
 msgstr "Hooks mis à jour"
 #: rhodecode/controllers/admin/settings.py:262
 msgid "error occurred during hook creation"
 msgstr "Une erreur est survenue durant la création du hook."
 #: rhodecode/controllers/admin/settings.py:281
 msgid "Email task created"
 msgstr "La tâche d’e-mail a été créée."
 #: rhodecode/controllers/admin/settings.py:336
 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:367
 msgid "Your account was updated successfully"
 msgstr "Votre compte a été mis à jour avec succès"
 #: rhodecode/controllers/admin/settings.py:387
 #: rhodecode/controllers/admin/users.py:138
 #, 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:83
 #, python-format
 msgid "created user %s"
 msgstr "utilisateur %s créé"
 #: rhodecode/controllers/admin/users.py:95
 #, 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:124
 msgid "User updated successfully"
 msgstr "L’utilisateur a été mis à jour avec succès."
 #: rhodecode/controllers/admin/users.py:155
 msgid "successfully deleted user"
 msgstr "L’utilisateur a été supprimé avec succès."
 #: rhodecode/controllers/admin/users.py:160
 msgid "An error occurred during deletion of user"
 msgstr "Une erreur est survenue durant la suppression de l’utilisateur."
 #: rhodecode/controllers/admin/users.py:175
 msgid "You can't edit this user"
 msgstr "Vous ne pouvez pas éditer cet utilisateur"
 #: rhodecode/controllers/admin/users.py:205
 #: rhodecode/controllers/admin/users_groups.py:219
 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:214
 #: rhodecode/controllers/admin/users_groups.py:229
 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_groups.py:84
 #, python-format
 msgid "created users group %s"
 msgstr "Le groupe d’utilisateurs %s a été créé."
 #: rhodecode/controllers/admin/users_groups.py:95
 #, 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:135
 #, python-format
 msgid "updated users group %s"
 msgstr "Le groupe d’utilisateurs %s a été mis à jour."
 #: rhodecode/controllers/admin/users_groups.py:152
 #, 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:169
 msgid "successfully deleted users group"
 msgstr "Le groupe d’utilisateurs a été supprimé avec succès."
 #: rhodecode/controllers/admin/users_groups.py:174
 msgid "An error occurred during deletion of users group"
 msgstr "Une erreur est survenue lors de la suppression du groupe d’utilisateurs."
 #: rhodecode/lib/auth.py:497
 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:538
 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:78
 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:88
 msgid "No changes detected"
 msgstr "Aucun changement détecté."
 #: rhodecode/lib/helpers.py:415
 #: rhodecode/lib/helpers.py:350
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr "%d/%m/%Y à %H:%M:%S"
 #: rhodecode/lib/helpers.py:423
 msgid "True"
 msgstr "Vrai"
-#: rhodecode/lib/helpers.py:419
+#: rhodecode/lib/helpers.py:427
 msgid "False"
 msgstr "Faux"
 #: rhodecode/lib/helpers.py:463
 #, fuzzy
 #: rhodecode/lib/helpers.py:471
 msgid "Changeset not found"
 msgstr "Dépôt vide"
 #: rhodecode/lib/helpers.py:486
 msgstr "Ensemble de changements non trouvé"
 #: rhodecode/lib/helpers.py:494
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "Afficher les changements combinés %s->%s"
-#: rhodecode/lib/helpers.py:492
+#: rhodecode/lib/helpers.py:500
 msgid "compare view"
 msgstr "vue de comparaison"
-#: rhodecode/lib/helpers.py:512
+#: rhodecode/lib/helpers.py:520
 msgid "and"
 msgstr "et"
-#: rhodecode/lib/helpers.py:513
+#: rhodecode/lib/helpers.py:521
 #, python-format
 msgid "%s more"
 msgstr "%s de plus"
-#: rhodecode/lib/helpers.py:514 rhodecode/templates/changelog/changelog.html:40
+#: rhodecode/lib/helpers.py:522 rhodecode/templates/changelog/changelog.html:40
 msgid "revisions"
 msgstr "révisions"
-#: rhodecode/lib/helpers.py:537
+#: rhodecode/lib/helpers.py:545
 msgid "fork name "
 msgstr "Nom du fork"
-#: rhodecode/lib/helpers.py:550
+#: rhodecode/lib/helpers.py:558
 msgid "[deleted] repository"
 msgstr "[a supprimé] le dépôt"
-#: rhodecode/lib/helpers.py:552 rhodecode/lib/helpers.py:562
+#: rhodecode/lib/helpers.py:560 rhodecode/lib/helpers.py:570
 msgid "[created] repository"
 msgstr "[a créé] le dépôt"
-#: rhodecode/lib/helpers.py:554
+#: rhodecode/lib/helpers.py:562
 msgid "[created] repository as fork"
 msgstr "[a créé] le dépôt en tant que fork"
-#: rhodecode/lib/helpers.py:556 rhodecode/lib/helpers.py:564
+#: rhodecode/lib/helpers.py:564 rhodecode/lib/helpers.py:572
 msgid "[forked] repository"
 msgstr "[a forké] le dépôt"
-#: rhodecode/lib/helpers.py:558 rhodecode/lib/helpers.py:566
+#: rhodecode/lib/helpers.py:566 rhodecode/lib/helpers.py:574
 msgid "[updated] repository"
 msgstr "[a mis à jour] le dépôt"
 #: rhodecode/lib/helpers.py:560
 msgid "[delete] repository"
 msgstr "[a supprimé] le dépôt"
 #: rhodecode/lib/helpers.py:568
 #, fuzzy, python-format
 #| msgid "created user %s"
 msgid "[created] user"
 msgstr "utilisateur %s créé"
 #: rhodecode/lib/helpers.py:570
 #, fuzzy, python-format
 #| msgid "updated users group %s"
 msgid "[updated] user"
 msgstr "Le groupe d’utilisateurs %s a été mis à jour."
 #: rhodecode/lib/helpers.py:572
 #, fuzzy, python-format
 #| msgid "created users group %s"
 msgid "[created] users group"
 msgstr "Le groupe d’utilisateurs %s a été créé."
 #: rhodecode/lib/helpers.py:574
 #, fuzzy, python-format
 #| msgid "updated users group %s"
 msgid "[updated] users group"
 msgstr "Le groupe d’utilisateurs %s a été mis à jour."
 msgid "[delete] repository"
 msgstr "[a supprimé] le dépôt"
 #: rhodecode/lib/helpers.py:576
 #, fuzzy
 #| msgid "[created] repository"
 msgid "[commented] on revision in repository"
 msgstr "[a créé] le dépôt"
 msgid "[created] user"
 msgstr "[a créé] l’utilisateur"
 #: rhodecode/lib/helpers.py:578
 msgid "[pushed] into"
 msgstr "[a pushé] dans"
 msgid "[updated] user"
 msgstr "[a mis à jour] l’utilisateur"
 #: rhodecode/lib/helpers.py:580
 #, fuzzy
 #| msgid "[committed via RhodeCode] into"
 msgid "[committed via RhodeCode] into repository"
 msgstr "[a commité via RhodeCode] dans"
 msgid "[created] users group"
 msgstr "[a créé] le groupe d’utilisateurs"
 #: rhodecode/lib/helpers.py:582
 #, fuzzy
 #| msgid "[pulled from remote] into"
 msgid "[pulled from remote] into repository"
 msgstr "[a pullé depuis un site distant] dans"
 msgid "[updated] users group"
 msgstr "[a mis à jour] le groupe d’utilisateurs"
 #: rhodecode/lib/helpers.py:584
 msgid "[commented] on revision in repository"
 msgstr "[a commenté] une révision du dépôt"
 #: rhodecode/lib/helpers.py:586
 msgid "[pushed] into"
 msgstr "[a pushé] dans"
 #: rhodecode/lib/helpers.py:588
 msgid "[committed via RhodeCode] into repository"
 msgstr "[a commité via RhodeCode] dans le dépôt"
 #: rhodecode/lib/helpers.py:590
 msgid "[pulled from remote] into repository"
 msgstr "[a pullé depuis un site distant] dans le dépôt"
 #: rhodecode/lib/helpers.py:592
 msgid "[pulled] from"
 msgstr "[a pullé] depuis"
-#: rhodecode/lib/helpers.py:586
+#: rhodecode/lib/helpers.py:594
 msgid "[started following] repository"
 msgstr "[suit maintenant] le dépôt"
-#: rhodecode/lib/helpers.py:588
+#: rhodecode/lib/helpers.py:596
 msgid "[stopped following] repository"
 msgstr "[ne suit plus] le dépôt"
-#: rhodecode/lib/helpers.py:752
+#: rhodecode/lib/helpers.py:760
 #, python-format
 msgid " and %s more"
 msgstr "et %s de plus"
-#: rhodecode/lib/helpers.py:756
+#: rhodecode/lib/helpers.py:764
 msgid "No Files"
 msgstr "Aucun fichier"
 #: rhodecode/lib/utils2.py:335
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d an"
 msgstr[1] "%d ans"
 #: rhodecode/lib/utils2.py:336
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mois"
 msgstr[1] "%d mois"
 #: rhodecode/lib/utils2.py:337
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 #: rhodecode/lib/utils2.py:338
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 #: rhodecode/lib/utils2.py:339
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 #: rhodecode/lib/utils2.py:340
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d secondes"
 #: rhodecode/lib/utils2.py:355
 #, python-format
 msgid "%s ago"
 msgstr "Il y a %s"
 #: rhodecode/lib/utils2.py:357
 #, python-format
 msgid "%s and %s ago"
 msgstr "Il y a %s et %s"
 #: rhodecode/lib/utils2.py:360
 msgid "just now"
 msgstr "à l’instant"
 #: rhodecode/lib/celerylib/tasks.py:269
 msgid "password reset link"
 msgstr "Réinitialisation du mot de passe"
 #: rhodecode/model/comment.py:85
 #, python-format
 msgid "on line %s"
 msgstr "à la ligne %s"
-#: rhodecode/model/comment.py:113
+#: rhodecode/model/comment.py:114
 msgid "[Mention]"
 msgstr "[Mention]"
 #: rhodecode/model/forms.py:72
 msgid "Invalid username"
 msgstr "Nom d’utilisateur invalide"
 #: rhodecode/model/forms.py:80
 msgid "This username already exists"
 msgstr "Ce nom d’utilisateur existe déjà"
 #: rhodecode/model/forms.py:85
 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/forms.py:101
 msgid "Invalid group name"
 msgstr "Nom de groupe invalide"
 #: rhodecode/model/forms.py:111
 msgid "This users group already exists"
 msgstr "Ce groupe d’utilisateurs existe déjà."
 #: rhodecode/model/forms.py:117
 msgid ""
 "RepoGroup name may only contain  alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr ""
 "Le nom de groupe de dépôts 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/forms.py:145
 msgid "Cannot assign this group as parent"
 msgstr "Impossible d’assigner ce groupe en tant que parent."
 #: rhodecode/model/forms.py:164
 msgid "This group already exists"
 msgstr "Ce groupe existe déjà."
 #: rhodecode/model/forms.py:176
 msgid "Repository with this name already exists"
 msgstr "Un dépôt portant ce nom existe déjà."
 #: rhodecode/model/forms.py:195 rhodecode/model/forms.py:204
 #: rhodecode/model/forms.py:213
 msgid "Invalid characters in password"
 msgstr "Caractères incorrects dans le mot de passe"
 #: rhodecode/model/forms.py:226
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas."
 #: rhodecode/model/forms.py:232
 msgid "invalid password"
 msgstr "mot de passe invalide"
 #: rhodecode/model/forms.py:233
 msgid "invalid user name"
 msgstr "nom d’utilisateur invalide"
 #: rhodecode/model/forms.py:234
 msgid "Your account is disabled"
 msgstr "Votre compte est désactivé"
 #: rhodecode/model/forms.py:274
 msgid "This username is not valid"
 msgstr "Ce nom d’utilisateur n’est plus valide"
 #: rhodecode/model/forms.py:287
 msgid "This repository name is disallowed"
 msgstr "Ce nom de dépôt est interdit"
 #: rhodecode/model/forms.py:310
 #, python-format
 msgid "This repository already exists in a group \"%s\""
 msgstr "Ce dépôt existe déjà dans le groupe « %s »."
 #: rhodecode/model/forms.py:317
 #, python-format
 msgid "There is a group with this name already \"%s\""
 msgstr "Un groupe portant le nom « %s » existe déjà."
 #: rhodecode/model/forms.py:324
 msgid "This repository already exists"
 msgstr "Ce dépôt existe déjà"
 #: rhodecode/model/forms.py:367
 msgid "invalid clone url"
 msgstr "URL de clonage invalide."
 #: rhodecode/model/forms.py:384
 msgid "Invalid clone url, provide a valid clone http\\s url"
 msgstr ""
 "URL à cloner invalide. Veuillez fournir une URL valide commençant par "
 "http(s)."
 #: rhodecode/model/forms.py:398
 msgid "Fork have to be the same type as original"
 msgstr "Le fork doit être du même type que l’original"
 #: rhodecode/model/forms.py:414
 msgid "This username or users group name is not valid"
 msgstr "Ce nom d’utilisateur ou de groupe n’est pas valide."
 #: rhodecode/model/forms.py:480
 msgid "This is not a valid path"
 msgstr "Ceci n’est pas un chemin valide"
 #: rhodecode/model/forms.py:494
 msgid "This e-mail address is already taken"
 msgstr "Cette adresse e-mail est déjà enregistrée"
 #: rhodecode/model/forms.py:507
 msgid "This e-mail address doesn't exist."
 msgstr "Cette adresse e-mail n’existe pas"
 #: rhodecode/model/forms.py:530
 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/forms.py:549
 msgid "Please enter a login"
 msgstr "Veuillez entrer un identifiant"
 #: rhodecode/model/forms.py:550
 #, 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:558
 msgid "Please enter a password"
 msgstr "Veuillez entrer un mot de passe"
 #: rhodecode/model/forms.py:559
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr "Entrez au moins %(min)i caractères"
-#: rhodecode/model/notification.py:175
+#: rhodecode/model/notification.py:178
 msgid "commented on commit"
 msgstr "a posté un commentaire sur le commit"
-#: rhodecode/model/notification.py:176
+#: rhodecode/model/notification.py:179
 msgid "sent message"
 msgstr "a envoyé un message"
-#: rhodecode/model/notification.py:177
+#: rhodecode/model/notification.py:180
 msgid "mentioned you"
 msgstr "vous a mentioné"
-#: rhodecode/model/notification.py:178
+#: rhodecode/model/notification.py:181
 msgid "registered in RhodeCode"
 msgstr "s’est enregistré sur RhodeCode"
 #: rhodecode/model/user.py:235
 msgid "new user registration"
 msgstr "Nouveau compte utilisateur enregistré"
 #: rhodecode/model/user.py:259 rhodecode/model/user.py:279
 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:300
 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:306
 #, 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/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/users/user_edit_my_account.html:31
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 #: rhodecode/templates/branches/branches.html:9
 #: rhodecode/templates/journal/journal.html:31
 #: rhodecode/templates/tags/tags.html:10
 msgid "quick filter..."
-msgstr "filtre rapide"
+msgstr "Filtre rapide…"
 #: rhodecode/templates/index_base.html:6 rhodecode/templates/base/base.html:218
 msgid "repositories"
 msgstr "Dépôts"
 #: rhodecode/templates/index_base.html:13
 #: rhodecode/templates/index_base.html:15
 #: rhodecode/templates/admin/repos/repos.html:22
 msgid "ADD REPOSITORY"
 msgstr "AJOUTER UN DÉPÔT"
 #: rhodecode/templates/index_base.html:29
 #: 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:67
 #: rhodecode/templates/index_base.html:132
 #: rhodecode/templates/index_base.html:158
 #: rhodecode/templates/admin/repos/repo_add_base.html:47
 #: rhodecode/templates/admin/repos/repo_edit.html:66
 #: rhodecode/templates/admin/repos/repos.html:37
 #: rhodecode/templates/admin/repos/repos.html:84
 #: 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:49
 #: rhodecode/templates/settings/repo_settings.html:57
 #: rhodecode/templates/summary/summary.html:100
 msgid "Description"
 msgstr "Description"
 #: rhodecode/templates/index_base.html:40
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
 msgid "Repositories group"
 msgstr "Groupe de dépôts"
 #: rhodecode/templates/index_base.html:66
 #: rhodecode/templates/index_base.html:156
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
 #: rhodecode/templates/admin/repos/repos.html:36
 #: rhodecode/templates/admin/repos/repos.html:82
 #: rhodecode/templates/admin/users/user_edit_my_account.html:49
 #: rhodecode/templates/admin/users/user_edit_my_account.html:99
 #: rhodecode/templates/admin/users/user_edit_my_account.html:165
 #: rhodecode/templates/admin/users/user_edit_my_account.html:200
 #: rhodecode/templates/bookmarks/bookmarks.html:36
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
 #: rhodecode/templates/branches/branches.html:36
 #: rhodecode/templates/files/files_browser.html:47
 #: rhodecode/templates/journal/journal.html:50
 #: rhodecode/templates/journal/journal.html:98
 #: rhodecode/templates/journal/journal.html:177
 #: rhodecode/templates/settings/repo_settings.html:31
 #: rhodecode/templates/summary/summary.html:38
 #: rhodecode/templates/summary/summary.html:114
 #: rhodecode/templates/tags/tags.html:36
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
 msgstr "Nom"
 #: rhodecode/templates/index_base.html:68
 #: rhodecode/templates/admin/repos/repos.html:38
 msgid "Last change"
 msgstr "Dernière modification"
 #: rhodecode/templates/index_base.html:69
 #: rhodecode/templates/index_base.html:161
 #: rhodecode/templates/admin/repos/repos.html:39
 #: rhodecode/templates/admin/repos/repos.html:87
 #: rhodecode/templates/admin/users/user_edit_my_account.html:167
 #: rhodecode/templates/journal/journal.html:179
 msgid "Tip"
 msgstr "Sommet"
 #: rhodecode/templates/index_base.html:70
 #: rhodecode/templates/index_base.html:163
 #: rhodecode/templates/admin/repos/repo_edit.html:103
 #: rhodecode/templates/admin/repos/repos.html:89
 msgid "Owner"
 msgstr "Propriétaire"
 #: rhodecode/templates/index_base.html:71
 #: rhodecode/templates/journal/public_journal.html:20
 #: rhodecode/templates/summary/summary.html:43
 #: rhodecode/templates/summary/summary.html:46
 msgid "RSS"
 msgstr "RSS"
 #: rhodecode/templates/index_base.html:72
 #: rhodecode/templates/journal/public_journal.html:23
 msgid "Atom"
 msgstr "Atom"
 #: rhodecode/templates/index_base.html:102
 #: rhodecode/templates/index_base.html:104
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr "S’abonner au flux RSS de %s"
 #: rhodecode/templates/index_base.html:109
 #: rhodecode/templates/index_base.html:111
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "S’abonner au flux ATOM de %s"
 #: rhodecode/templates/index_base.html:130
 msgid "Group Name"
 msgstr "Nom du groupe"
 #: rhodecode/templates/index_base.html:148
 #: rhodecode/templates/index_base.html:188
 #: rhodecode/templates/admin/repos/repos.html:112
 #: rhodecode/templates/admin/users/user_edit_my_account.html:186
 #: rhodecode/templates/bookmarks/bookmarks.html:60
 #: rhodecode/templates/branches/branches.html:60
 #: rhodecode/templates/journal/journal.html:202
 #: rhodecode/templates/tags/tags.html:60
 msgid "Click to sort ascending"
 msgstr "Tri ascendant"
 #: rhodecode/templates/index_base.html:149
 #: rhodecode/templates/index_base.html:189
 #: rhodecode/templates/admin/repos/repos.html:113
 #: rhodecode/templates/admin/users/user_edit_my_account.html:187
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:61
 #: rhodecode/templates/journal/journal.html:203
 #: rhodecode/templates/tags/tags.html:61
 msgid "Click to sort descending"
 msgstr "Tri descendant"
 #: rhodecode/templates/index_base.html:159
 #: rhodecode/templates/admin/repos/repos.html:85
 msgid "Last Change"
 msgstr "Dernière modification"
 #: rhodecode/templates/index_base.html:190
 #: rhodecode/templates/admin/repos/repos.html:114
 #: rhodecode/templates/admin/users/user_edit_my_account.html:188
 #: rhodecode/templates/bookmarks/bookmarks.html:62
 #: rhodecode/templates/branches/branches.html:62
 #: rhodecode/templates/journal/journal.html:204
 #: rhodecode/templates/tags/tags.html:62
 msgid "No records found."
 msgstr "Aucun élément n’a été trouvé."
 #: rhodecode/templates/index_base.html:191
 #: rhodecode/templates/admin/repos/repos.html:115
 #: rhodecode/templates/admin/users/user_edit_my_account.html:189
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:63
 #: rhodecode/templates/journal/journal.html:205
 #: rhodecode/templates/tags/tags.html:63
 msgid "Data error."
 msgstr "Erreur d’intégrité des données."
 #: rhodecode/templates/index_base.html:192
 #: rhodecode/templates/admin/repos/repos.html:116
 #: rhodecode/templates/admin/users/user_edit_my_account.html:190
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:64
 #: rhodecode/templates/journal/journal.html:206
 #: rhodecode/templates/tags/tags.html:64
 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:113
 msgid "Username"
 msgstr "Nom d’utilisateur"
 #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
@@ @@ -1618,517 +1610,522 @@ msgstr "Type de dépôt à créer." @@
 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:60
 #: rhodecode/templates/admin/repos/repo_edit.html:80
 #: rhodecode/templates/settings/repo_settings.html:71
 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/repos/repo_add_base.html:64
 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_my_account.html:71
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13
 #: rhodecode/templates/files/files_source.html:32
 #: rhodecode/templates/journal/journal.html:72
 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:85
 msgid "Enable statistics"
 msgstr "Activer les statistiques"
 #: rhodecode/templates/admin/repos/repo_edit.html:89
 msgid "Enable statistics window on summary page."
 msgstr "Afficher les statistiques sur la page du dépôt."
 #: rhodecode/templates/admin/repos/repo_edit.html:94
 msgid "Enable downloads"
 msgstr "Activer les téléchargements"
 #: rhodecode/templates/admin/repos/repo_edit.html:98
 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/repos/repo_edit.html:108
 msgid "Change owner of this repository."
 msgstr "Changer le propriétaire de ce dépôt."
 #: rhodecode/templates/admin/repos/repo_edit.html:134
 msgid "Administration"
 msgstr "Administration"
 #: rhodecode/templates/admin/repos/repo_edit.html:137
 msgid "Statistics"
 msgstr "Statistiques"
 #: rhodecode/templates/admin/repos/repo_edit.html:141
 msgid "Reset current statistics"
 msgstr "Réinitialiser les statistiques"
 #: rhodecode/templates/admin/repos/repo_edit.html:141
 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:144
 msgid "Fetched to rev"
 msgstr "Parcouru jusqu’à la révision"
 #: rhodecode/templates/admin/repos/repo_edit.html:145
 msgid "Stats gathered"
 msgstr "Statistiques obtenues"
 #: rhodecode/templates/admin/repos/repo_edit.html:153
 msgid "Remote"
 msgstr "Dépôt distant"
 #: rhodecode/templates/admin/repos/repo_edit.html:157
 msgid "Pull changes from remote location"
 msgstr "Récupérer les changements depuis le site distant"
 #: rhodecode/templates/admin/repos/repo_edit.html:157
 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:168
 msgid "Cache"
 msgstr "Cache"
 #: rhodecode/templates/admin/repos/repo_edit.html:172
 msgid "Invalidate repository cache"
 msgstr "Invalider le cache du dépôt"
 #: rhodecode/templates/admin/repos/repo_edit.html:172
 msgid "Confirm to invalidate repository cache"
 msgstr "Voulez-vous vraiment invalider le cache du dépôt ?"
 #: rhodecode/templates/admin/repos/repo_edit.html:183
 msgid "Remove from public journal"
 msgstr "Supprimer du journal public"
 #: rhodecode/templates/admin/repos/repo_edit.html:185
 msgid "Add to public journal"
 msgstr "Ajouter le dépôt au journal public"
 #: rhodecode/templates/admin/repos/repo_edit.html:190
 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:197
 #: rhodecode/templates/changeset/changeset_file_comment.html:19
 msgid "Delete"
 msgstr "Supprimer"
 #: rhodecode/templates/admin/repos/repo_edit.html:201
 msgid "Remove this repository"
 msgstr "Supprimer ce dépôt"
 #: rhodecode/templates/admin/repos/repo_edit.html:201
 msgid "Confirm to delete this repository"
 msgstr "Voulez-vous vraiment supprimer ce dépôt ?"
 #: rhodecode/templates/admin/repos/repo_edit.html:205
 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"
 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."
 #: rhodecode/templates/admin/repos/repo_edit.html:213
 msgid "Set as fork"
 msgstr "Indiquer comme fork"
 #: rhodecode/templates/admin/repos/repo_edit.html:222
 msgid "Manually set this repository as a fork of another"
 msgstr "Permet d’indiquer manuellement que ce dépôt est un fork d’un autre dépôt."
 #: 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:38
 #: rhodecode/templates/base/base.html:214
 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:61
 #: rhodecode/templates/journal/journal.html:123
 #: rhodecode/templates/summary/summary.html:71
 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:80
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64
 msgid "Add another member"
 msgstr "Ajouter un utilisateur"
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:94
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78
 msgid "Failed to remove user"
 msgstr "Échec de suppression de l’utilisateur"
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:109
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93
 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/repos.html:40
 #: rhodecode/templates/summary/summary.html:107
 msgid "Contact"
 msgstr "Contact"
 #: rhodecode/templates/admin/repos/repos.html:68
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
 #: rhodecode/templates/admin/users/users.html:55
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 msgid "delete"
 msgstr "Supprimer"
 #: rhodecode/templates/admin/repos/repos.html:68
 #: rhodecode/templates/admin/users/user_edit_my_account.html:74
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr "Voulez-vous vraiment supprimer le dépôt %s ?"
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:8
 msgid "Groups"
 msgstr "Groupes"
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:12
 msgid "with"
-msgstr "avec support de"
+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
 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:67
 #: rhodecode/templates/admin/settings/settings.html:112
 #: rhodecode/templates/admin/settings/settings.html:177
 #: rhodecode/templates/admin/users/user_edit.html:130
 #: rhodecode/templates/admin/users/user_edit.html:155
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:116
 #: rhodecode/templates/files/files_add.html:82
 #: rhodecode/templates/files/files_edit.html:68
 #: rhodecode/templates/settings/repo_settings.html:85
 msgid "Reset"
 msgstr "Réinitialiser"
 #: 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:40
 #: rhodecode/templates/admin/users_groups/users_groups.html:35
 msgid "action"
 msgstr "Action"
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
 #, python-format
 msgid "Confirm to delete this group: %s"
 msgstr "Voulez-vous vraiment supprimer le groupe « %s » ?"
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62
 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:5
 #: 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:45
 msgid "Rescan repositories"
 msgstr "Re-scanner les dépôts"
 #: rhodecode/templates/admin/settings/settings.html:51
 msgid "Whoosh indexing"
 msgstr "Indexation Whoosh"
 #: rhodecode/templates/admin/settings/settings.html:59
 msgid "index build option"
 msgstr "Option d’indexation"
 #: rhodecode/templates/admin/settings/settings.html:64
 msgid "build from scratch"
 msgstr "Purger et reconstruire l’index"
 #: rhodecode/templates/admin/settings/settings.html:70
 msgid "Reindex"
 msgstr "Mettre à jour l’index"
 #: rhodecode/templates/admin/settings/settings.html:76
 msgid "Global application settings"
 msgstr "Réglages d’application globaux"
 #: rhodecode/templates/admin/settings/settings.html:85
 msgid "Application name"
 msgstr "Nom de l’application"
 #: rhodecode/templates/admin/settings/settings.html:94
 msgid "Realm text"
 msgstr "Texte du royaume"
 #: rhodecode/templates/admin/settings/settings.html:103
 msgid "GA code"
 msgstr "Code GA"
 #: rhodecode/templates/admin/settings/settings.html:111
 #: rhodecode/templates/admin/settings/settings.html:176
 msgid "Save settings"
 msgstr "Enregister les options"
 #: rhodecode/templates/admin/settings/settings.html:118
 msgid "Mercurial settings"
 msgstr "Options de Mercurial"
 #: rhodecode/templates/admin/settings/settings.html:127
 msgid "Web"
 msgstr "Web"
 #: rhodecode/templates/admin/settings/settings.html:132
 msgid "require ssl for pushing"
 msgstr "SSL requis pour les pushs"
 #: rhodecode/templates/admin/settings/settings.html:139
 msgid "Hooks"
 msgstr "Hooks"
 #: rhodecode/templates/admin/settings/settings.html:144
 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:148
 msgid "Show repository size after push"
 msgstr "Afficher la taille du dépôt après un push"
 #: rhodecode/templates/admin/settings/settings.html:152
 msgid "Log user push commands"
 msgstr "Journaliser les commandes de push"
 #: rhodecode/templates/admin/settings/settings.html:156
 msgid "Log user pull commands"
 msgstr "Journaliser les commandes de pull"
 #: rhodecode/templates/admin/settings/settings.html:160
 msgid "advanced setup"
 msgstr "Avancé"
 #: rhodecode/templates/admin/settings/settings.html:165
 msgid "Repositories location"
 msgstr "Emplacement des dépôts"
 #: rhodecode/templates/admin/settings/settings.html:170
 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:171
 msgid "unlock"
 msgstr "Déverrouiller"
 #: rhodecode/templates/admin/settings/settings.html:191
 msgid "Test Email"
 msgstr "E-mail de test"
 #: rhodecode/templates/admin/settings/settings.html:199
 msgid "Email to"
 msgstr "Envoyer l’e-mail à"
 #: rhodecode/templates/admin/settings/settings.html:207
 msgid "Send"
 msgstr "Envoyer"
 #: rhodecode/templates/admin/settings/settings.html:213
 msgid "System Info and Packages"
 msgstr "Information système et paquets"
 #: rhodecode/templates/admin/settings/settings.html:216
 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
 #: rhodecode/templates/admin/users/users.html:9
 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_add.html:86
 #: rhodecode/templates/admin/users/user_edit.html:113
 #: 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/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
@@ @@ -2190,983 +2187,1045 @@ msgstr "AJOUTER" @@
 #: rhodecode/templates/tags/tags.html:40
 #: rhodecode/templates/tags/tags_data.html:9
 msgid "Revision"
 msgstr "Révision"
 #: rhodecode/templates/admin/users/user_edit_my_account.html:71
 #: rhodecode/templates/journal/journal.html:72
 msgid "private"
 msgstr "privé"
 #: rhodecode/templates/admin/users/user_edit_my_account.html:81
 #: rhodecode/templates/journal/journal.html:85
 msgid "No repositories yet"
 msgstr "Aucun dépôt pour le moment"
 #: rhodecode/templates/admin/users/user_edit_my_account.html:83
 #: rhodecode/templates/journal/journal.html:87
 msgid "create one now"
 msgstr "En créer un maintenant"
 #: rhodecode/templates/admin/users/user_edit_my_account.html:100
 #: rhodecode/templates/admin/users/user_edit_my_account.html:201
 msgid "Permission"
 msgstr "Permission"
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "Administration des utilisateurs"
 #: rhodecode/templates/admin/users/users.html:23
 msgid "ADD NEW USER"
 msgstr "NOUVEL UTILISATEUR"
 #: rhodecode/templates/admin/users/users.html:33
 msgid "username"
 msgstr "Nom d’utilisateur"
 #: rhodecode/templates/admin/users/users.html:34
 #: rhodecode/templates/branches/branches_data.html:6
 msgid "name"
 msgstr "Prénom"
 #: rhodecode/templates/admin/users/users.html:35
 msgid "lastname"
 msgstr "Nom de famille"
 #: rhodecode/templates/admin/users/users.html:36
 msgid "last login"
 msgstr "Dernière connexion"
 #: rhodecode/templates/admin/users/users.html:37
 #: rhodecode/templates/admin/users_groups/users_groups.html:34
 msgid "active"
 msgstr "Actif"
 #: rhodecode/templates/admin/users/users.html:39
 #: rhodecode/templates/base/base.html:223
 msgid "ldap"
 msgstr "LDAP"
 #: rhodecode/templates/admin/users/users.html:56
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?"
 #: 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:126
 msgid "Group members"
 msgstr "Membres du groupe"
 #: 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:122
 #: rhodecode/templates/base/base.html:289
 #: rhodecode/templates/base/base.html:291
 #: rhodecode/templates/base/base.html:293
 msgid "Home"
 msgstr "Accueil"
 #: rhodecode/templates/base/base.html:123
 #: rhodecode/templates/base/base.html:298
 #: rhodecode/templates/base/base.html:300
 #: rhodecode/templates/base/base.html:302
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:17
 #: 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
 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:9
 #: rhodecode/templates/data_table/_dt_elements.html:11
 #: rhodecode/templates/data_table/_dt_elements.html:13
 #: rhodecode/templates/summary/summary.html:4
 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:6
 #: rhodecode/templates/changelog/changelog.html:15
 #: rhodecode/templates/data_table/_dt_elements.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
 #: rhodecode/templates/data_table/_dt_elements.html:21
 msgid "Changelog"
 msgstr "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:25
 #: rhodecode/templates/data_table/_dt_elements.html:27
 #: rhodecode/templates/data_table/_dt_elements.html:29
 #: rhodecode/templates/files/files.html:4
 #: rhodecode/templates/files/files.html:40
 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
 #: rhodecode/templates/base/base.html:224
 msgid "settings"
 msgstr "Réglages"
 #: rhodecode/templates/base/base.html:209
 #: rhodecode/templates/data_table/_dt_elements.html:74
 #: rhodecode/templates/forks/fork.html:13
 msgid "fork"
 msgstr "Fork"
 #: rhodecode/templates/base/base.html:210
 msgid "search"
 msgstr "Rechercher"
 #: rhodecode/templates/base/base.html:217
 msgid "journal"
 msgstr "Journal"
 #: rhodecode/templates/base/base.html:219
 msgid "repositories groups"
 msgstr "Groupes de dépôts"
 #: rhodecode/templates/base/base.html:220
 msgid "users"
 msgstr "Utilisateurs"
 #: rhodecode/templates/base/base.html:221
 msgid "users groups"
 msgstr "Groupes d’utilisateurs"
 #: rhodecode/templates/base/base.html:222
 msgid "permissions"
 msgstr "Permissions"
 #: rhodecode/templates/base/base.html:235
 #: rhodecode/templates/base/base.html:237
 #: rhodecode/templates/followers/followers.html:5
 msgid "Followers"
 msgstr "Followers"
 #: rhodecode/templates/base/base.html:243
 #: rhodecode/templates/base/base.html:245
 #: rhodecode/templates/forks/forks.html:5
 msgid "Forks"
 msgstr "Forks"
 #: rhodecode/templates/base/base.html:316
 #: rhodecode/templates/base/base.html:318
 #: rhodecode/templates/base/base.html:320
 #: rhodecode/templates/search/search.html:4
 #: rhodecode/templates/search/search.html:24
 #: rhodecode/templates/search/search.html:46
 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:111
 #: rhodecode/templates/summary/summary.html:52
 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:56
 msgid "Start following this repository"
 msgstr "Suivre ce dépôt"
 #: rhodecode/templates/base/root.html:45
 msgid "Group"
 msgstr "Groupe"
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 msgid "Bookmarks"
 msgstr "Signets"
 #, 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:39
 #: rhodecode/templates/tags/tags.html:39
 #: 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_data.html:7
 msgid "date"
 msgstr "Date"
 #: rhodecode/templates/branches/branches_data.html:8
 #: rhodecode/templates/shortlog/shortlog_data.html:8
 msgid "author"
 msgstr "Auteur"
 #: rhodecode/templates/branches/branches_data.html:9
 #: rhodecode/templates/shortlog/shortlog_data.html:5
 msgid "revision"
 msgstr "Révision"
 #: 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:38
 msgid "Show"
 msgstr "Afficher"
 #: rhodecode/templates/changelog/changelog.html:64
 #: rhodecode/templates/summary/summary.html:352
 msgid "show more"
 msgstr "montrer plus"
 #: rhodecode/templates/changelog/changelog.html:68
 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:82
 #: rhodecode/templates/changeset/changeset.html:72
 msgid "Parent"
 msgstr "Parent"
 #: rhodecode/templates/changelog/changelog.html:88
 #: rhodecode/templates/changeset/changeset.html:78
 msgid "No parents"
 msgstr "Aucun parent"
 #: rhodecode/templates/changelog/changelog.html:93
 #: rhodecode/templates/changeset/changeset.html:82
 msgid "merge"
 msgstr "Fusion"
 #: rhodecode/templates/changelog/changelog.html:96
 #: rhodecode/templates/changeset/changeset.html:85
 #: 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:102
 msgid "bookmark"
 msgstr "Signet"
 #: rhodecode/templates/changelog/changelog.html:108
 #: rhodecode/templates/changeset/changeset.html:90
 msgid "tag"
 msgstr "Tag"
 #: rhodecode/templates/changelog/changelog.html:144
 msgid "Show selected changes __S -> __E"
 msgstr "Afficher les changements sélections de __S à __E"
 #: rhodecode/templates/changelog/changelog.html:235
 msgid "There are no changes yet"
 msgstr "Il n’y a aucun changement pour le moment"
 #: rhodecode/templates/changelog/changelog_details.html:2
 #: rhodecode/templates/changeset/changeset.html:60
 msgid "removed"
 msgstr "Supprimés"
 #: rhodecode/templates/changelog/changelog_details.html:3
 #: rhodecode/templates/changeset/changeset.html:61
 msgid "changed"
 msgstr "Modifiés"
 #: rhodecode/templates/changelog/changelog_details.html:4
 #: rhodecode/templates/changeset/changeset.html:62
 msgid "added"
 msgstr "Ajoutés"
 #: rhodecode/templates/changelog/changelog_details.html:6
 #: rhodecode/templates/changelog/changelog_details.html:7
 #: rhodecode/templates/changelog/changelog_details.html:8
 #: rhodecode/templates/changeset/changeset.html:64
 #: rhodecode/templates/changeset/changeset.html:65
 #: rhodecode/templates/changeset/changeset.html:66
 #, 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:37
 #: rhodecode/templates/changeset/diff_block.html:20
 msgid "raw diff"
 msgstr "Diff brut"
 #: rhodecode/templates/changeset/changeset.html:38
 #: rhodecode/templates/changeset/diff_block.html:21
 msgid "download diff"
 msgstr "Télécharger le diff"
 #: rhodecode/templates/changeset/changeset.html:42
 #: rhodecode/templates/changeset/changeset_file_comment.html:71
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d commentaire"
 msgstr[1] "%d commentaires"
 #: rhodecode/templates/changeset/changeset.html:42
 #: rhodecode/templates/changeset/changeset_file_comment.html:71
 #, 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:97
 #, python-format
 msgid "%s files affected with %s insertions and %s deletions:"
 msgstr "%s fichiers affectés avec %s insertions et %s suppressions :"
 #: rhodecode/templates/changeset/changeset.html:113
 msgid "Changeset was too big and was cut off..."
 msgstr "Cet ensemble de changements était trop important et a été découpé…"
 #: rhodecode/templates/changeset/changeset_file_comment.html:35
 msgid "Submitting..."
 msgstr "Envoi…"
 #: rhodecode/templates/changeset/changeset_file_comment.html:38
 msgid "Commenting on line {1}."
 msgstr "Commentaire sur la ligne {1}."
 #: rhodecode/templates/changeset/changeset_file_comment.html:39
 #: rhodecode/templates/changeset/changeset_file_comment.html:102
 #, 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:41
 #: rhodecode/templates/changeset/changeset_file_comment.html:104
 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:49
 #: rhodecode/templates/changeset/changeset_file_comment.html:110
 msgid "Comment"
 msgstr "Commentaire"
 #: rhodecode/templates/changeset/changeset_file_comment.html:50
 #: rhodecode/templates/changeset/changeset_file_comment.html:61
 msgid "Hide"
 msgstr "Masquer"
 #: rhodecode/templates/changeset/changeset_file_comment.html:57
 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:57
 msgid "Login now"
 msgstr "Se connecter maintenant"
 #: rhodecode/templates/changeset/changeset_file_comment.html:99
 msgid "Leave a comment"
 msgstr "Laisser un commentaire"
 #: rhodecode/templates/changeset/changeset_range.html:5
 #, python-format
 msgid "%s Changesets"
 msgstr "Changesets de %s"
 #: rhodecode/templates/changeset/changeset_range.html:29
 msgid "Compare View"
 msgstr "Comparaison"
 #: rhodecode/templates/changeset/changeset_range.html:49
 msgid "Files affected"
 msgstr "Fichiers affectés"
 #: rhodecode/templates/changeset/diff_block.html:19
 msgid "diff"
 msgstr "Diff"
 #: rhodecode/templates/changeset/diff_block.html:27
 msgid "show inline comments"
 msgstr "Afficher les commentaires"
 #: rhodecode/templates/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
 #: rhodecode/templates/data_table/_dt_elements.html:37
 #: rhodecode/templates/forks/fork.html:5
 msgid "Fork"
 msgstr "Fork"
 #: rhodecode/templates/data_table/_dt_elements.html:54
 #: rhodecode/templates/journal/journal.html:117
 #: rhodecode/templates/summary/summary.html:63
 msgid "Mercurial repository"
 msgstr "Dépôt Mercurial"
 #: rhodecode/templates/data_table/_dt_elements.html:56
 #: rhodecode/templates/journal/journal.html:119
 #: rhodecode/templates/summary/summary.html:66
 msgid "Git repository"
 msgstr "Dépôt Git"
 #: rhodecode/templates/data_table/_dt_elements.html:63
 #: rhodecode/templates/journal/journal.html:125
 #: rhodecode/templates/summary/summary.html:73
 msgid "public repository"
 msgstr "Dépôt public"
 #: rhodecode/templates/data_table/_dt_elements.html:74
 #: rhodecode/templates/summary/summary.html:82
 #: rhodecode/templates/summary/summary.html:83
 msgid "Fork of"
 msgstr "Fork de"
 #: rhodecode/templates/data_table/_dt_elements.html:86
 msgid "No changesets yet"
 msgstr "Dépôt vide"
 #: rhodecode/templates/email_templates/main.html:8
 msgid "This is an notification from RhodeCode."
 msgstr "Ceci est une notification de RhodeCode."
 #: rhodecode/templates/errors/error_document.html:44
 #, 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
 #, python-format
 msgid "%s Files"
 msgstr "Fichiers de %s"
 #: rhodecode/templates/files/files.html:12
 #: rhodecode/templates/summary/summary.html:328
 msgid "files"
 msgstr "Fichiers"
 #: rhodecode/templates/files/files.html:44
 msgid "search truncated"
 msgstr "Résultats tronqués"
 #: rhodecode/templates/files/files.html:45
 msgid "no matching files"
 msgstr "Aucun fichier ne correspond"
 #: rhodecode/templates/files/files_add.html:4
 #: rhodecode/templates/files/files_edit.html:4
 msgid "Edit file"
 msgstr "Éditer un fichier"
 #, 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:65
 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:26
 msgid "show annotation"
 msgstr "Afficher les annotations"
 #: rhodecode/templates/files/files_edit.html:50
 #: rhodecode/templates/files/files_source.html:28
 #: rhodecode/templates/files/files_source.html:56
 msgid "show as raw"
 msgstr "montrer le fichier brut"
 #: rhodecode/templates/files/files_edit.html:51
 #: rhodecode/templates/files/files_source.html:29
 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_source.html:2
 msgid "History"
 msgstr "Historique"
 #: rhodecode/templates/files/files_source.html:24
 msgid "show source"
 msgstr "montrer les sources"
 #: rhodecode/templates/files/files_source.html:47
 #, python-format
 msgid "Binary file (%s)"
 msgstr "Fichier binaire (%s)"
 #: rhodecode/templates/files/files_source.html:56
 msgid "File is too big to display"
 msgstr "Ce fichier est trop gros pour être affiché."
 #: rhodecode/templates/files/files_source.html:112
 msgid "Selection link"
 msgstr "Lien vers la sélection"
 #: 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 "Date de début"
 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:57
 msgid "Private"
 msgstr "Privé"
 #: rhodecode/templates/forks/fork.html:65
 msgid "Copy permissions"
 msgstr "Copier les permissions"
 #: rhodecode/templates/forks/fork.html:73
 msgid "Update after clone"
 msgstr "MÀJ après le clonage"
 #: rhodecode/templates/forks/fork.html:80
 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:34
 msgid "There are no forks yet"
 msgstr "Il n’y a pas encore de forks."
 #: rhodecode/templates/journal/journal.html:20
 msgid "Refresh"
 msgstr "Rafraîchir"
 #: rhodecode/templates/journal/journal.html:32
 msgid "Watched"
 msgstr "Surveillé"
 #: rhodecode/templates/journal/journal.html:105
 msgid "following user"
 msgstr "utilisateur suivant"
 #: rhodecode/templates/journal/journal.html:105
 msgid "user"
 msgstr "utilisateur"
 #: rhodecode/templates/journal/journal.html:138
 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:47
 msgid "No entries yet"
 msgstr "Aucune entrée pour le moment"
 #: rhodecode/templates/journal/public_journal.html:17
 msgid "Public Journal"
 msgstr "Journal public"
 #: rhodecode/templates/search/search.html:7
 #: rhodecode/templates/search/search.html:26
 msgid "in repository: "
 msgstr "dans le dépôt :"
 #: rhodecode/templates/search/search.html:9
 #: rhodecode/templates/search/search.html:28
 msgid "in all repositories"
 msgstr "dans tous les dépôts"
 #: rhodecode/templates/search/search.html:42
 msgid "Search term"
 msgstr "Termes de la recherches"
 #: rhodecode/templates/search/search.html:54
 msgid "Search in"
 msgstr "Rechercher dans"
 #: rhodecode/templates/search/search.html:57
 msgid "File contents"
 msgstr "Le contenu des fichiers"
 #: rhodecode/templates/search/search.html:59
 msgid "File names"
 msgstr "Les noms de fichiers"
 #: 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/shortlog/shortlog.html:5
 #: rhodecode/templates/summary/summary.html:209
 msgid "Shortlog"
 msgstr "Résumé des changements"
 #, python-format
 msgid "%s Shortlog"
 msgstr "Résumé de %s"
 #: rhodecode/templates/shortlog/shortlog.html:14
 msgid "shortlog"
 msgstr "Résumé"
 #: rhodecode/templates/shortlog/shortlog_data.html:7
 msgid "age"
 msgstr "Âge"
 #: rhodecode/templates/shortlog/shortlog_data.html:18
 msgid "No commit message"
 msgstr "Pas de message de commit"
 #: rhodecode/templates/shortlog/shortlog_data.html:62
 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:71
 msgid "Push new repo"
 msgstr "Pusher le nouveau dépôt"
 #: rhodecode/templates/shortlog/shortlog_data.html:79
 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:44
 #: rhodecode/templates/summary/summary.html:47
 msgid "ATOM"
 msgstr "ATOM"
 #: rhodecode/templates/summary/summary.html:77
 #, python-format
 msgid "Non changable ID %s"
 msgstr "Identifiant permanent : %s"
 #: rhodecode/templates/summary/summary.html:82
 msgid "public"
 msgstr "publique"
 #: rhodecode/templates/summary/summary.html:90
 msgid "remote clone"
 msgstr "Clone distant"
 #: rhodecode/templates/summary/summary.html:121
 msgid "Clone url"
 msgstr "URL de clone"
 #: rhodecode/templates/summary/summary.html:124
 msgid "Show by Name"
 msgstr "Afficher par nom"
 #: rhodecode/templates/summary/summary.html:125
 msgid "Show by ID"
 msgstr "Afficher par ID"
 #: rhodecode/templates/summary/summary.html:133
 msgid "Trending files"
 msgstr "Populaires"
 #: rhodecode/templates/summary/summary.html:141
 #: rhodecode/templates/summary/summary.html:157
 #: rhodecode/templates/summary/summary.html:185
 msgid "enable"
 msgstr "Activer"
 #: rhodecode/templates/summary/summary.html:149
 msgid "Download"
 msgstr "Téléchargements"
 #: rhodecode/templates/summary/summary.html:153
 msgid "There are no downloads yet"
 msgstr "Il n’y a pas encore de téléchargements proposés."
 #: rhodecode/templates/summary/summary.html:155
 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:161
 msgid "Download as zip"
 msgstr "Télécharger en ZIP"
 #: rhodecode/templates/summary/summary.html:164
 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:164
 msgid "with subrepos"
 msgstr "avec les sous-dépôts"
 #: rhodecode/templates/summary/summary.html:177
 msgid "Commit activity by day / author"
 msgstr "Activité de commit par jour et par auteur"
 #: rhodecode/templates/summary/summary.html:188
 msgid "Stats gathered: "
 msgstr "Statistiques obtenues :"
 #: rhodecode/templates/summary/summary.html:209
 msgid "Shortlog"
 msgstr "Résumé des changements"
 #: rhodecode/templates/summary/summary.html:211
 msgid "Quick start"
 msgstr "Démarrage rapide"
 #: rhodecode/templates/summary/summary.html:281
 #, python-format
 msgid "Download %s as %s"
 msgstr "Télécharger %s comme archive %s"
 #: rhodecode/templates/summary/summary.html:638
 msgid "commits"
 msgstr "commits"
 #: rhodecode/templates/summary/summary.html:639
 msgid "files added"
 msgstr "fichiers ajoutés"
 #: rhodecode/templates/summary/summary.html:640
 msgid "files changed"
 msgstr "fichiers modifiés"
 #: rhodecode/templates/summary/summary.html:641
 msgid "files removed"
 msgstr "fichiers supprimés"
 #: rhodecode/templates/summary/summary.html:644
 msgid "commit"
 msgstr "commit"
 #: rhodecode/templates/summary/summary.html:645
 msgid "file added"
 msgstr "fichier ajouté"
 #: rhodecode/templates/summary/summary.html:646
 msgid "file changed"
 msgstr "fichié modifié"
 #: rhodecode/templates/summary/summary.html:647
 msgid "file removed"
 msgstr "fichier supprimé"
 #: rhodecode/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr "Tags de %s"

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)