Merged dev into stable/default/master branch

.tx/config

@@ -0,0 +1,15 b''
+[main]
+host = https://www.transifex.com
+
+[RhodeCode.pot]
+source_file = rhodecode/i18n/rhodecode.pot
+source_lang = en
+
+trans.pl    = rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po
+trans.ru    = rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po
+trans.fr    = rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po
+trans.ja    = rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po
+trans.pt_BR = rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po
+trans.zh_CN = rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po
+trans.zh_TW = rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po
+type = PO

rhodecode/bin/base.py

@@ -0,0 +1,145 b''
+"""
+Base utils for shell scripts
+"""
+import os
+import sys
+import random
+import urllib2
+import pprint
+
+try:
+    from rhodecode.lib.ext_json import json
+except ImportError:
+    try:
+        import simplejson as json
+    except ImportError:
+        import json
+
+CONFIG_NAME = '.rhodecode'
+FORMAT_PRETTY = 'pretty'
+FORMAT_JSON = 'json'
+
+
+def api_call(apikey, apihost, method=None, **kw):
+    """
+    Api_call wrapper for RhodeCode.
+
+    :param apikey:
+    :param apihost:
+    :param format: formatting, pretty means prints and pprint of json
+     json returns unparsed json
+    :param method:
+    :returns: json response from server
+    """
+    def _build_data(random_id):
+        """
+        Builds API data with given random ID
+
+        :param random_id:
+        """
+        return {
+            "id": random_id,
+            "api_key": apikey,
+            "method": method,
+            "args": kw
+        }
+
+    if not method:
+        raise Exception('please specify method name !')
+
+    id_ = random.randrange(1, 9999)
+    req = urllib2.Request('%s/_admin/api' % apihost,
+                      data=json.dumps(_build_data(id_)),
+                      headers={'content-type': 'text/plain'})
+    ret = urllib2.urlopen(req)
+    raw_json = ret.read()
+    json_data = json.loads(raw_json)
+    id_ret = json_data['id']
+    if id_ret == id_:
+        return json_data
+
+    else:
+        _formatted_json = pprint.pformat(json_data)
+        raise Exception('something went wrong. '
+                        'ID mismatch got %s, expected %s | %s' % (
+                                            id_ret, id_, _formatted_json))
+
+
+class RcConf(object):
+    """
+    RhodeCode config for API
+
+    conf = RcConf()
+    conf['key']
+
+    """
+
+    def __init__(self, config_location=None, autoload=True, autocreate=False,
+                 config=None):
+        HOME = os.getenv('HOME', os.getenv('USERPROFILE')) or ''
+        HOME_CONF = os.path.abspath(os.path.join(HOME, CONFIG_NAME))
+        self._conf_name = HOME_CONF if not config_location else config_location
+        self._conf = {}
+        if autocreate:
+            self.make_config(config)
+        if autoload:
+            self._conf = self.load_config()
+
+    def __getitem__(self, key):
+        return self._conf[key]
+
+    def __nonzero__(self):
+        if self._conf:
+            return True
+        return False
+
+    def __eq__(self):
+        return self._conf.__eq__()
+
+    def __repr__(self):
+        return 'RcConf<%s>' % self._conf.__repr__()
+
+    def make_config(self, config):
+        """
+        Saves given config as a JSON dump in the _conf_name location
+
+        :param config:
+        """
+        update = False
+        if os.path.exists(self._conf_name):
+            update = True
+        with open(self._conf_name, 'wb') as f:
+            json.dump(config, f, indent=4)
+
+        if update:
+            sys.stdout.write('Updated config in %s\n' % self._conf_name)
+        else:
+            sys.stdout.write('Created new config in %s\n' % self._conf_name)
+
+    def update_config(self, new_config):
+        """
+        Reads the JSON config updates it's values with new_config and
+        saves it back as JSON dump
+
+        :param new_config:
+        """
+        config = {}
+        try:
+            with open(self._conf_name, 'rb') as conf:
+                config = json.load(conf)
+        except IOError, e:
+            sys.stderr.write(str(e) + '\n')
+
+        config.update(new_config)
+        self.make_config(config)
+
+    def load_config(self):
+        """
+        Loads config from file and returns loaded JSON object
+        """
+        try:
+            with open(self._conf_name, 'rb') as conf:
+                return  json.load(conf)
+        except IOError, e:
+            #sys.stderr.write(str(e) + '\n')
+            pass

rhodecode/bin/rhodecode_gist.py

@@ -0,0 +1,171 b''
+# -*- coding: utf-8 -*-
+"""
+    rhodecode.bin.gist
+    ~~~~~~~~~~~~~~~~~~
+
+    Gist CLI client for RhodeCode
+
+    :created_on: May 9, 2013
+    :author: marcink
+    :copyright: (C) 2010-2013 Marcin Kuzminski <[e-mail]>
+    :license: GPLv3, see COPYING for more details.
+"""
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import with_statement
+import os
+import sys
+import stat
+import argparse
+import fileinput
+
+from rhodecode.bin.base import json, api_call, RcConf, FORMAT_JSON, FORMAT_PRETTY
+
+
+def argparser(argv):
+    usage = (
+      "rhodecode-gist [-h] [--format=FORMAT] [--apikey=APIKEY] [--apihost=APIHOST] "
+      "[--config=CONFIG] [--save-config] [GIST OPTIONS] "
+      "[filename or stdin use - for terminal stdin ]\n"
+      "Create config file: rhodecode-gist --apikey=<key> --apihost=http://rhodecode.server --save-config"
+    )
+
+    parser = argparse.ArgumentParser(description='RhodeCode Gist cli',
+                                     usage=usage)
+
+    ## config
+    group = parser.add_argument_group('config')
+    group.add_argument('--apikey', help='api access key')
+    group.add_argument('--apihost', help='api host')
+    group.add_argument('--config', help='config file path DEFAULT: ~/.rhodecode')
+    group.add_argument('--save-config', action='store_true',
+                       help='save the given config into a file')
+
+    group = parser.add_argument_group('GIST')
+    group.add_argument('-p', '--private', action='store_true',
+                       help='create private Gist')
+    group.add_argument('-f', '--filename',
+                       help='set uploaded gist filename, '
+                            'also defines syntax highlighting')
+    group.add_argument('-d', '--description', help='Gist description')
+    group.add_argument('-l', '--lifetime', metavar='MINUTES',
+                       help='gist lifetime in minutes, -1 (DEFAULT) is forever')
+    group.add_argument('--format', dest='format', type=str,
+                       help='output format DEFAULT: `%s` can '
+                       'be also `%s`' % (FORMAT_PRETTY, FORMAT_JSON),
+            default=FORMAT_PRETTY
+    )
+    args, other = parser.parse_known_args()
+    return parser, args, other
+
+
+def _run(argv):
+    conf = None
+    parser, args, other = argparser(argv)
+
+    api_credentials_given = (args.apikey and args.apihost)
+    if args.save_config:
+        if not api_credentials_given:
+            raise parser.error('--save-config requires --apikey and --apihost')
+        conf = RcConf(config_location=args.config,
+                      autocreate=True, config={'apikey': args.apikey,
+                                               'apihost': args.apihost})
+        sys.exit()
+
+    if not conf:
+        conf = RcConf(config_location=args.config, autoload=True)
+        if not conf:
+            if not api_credentials_given:
+                parser.error('Could not find config file and missing '
+                             '--apikey or --apihost in params')
+
+    apikey = args.apikey or conf['apikey']
+    host = args.apihost or conf['apihost']
+    DEFAULT_FILENAME = 'gistfile1.txt'
+    if other:
+        # skip multifiles for now
+        filename = other[0]
+        if filename == '-':
+            filename = DEFAULT_FILENAME
+            gist_content = ''
+            for line in fileinput.input('-'):
+                gist_content += line
+        else:
+            with open(filename, 'rb') as f:
+                gist_content = f.read()
+
+    else:
+        filename = DEFAULT_FILENAME
+        gist_content = None
+        # little bit hacky but cross platform check where the
+        # stdin comes from we skip the terminal case it can be handled by '-'
+        mode = os.fstat(0).st_mode
+        if stat.S_ISFIFO(mode):
+            # "stdin is piped"
+            gist_content = sys.stdin.read()
+        elif stat.S_ISREG(mode):
+            # "stdin is redirected"
+            gist_content = sys.stdin.read()
+        else:
+            # "stdin is terminal"
+            pass
+
+    # make sure we don't upload binary stuff
+    if gist_content and '\0' in gist_content:
+        raise Exception('Error: binary files upload is not possible')
+
+    filename = os.path.basename(args.filename or filename)
+    if gist_content:
+        files = {
+            filename: {
+                'content': gist_content,
+                'lexer': None
+            }
+        }
+
+        margs = dict(
+            lifetime=args.lifetime,
+            description=args.description,
+            gist_type='private' if args.private else 'public',
+            files=files
+        )
+
+        json_data = api_call(apikey, host, 'create_gist', **margs)['result']
+        if args.format == FORMAT_JSON:
+            print json.dumps(json_data)
+        elif args.format == FORMAT_PRETTY:
+            print json_data
+            print 'Created %s gist %s' % (json_data['gist']['type'],
+                                          json_data['gist']['url'])
+    return 0
+
+
+def main(argv=None):
+    """
+    Main execution function for cli
+
+    :param argv:
+    """
+    if argv is None:
+        argv = sys.argv
+
+    try:
+        return _run(argv)
+    except Exception, e:
+        print e
+        return 1
+
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))

rhodecode/controllers/admin/gists.py

@@ -0,0 +1,198 b''
+# -*- coding: utf-8 -*-
+"""
+    rhodecode.controllers.admin.gist
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    gist controller for RhodeCode
+
+    :created_on: May 9, 2013
+    :author: marcink
+    :copyright: (C) 2010-2013 Marcin Kuzminski <[e-mail]>
+    :license: GPLv3, see COPYING for more details.
+"""
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+import time
+import logging
+import traceback
+import formencode
+from formencode import htmlfill
+
+from pylons import request, response, tmpl_context as c, url
+from pylons.controllers.util import abort, redirect
+from pylons.i18n.translation import _
+
+from rhodecode.model.forms import GistForm
+from rhodecode.model.gist import GistModel
+from rhodecode.model.meta import Session
+from rhodecode.model.db import Gist
+from rhodecode.lib import helpers as h
+from rhodecode.lib.base import BaseController, render
+from rhodecode.lib.auth import LoginRequired, NotAnonymous
+from rhodecode.lib.utils2 import safe_str, safe_int, time_to_datetime
+from rhodecode.lib.helpers import Page
+from webob.exc import HTTPNotFound, HTTPForbidden
+from sqlalchemy.sql.expression import or_
+from rhodecode.lib.vcs.exceptions import VCSError
+
+log = logging.getLogger(__name__)
+
+
+class GistsController(BaseController):
+    """REST Controller styled on the Atom Publishing Protocol"""
+
+    def __load_defaults(self):
+        c.lifetime_values = [
+            (str(-1), _('forever')),
+            (str(5), _('5 minutes')),
+            (str(60), _('1 hour')),
+            (str(60 * 24), _('1 day')),
+            (str(60 * 24 * 30), _('1 month')),
+        ]
+        c.lifetime_options = [(c.lifetime_values, _("Lifetime"))]
+
+    @LoginRequired()
+    def index(self, format='html'):
+        """GET /admin/gists: All items in the collection"""
+        # url('gists')
+        c.show_private = request.GET.get('private') and c.rhodecode_user.username != 'default'
+        c.show_public = request.GET.get('public') and c.rhodecode_user.username != 'default'
+
+        gists = Gist().query()\
+            .filter(or_(Gist.gist_expires == -1, Gist.gist_expires >= time.time()))\
+            .order_by(Gist.created_on.desc())
+        if c.show_private:
+            c.gists = gists.filter(Gist.gist_type == Gist.GIST_PRIVATE)\
+                             .filter(Gist.gist_owner == c.rhodecode_user.user_id)
+        elif c.show_public:
+            c.gists = gists.filter(Gist.gist_type == Gist.GIST_PUBLIC)\
+                             .filter(Gist.gist_owner == c.rhodecode_user.user_id)
+
+        else:
+            c.gists = gists.filter(Gist.gist_type == Gist.GIST_PUBLIC)
+        p = safe_int(request.GET.get('page', 1), 1)
+        c.gists_pager = Page(c.gists, page=p, items_per_page=10)
+        return render('admin/gists/index.html')
+
+    @LoginRequired()
+    @NotAnonymous()
+    def create(self):
+        """POST /admin/gists: Create a new item"""
+        # url('gists')
+        self.__load_defaults()
+        gist_form = GistForm([x[0] for x in c.lifetime_values])()
+        try:
+            form_result = gist_form.to_python(dict(request.POST))
+            #TODO: multiple files support, from the form
+            nodes = {
+                form_result['filename'] or 'gistfile1.txt': {
+                    'content': form_result['content'],
+                    'lexer': None  # autodetect
+                }
+            }
+            _public = form_result['public']
+            gist_type = Gist.GIST_PUBLIC if _public else Gist.GIST_PRIVATE
+            gist = GistModel().create(
+                description=form_result['description'],
+                owner=c.rhodecode_user,
+                gist_mapping=nodes,
+                gist_type=gist_type,
+                lifetime=form_result['lifetime']
+            )
+            Session().commit()
+            new_gist_id = gist.gist_access_id
+        except formencode.Invalid, errors:
+            defaults = errors.value
+
+            return formencode.htmlfill.render(
+                render('admin/gists/new.html'),
+                defaults=defaults,
+                errors=errors.error_dict or {},
+                prefix_error=False,
+                encoding="UTF-8"
+            )
+
+        except Exception, e:
+            log.error(traceback.format_exc())
+            h.flash(_('Error occurred during gist creation'), category='error')
+            return redirect(url('new_gist'))
+        return redirect(url('gist', gist_id=new_gist_id))
+
+    @LoginRequired()
+    @NotAnonymous()
+    def new(self, format='html'):
+        """GET /admin/gists/new: Form to create a new item"""
+        # url('new_gist')
+        self.__load_defaults()
+        return render('admin/gists/new.html')
+
+    @LoginRequired()
+    @NotAnonymous()
+    def update(self, gist_id):
+        """PUT /admin/gists/gist_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('gist', gist_id=ID),
+        #           method='put')
+        # url('gist', gist_id=ID)
+
+    @LoginRequired()
+    @NotAnonymous()
+    def delete(self, gist_id):
+        """DELETE /admin/gists/gist_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('gist', gist_id=ID),
+        #           method='delete')
+        # url('gist', gist_id=ID)
+        gist = GistModel().get_gist(gist_id)
+        owner = gist.gist_owner == c.rhodecode_user.user_id
+        if h.HasPermissionAny('hg.admin')() or owner:
+            GistModel().delete(gist)
+            Session().commit()
+            h.flash(_('Deleted gist %s') % gist.gist_access_id, category='success')
+        else:
+            raise HTTPForbidden()
+
+        return redirect(url('gists'))
+
+    @LoginRequired()
+    def show(self, gist_id, format='html', revision='tip', f_path=None):
+        """GET /admin/gists/gist_id: Show a specific item"""
+        # url('gist', gist_id=ID)
+        c.gist = Gist.get_or_404(gist_id)
+
+        #check if this gist is not expired
+        if c.gist.gist_expires != -1:
+            if time.time() > c.gist.gist_expires:
+                log.error('Gist expired at %s' %
+                          (time_to_datetime(c.gist.gist_expires)))
+                raise HTTPNotFound()
+        try:
+            c.file_changeset, c.files = GistModel().get_gist_files(gist_id)
+        except VCSError:
+            log.error(traceback.format_exc())
+            raise HTTPNotFound()
+        if format == 'raw':
+            content = '\n\n'.join([f.content for f in c.files if (f_path is None or f.path == f_path)])
+            response.content_type = 'text/plain'
+            return content
+        return render('admin/gists/show.html')
+
+    @LoginRequired()
+    @NotAnonymous()
+    def edit(self, gist_id, format='html'):
+        """GET /admin/gists/gist_id/edit: Form to edit an existing item"""
+        # url('edit_gist', gist_id=ID)

.hgignore

@@ -12,6 +12,7 b' syntax: regexp'
 ^docs/build/
 ^docs/_build/
 ^data$
+^sql_dumps/
 ^\.settings$
 ^\.project$
 ^\.pydevproject$
@@ -22,3 +23,4 b' syntax: regexp'
 ^rc.*\.ini$
 ^fabfile.py
 ^\.rhodecode$
+^\.idea$

CONTRIBUTORS

@@ -34,3 +34,5 b' List of contributors to RhodeCode projec'
     Mads Kiilerich <[e-mail]>
     Dan Sheridan <[e-mail]>
     Dennis Brakhane <[e-mail]>
+    Simon Lopez <[e-mail]>
+

README.rst

@@ -74,10 +74,12 b' RhodeCode Features'
   Proven to work with 1000s of repositories and users
 - Supports http/https, LDAP, AD, proxy-pass authentication.
 - Full permissions (private/read/write/admin) together with IP restrictions for each repository,
-  additional explicit forking and repository creation permissions.
-- User groups for easier permission management
-- Repository groups let you group repos and manage them easier.
+  additional explicit forking, repositories group and repository creation permissions.
+- User groups for easier permission management.
+- Repository groups let you group repos and manage them easier. They come with
+  permission delegation features, so you can delegate groups management.
 - Users can fork other users repos, and compare them at any time.
+- Built in Gist functionality for sharing code snippets.
 - Integrates easily with other systems, with custom created mappers you can connect it to almost
   any issue tracker, and with an JSON-RPC API you can make much more
 - Build in commit-api let's you add, edit and commit files right from RhodeCode
@@ -118,7 +120,6 b' Incoming / Plans'
 - Simple issue tracker
 - SSH based authentication with server side key management
 - Commit based built in wiki system
-- Gist server
 - More statistics and graph (global annotation + some more statistics)
 - Other advancements as development continues (or you can of course make
   additions and or requests)

development.ini

@@ -29,24 +29,38 b' pdebug = false'
 #smtp_auth = 
 
 [server:main]
-## PASTE
-## nr of threads to spawn
+## PASTE ##
+#use = egg:Paste#http
+## nr of worker threads to spawn
 #threadpool_workers = 5
-
 ## max request before thread respawn
 #threadpool_max_requests = 10
-
 ## option to use threads of process
 #use_threadpool = true
 
-#use = egg:Paste#http
-
-## WAITRESS
+## WAITRESS ##
+use = egg:waitress#main
+## number of worker threads
 threads = 5
-## 100GB
+## MAX BODY SIZE 100GB
 max_request_body_size = 107374182400
-use = egg:waitress#main
+## use poll instead of select, fixes fd limits, may not work on old
+## windows systems.
+#asyncore_use_poll = True
 
+## GUNICORN ##
+#use = egg:gunicorn#main
+## number of process workers. You must set `instance_id = *` when this option
+## is set to more than one worker
+#workers = 1
+## process name
+#proc_name = rhodecode
+## type of worker class, one of sync, eventlet, gevent, tornado
+## recommended for bigger setup is using of of other than sync one
+#worker_class = sync
+#max_requests = 5
+
+## COMMON ##
 host = 0.0.0.0
 port = 5000
 
@@ -68,6 +82,10 b' lang = en'
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 
+## perform a full repository scan on each server start, this should be
+## set to false after first startup, to allow faster server restarts.
+initial_repo_scan = true
+
 ## uncomment and set this path to use archive download cache
 #archive_cache_dir = /tmp/tarballcache
 
@@ -89,9 +107,6 b' use_htsts = false'
 ## number of commits stats will parse on each iteration
 commit_parse_limit = 25
 
-## number of items displayed in lightweight dashboard before paginating is shown
-dashboard_items = 100
-
 ## use gravatar service to display avatars
 use_gravatar = true
 
@@ -111,6 +126,18 b' rss_include_diff = false'
 show_sha_length = 12
 show_revision_number = true
 
+## gist URL alias, used to create nicer urls for gist. This should be an
+## url that does rewrites to _admin/gists/<gistid>. 
+## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal
+## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/<gistid>
+gist_alias_url =
+
+## white list of API enabled controllers. This allows to add list of
+## controllers to which access will be enabled by api_key. eg: to enable
+## api access to raw_files put `FilesController:raw`, to enable access to patches
+## add `ChangesetController:changeset_patch`. This list should be "," separated
+## Syntax is <ControllerClass>:<function>. Check debug logs for generated names
+api_access_controllers_whitelist =
 
 ## alternative_gravatar_url allows you to use your own avatar server application
 ## the following parts of the URL will be replaced
@@ -186,6 +213,7 b' auth_ret_code ='
 ## codes don't break the transactions while 4XX codes do
 lock_ret_code = 423
 
+allow_repo_location_change = True
 
 ####################################
 ###        CELERY CONFIG        ####

docs/api/api.rst

@@ -16,9 +16,24 b' API ACCESS FOR WEB VIEWS'
 API access can also be turned on for each web view in RhodeCode that is
 decorated with `@LoginRequired` decorator. To enable API access simple change
 the standard login decorator to `@LoginRequired(api_access=True)`.
+
+To make this operation easier, starting from version 1.7.0 there's a white list
+of views that will have API access enabled. Simply edit `api_access_controllers_whitelist`
+option in your .ini file, and define views that should have API access enabled.
+Following example shows how to enable API access to patch/diff raw file and archive
+in RhodeCode::
+
+    api_access_controllers_whitelist =
+        ChangesetController:changeset_patch,
+        ChangesetController:changeset_raw,
+        FilesController:raw,
+        FilesController:archivefile
+
+
 After this change, a rhodecode view can be accessed without login by adding a
 GET parameter `?api_key=<api_key>` to url. By default this is only
-enabled on RSS/ATOM feed views.
+enabled on RSS/ATOM feed views. Exposing raw diffs is a good way to integrate with
+3rd party services like code review, or build farms that could download archives.
 
 
 API ACCESS
@@ -171,7 +186,7 b' INPUT::'
 OUTPUT::
 
     id : <id_given_in_input>
-    result : "Cache for repository `<reponame>` was invalidated: invalidated cache keys: <list_of_cache_keys>"
+    result : "Caches of repository `<reponame>`"
     error :  null
 
 lock
@@ -197,7 +212,13 b' INPUT::'
 OUTPUT::
 
     id : <id_given_in_input>
-    result : "User `<username>` set lock state for repo `<reponame>` to `true|false`"
+    result : {
+                 "repo": "<reponame>",
+                 "locked": "<bool true|false>",
+                 "locked_since": "<float lock_time>",
+                 "locked_by": "<username>",
+                 "msg": "User `<username>` set lock state for repo `<reponame>` to `<false|true>`"
+             }
     error :  null
 
 
@@ -302,6 +323,7 b' OUTPUT::'
     result: [
               {
                 "user_id" :     "<user_id>",
+                "api_key" :     "<api_key>",
                 "username" :    "<username>",
                 "firstname":    "<firstname>",
                 "lastname" :    "<lastname>",
@@ -333,7 +355,7 b' INPUT::'
     args :    {
                 "username" :  "<username>",
                 "email" :     "<useremail>",
-                "password" :  "<password>",
+                "password" :  "<password = Optional(None)>",
                 "firstname" : "<firstname> = Optional(None)",
                 "lastname" :  "<lastname> = Optional(None)",
                 "active" :    "<bool> = Optional(True)",
@@ -393,6 +415,7 b' OUTPUT::'
               "msg" : "updated user ID:<userid> <username>",
               "user": {
                 "user_id" :  "<user_id>",
+                "api_key" :  "<api_key>",
                 "username" : "<username>",
                 "firstname": "<firstname>",
                 "lastname" : "<lastname>",
@@ -461,6 +484,7 b' OUTPUT::'
                "members" :  [
                               {
                                 "user_id" :  "<user_id>",
+                                "api_key" :  "<api_key>",
                                 "username" : "<username>",
                                 "firstname": "<firstname>",
                                 "lastname" : "<lastname>",
@@ -518,8 +542,9 b' INPUT::'
     api_key : "<api_key>"
     method :  "create_users_group"
     args:     {
-                "group_name":  "<groupname>",
-                "active":"<bool> = Optional(True)"
+                "group_name": "<groupname>",
+                "owner" :     "<onwer_name_or_id = Optional(=apiuser)>",
+                "active":     "<bool> = Optional(True)"
               }
 
 OUTPUT::
@@ -642,6 +667,7 b' OUTPUT::'
                                   {
                                     "type":        "user",
                                     "user_id" :    "<user_id>",
+                                    "api_key" :    "<api_key>",
                                     "username" :   "<username>",
                                     "firstname":   "<firstname>",
                                     "lastname" :   "<lastname>",
@@ -667,6 +693,7 b' OUTPUT::'
                                   {
                                     "user_id" :     "<user_id>",
                                     "username" :    "<username>",
+                                    "api_key" :     "<api_key>",
                                     "firstname":    "<firstname>",
                                     "lastname" :    "<lastname>",
                                     "email" :       "<email>",

docs/changelog.rst

@@ -4,6 +4,45 b''
 Changelog
 =========
 
+1.7.0 (**2013-05-XX**)
+----------------------
+
+news
+++++
+
+- Manage User’s Groups(teams): create, delete, rename, add/remove users inside.
+  by delegated user group admins.
+- Implemented simple Gist functionality.
+- External authentication got special flag to controll user activation.
+- Created whitelist for API access. Each view can now be accessed by api_key
+  if added to whitelist.
+- Added dedicated file history page.
+- Added compare option into bookmarks
+- Improved diff display for binary files and renames.
+- Archive downloading are now stored in main action journal.
+- Switch gravatar to always use ssl.
+- Implements #842 RhodeCode version disclosure.
+- Allow underscore to be the optionally first character of username.
+
+fixes
++++++
+
+- #818: Bookmarks Do Not Display on Changeset View.
+- Fixed default permissions population during upgrades.
+- Fixed overwrite default user group permission flag.
+- Fixed issue with h.person() function returned prematurly giving only email
+  info from changeset metadata.
+- get_changeset uses now mercurial revrange to filter out branches.
+  Switch to branch it's around 20% faster this way.
+- Fixed some issues with paginators on chrome.
+- Forbid changing of repository type.
+- Adde missing permission checks in list of forks in repository settings.
+- Fixes #834 hooks error on remote pulling.
+- Fixes issues #849. Web Commits functionality failed for non-ascii files.
+- Fixed #850. Whoosh indexer should use the default revision when doing index.
+- Fixed #851 and #563 make-index crashes on non-ascii files.
+- Fixes #852, flash messages had issies with non-ascii messages
+
 1.6.0 (**2013-05-12**)
 ----------------------
 
@@ -20,7 +59,7 b' fixes'
   permissions when doing upgrades
 - Fixed some unicode problems with git file path
 - Fixed broken handling of adding an htsts headers.
-- Fixed redirection loop on changelog for empty repository 
+- Fixed redirection loop on changelog for empty repository
 - Fixed issue with web-editor that didn't preserve executable bit
   after editing files
 
@@ -29,7 +68,7 b' 1.6.0rc1 (**2013-04-07**)'
 
 news
 ++++
- 
+
  - Redesign UI, with lots of small improvements.
  - Group management delegation. Group admin can manage a group, and repos
    under it, admin can create child groups inside group he manages.
@@ -57,7 +96,7 b' news'
  - Linaro's ldap sync scripts.
  - #797 git refs filter is now configurable via .ini file.
  - New ishell paster command for easier administrative tasks.
- 
+
 fixes
 +++++
 
@@ -68,8 +107,8 b' fixes'
  - #731 update-repoinfo sometimes failed to update data when changesets were
    initial commits.
  - #749,#805 and #516 Removed duplication of repo settings for rhodecode admins
-   and repo admins. 
- - Global permission update with "overwrite existing settings" shouldn't 
+   and repo admins.
+ - Global permission update with "overwrite existing settings" shouldn't
    override private repositories.
  - #642 added recursion limit for stats gathering.
  - #739 Delete/Edit repositories should only point to admin links if the user
@@ -99,7 +138,7 b' fixes'
  - Automatically assign instance_id for host and process if it has been set to *
  - Fixed multiple IP addresses in each of extracted IP.
  - Lot of other small bug fixes and improvements.
-  
+
 1.5.4 (**2013-03-13**)
 ----------------------
 

docs/setup.rst

@@ -196,6 +196,13 b" Here's a typical ldap setup::"
  Last Name Attribute  = lastName
  E-mail Attribute     = mail
 
+If your user groups are placed in a Organisation Unit (OU) structure the Search Settings configuration differs::
+
+ Search settings
+ Base DN              = DC=host,DC=example,DC=org
+ LDAP Filter          = (&(memberOf=CN=your user group,OU=subunit,OU=unit,DC=host,DC=example,DC=org)(objectClass=user))
+ LDAP Search Scope    = SUBTREE
+
 .. _enable_ldap:
 
 Enable LDAP : required
@@ -444,11 +451,11 b' to define a regular expression that will'
 messages and replace that with an url to this issue. To enable this simply
 uncomment following variables in the ini file::
 
-    url_pat = (?:^#|\s#)(\w+)
+    issue_pat = (?:^#|\s#)(\w+)
     issue_server_link = https://myissueserver.com/{repo}/issue/{id}
     issue_prefix = #
 
-`url_pat` is the regular expression that will fetch issues from commit messages.
+`issue_pat` is the regular expression that will fetch issues from commit messages.
 Default regex will match issues in format of #<number> eg. #300.
 
 Matched issues will be replace with the link specified as `issue_server_link`
@@ -527,6 +534,27 b' Sample config for nginx using proxy::'
         #server 127.0.0.1:5002;
     }
 
+    ## gist alias
+    server {
+       listen          443;
+       server_name     gist.myserver.com;
+       access_log      /var/log/nginx/gist.access.log;
+       error_log       /var/log/nginx/gist.error.log;
+
+       ssl on;
+       ssl_certificate     gist.rhodecode.myserver.com.crt;
+       ssl_certificate_key gist.rhodecode.myserver.com.key;
+
+       ssl_session_timeout 5m;
+
+       ssl_protocols SSLv3 TLSv1;
+       ssl_ciphers DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:EDH-RSA-DES-CBC3-SHA:AES256-SHA:DES-CBC3-SHA:AES128-SHA:RC4-SHA:RC4-MD5;
+       ssl_prefer_server_ciphers on;
+
+       rewrite ^/(.+)$ https://rhodecode.myserver.com/_admin/gists/$1;
+       rewrite (.*)    https://rhodecode.myserver.com/_admin/gists;
+    }
+
     server {
        listen          443;
        server_name     rhodecode.myserver.com;
@@ -543,25 +571,16 b' Sample config for nginx using proxy::'
        ssl_ciphers DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:EDH-RSA-DES-CBC3-SHA:AES256-SHA:DES-CBC3-SHA:AES128-SHA:RC4-SHA:RC4-MD5;
        ssl_prefer_server_ciphers on;
 
-       # uncomment if you have nginx with chunking module compiled
-       # fixes the issues of having to put postBuffer data for large git
-       # pushes
-       #chunkin on;
-       #error_page 411 = @my_411_error;
-       #location @my_411_error {
-       #    chunkin_resume;
-       #}
-
-       # uncomment if you want to serve static files by nginx
+       ## uncomment root directive if you want to serve static files by nginx
+       ## requires static_files = false in .ini file
        #root /path/to/installation/rhodecode/public;
-
+       include         /etc/nginx/proxy.conf;
        location / {
             try_files $uri @rhode;
        }
 
        location @rhode {
             proxy_pass      http://rc;
-            include         /etc/nginx/proxy.conf;
        }
 
     }
@@ -576,25 +595,14 b' pushes or large pushes::'
     proxy_set_header            X-Real-IP $remote_addr;
     proxy_set_header            X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header            Proxy-host $proxy_host;
-    client_max_body_size        400m;
-    client_body_buffer_size     128k;
     proxy_buffering             off;
     proxy_connect_timeout       7200;
     proxy_send_timeout          7200;
     proxy_read_timeout          7200;
     proxy_buffers               8 32k;
-
-Also, when using root path with nginx you might set the static files to false
-in the production.ini file::
-
-    [app:main]
-      use = egg:rhodecode
-      full_stack = true
-      static_files = false
-      lang=en
-      cache_dir = %(here)s/data
-
-In order to not have the statics served by the application. This improves speed.
+    client_max_body_size        1024m;
+    client_body_buffer_size     128k;
+    large_client_header_buffers 8 64k;
 
 
 Apache virtual host reverse proxy example

docs/usage/general.rst

@@ -113,3 +113,54 b' might pass the url with stored credentia'
 using given credentials. Please take a note that they will be stored as
 plaintext inside the database. RhodeCode will remove auth info when showing the
 clone url in summary page.
+
+
+
+Visual settings in admin pannel
+-------------------------------
+
+
+Visualisation settings in RhodeCode settings view are extra customizations
+of server behavior. There are 3 main section in the settings.
+
+General
+~~~~~~~
+
+`Use repository extra fields` option allows to set a custom fields for each
+repository in the system. Each new field consists of 3 attributes `field key`,
+`field label`, `field description`. Example usage of such fields would be to
+define company specific information into repositories eg. defining repo_manager
+key that would add give info about a manager of each repository. There's no
+limit for adding custom fields. Newly created fields are accessible via API.
+
+`Show RhodeCode version` option toggles displaying exact RhodeCode version in
+the footer
+
+
+Dashboard items
+~~~~~~~~~~~~~~~
+
+Number if items in main page dashboard before pagination is displayed
+
+
+Icons
+~~~~~
+
+Show public repo icon / Show private repo icon on repositories - defines if
+public/private icons should be shown in the UI.
+
+
+Meta-Tagging
+~~~~~~~~~~~~
+
+With this option enabled, special metatags that are recognisible by RhodeCode
+will be turned into colored tags. Currently available tags are::
+
+    [featured]
+    [stale]
+    [dead]
+    [lang => lang]
+    [license => License]
+    [requires => Repo]
+    [recommends => Repo]
+    [see => URI]

production.ini

@@ -29,26 +29,40 b' pdebug = false'
 #smtp_auth = 
 
 [server:main]
-## PASTE
-## nr of threads to spawn
+## PASTE ##
+#use = egg:Paste#http
+## nr of worker threads to spawn
 #threadpool_workers = 5
-
 ## max request before thread respawn
 #threadpool_max_requests = 10
-
 ## option to use threads of process
 #use_threadpool = true
 
-#use = egg:Paste#http
-
-## WAITRESS
+## WAITRESS ##
+use = egg:waitress#main
+## number of worker threads
 threads = 5
-## 100GB
+## MAX BODY SIZE 100GB
 max_request_body_size = 107374182400
-use = egg:waitress#main
+## use poll instead of select, fixes fd limits, may not work on old
+## windows systems.
+#asyncore_use_poll = True
 
+## GUNICORN ##
+#use = egg:gunicorn#main
+## number of process workers. You must set `instance_id = *` when this option
+## is set to more than one worker
+#workers = 1
+## process name
+#proc_name = rhodecode
+## type of worker class, one of sync, eventlet, gevent, tornado
+## recommended for bigger setup is using of of other than sync one
+#worker_class = sync
+#max_requests = 5
+
+## COMMON ##
 host = 127.0.0.1
-port = 8001
+port = 5000
 
 ## prefix middleware for rc
 #[filter:proxy-prefix]
@@ -68,6 +82,10 b' lang = en'
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 
+## perform a full repository scan on each server start, this should be
+## set to false after first startup, to allow faster server restarts.
+initial_repo_scan = true
+
 ## uncomment and set this path to use archive download cache
 #archive_cache_dir = /tmp/tarballcache
 
@@ -89,9 +107,6 b' use_htsts = false'
 ## number of commits stats will parse on each iteration
 commit_parse_limit = 25
 
-## number of items displayed in lightweight dashboard before paginating is shown
-dashboard_items = 100
-
 ## use gravatar service to display avatars
 use_gravatar = true
 
@@ -111,6 +126,18 b' rss_include_diff = false'
 show_sha_length = 12
 show_revision_number = true
 
+## gist URL alias, used to create nicer urls for gist. This should be an
+## url that does rewrites to _admin/gists/<gistid>. 
+## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal
+## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/<gistid>
+gist_alias_url =
+
+## white list of API enabled controllers. This allows to add list of
+## controllers to which access will be enabled by api_key. eg: to enable
+## api access to raw_files put `FilesController:raw`, to enable access to patches
+## add `ChangesetController:changeset_patch`. This list should be "," separated
+## Syntax is <ControllerClass>:<function>. Check debug logs for generated names
+api_access_controllers_whitelist =
 
 ## alternative_gravatar_url allows you to use your own avatar server application
 ## the following parts of the URL will be replaced
@@ -186,6 +213,7 b' auth_ret_code ='
 ## codes don't break the transactions while 4XX codes do
 lock_ret_code = 423
 
+allow_repo_location_change = True
 
 ####################################
 ###        CELERY CONFIG        ####

rhodecode/__init__.py

@@ -26,32 +26,7 b''
 import sys
 import platform
 
-VERSION = (1, 6, 1)
-
-try:
-    from rhodecode.lib import get_current_revision
-    _rev = get_current_revision(quiet=True)
-    if _rev and len(VERSION) > 3:
-        VERSION += ('dev%s' % _rev[0],)
-except ImportError:
-    pass
-
-__version__ = ('.'.join((str(each) for each in VERSION[:3])) +
-               '.'.join(VERSION[3:]))
-__dbversion__ = 11  # defines current db version for migrations
-__platform__ = platform.system()
-__license__ = 'GPLv3'
-__py_version__ = sys.version_info
-__author__ = 'Marcin Kuzminski'
-__url__ = 'http://rhodecode.org'
-
-PLATFORM_WIN = ('Windows')
-PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD', 'OpenBSD', 'SunOS') #depracated
-
-is_windows = __platform__ in PLATFORM_WIN
-is_unix = not is_windows
-
-
+VERSION = (1, 7, 0)
 BACKENDS = {
     'hg': 'Mercurial repository',
     'git': 'Git repository',
@@ -65,3 +40,23 b' CONFIG = {}'
 
 # Linked module for extensions
 EXTENSIONS = {}
+
+try:
+    from rhodecode.lib import get_current_revision
+    _rev = get_current_revision(quiet=True)
+    if _rev and len(VERSION) > 3:
+        VERSION += ('%s' % _rev[0],)
+except ImportError:
+    pass
+
+__version__ = ('.'.join((str(each) for each in VERSION[:3])) +
+               '.'.join(VERSION[3:]))
+__dbversion__ = 13  # defines current db version for migrations
+__platform__ = platform.system()
+__license__ = 'GPLv3'
+__py_version__ = sys.version_info
+__author__ = 'Marcin Kuzminski'
+__url__ = 'http://rhodecode.org'
+
+is_windows = __platform__ in ['Windows']
+is_unix = not is_windows

rhodecode/bin/ldap_sync.py

@@ -14,7 +14,14 b''
 import ldap
 import urllib2
 import uuid
-import json
+
+try:
+    from rhodecode.lib.compat import json
+except ImportError:
+    try:
+        import simplejson as json
+    except ImportError:
+        import json
 
 from ConfigParser import ConfigParser
 
@@ -72,7 +79,7 b' class RhodecodeAPI():'
         if uid != response["id"]:
             raise InvalidResponseIDError("UUID does not match.")
 
-        if response["error"] != None:
+        if response["error"] is not None:
             raise RhodecodeResponseError(response["error"])
 
         return response["result"]

rhodecode/bin/rhodecode_api.py

@@ -1,7 +1,7 b''
 # -*- coding: utf-8 -*-
 """
-    rhodecode.bin.backup_manager
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    rhodecode.bin.api
+    ~~~~~~~~~~~~~~~~~
 
     Api CLI client for RhodeCode
 
@@ -24,160 +24,18 b''
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import with_statement
-import os
 import sys
-import random
-import urllib2
-import pprint
 import argparse
 
-try:
-    from rhodecode.lib.ext_json import json
-except ImportError:
-    try:
-        import simplejson as json
-    except ImportError:
-        import json
-
-
-CONFIG_NAME = '.rhodecode'
-FORMAT_PRETTY = 'pretty'
-FORMAT_JSON = 'json'
-
-
-class RcConf(object):
-    """
-    RhodeCode config for API
-
-    conf = RcConf()
-    conf['key']
-
-    """
-
-    def __init__(self, config_location=None, autoload=True, autocreate=False,
-                 config=None):
-        self._conf_name = CONFIG_NAME if not config_location else config_location
-        self._conf = {}
-        if autocreate:
-            self.make_config(config)
-        if autoload:
-            self._conf = self.load_config()
-
-    def __getitem__(self, key):
-        return self._conf[key]
-
-    def __nonzero__(self):
-        if self._conf:
-            return True
-        return False
-
-    def __eq__(self):
-        return self._conf.__eq__()
-
-    def __repr__(self):
-        return 'RcConf<%s>' % self._conf.__repr__()
-
-    def make_config(self, config):
-        """
-        Saves given config as a JSON dump in the _conf_name location
-
-        :param config:
-        :type config:
-        """
-        update = False
-        if os.path.exists(self._conf_name):
-            update = True
-        with open(self._conf_name, 'wb') as f:
-            json.dump(config, f, indent=4)
-
-        if update:
-            sys.stdout.write('Updated config in %s\n' % self._conf_name)
-        else:
-            sys.stdout.write('Created new config in %s\n' % self._conf_name)
-
-    def update_config(self, new_config):
-        """
-        Reads the JSON config updates it's values with new_config and
-        saves it back as JSON dump
-
-        :param new_config:
-        """
-        config = {}
-        try:
-            with open(self._conf_name, 'rb') as conf:
-                config = json.load(conf)
-        except IOError, e:
-            sys.stderr.write(str(e) + '\n')
-
-        config.update(new_config)
-        self.make_config(config)
-
-    def load_config(self):
-        """
-        Loads config from file and returns loaded JSON object
-        """
-        try:
-            with open(self._conf_name, 'rb') as conf:
-                return  json.load(conf)
-        except IOError, e:
-            #sys.stderr.write(str(e) + '\n')
-            pass
-
-
-def api_call(apikey, apihost, format, method=None, **kw):
-    """
-    Api_call wrapper for RhodeCode
-
-    :param apikey:
-    :param apihost:
-    :param format: formatting, pretty means prints and pprint of json
-     json returns unparsed json
-    :param method:
-    """
-    def _build_data(random_id):
-        """
-        Builds API data with given random ID
-
-        :param random_id:
-        :type random_id:
-        """
-        return {
-            "id": random_id,
-            "api_key": apikey,
-            "method": method,
-            "args": kw
-        }
-
-    if not method:
-        raise Exception('please specify method name !')
-    id_ = random.randrange(1, 9999)
-    req = urllib2.Request('%s/_admin/api' % apihost,
-                      data=json.dumps(_build_data(id_)),
-                      headers={'content-type': 'text/plain'})
-    if format == FORMAT_PRETTY:
-        sys.stdout.write('calling %s to %s \n' % (req.get_data(), apihost))
-    ret = urllib2.urlopen(req)
-    raw_json = ret.read()
-    json_data = json.loads(raw_json)
-    id_ret = json_data['id']
-    _formatted_json = pprint.pformat(json_data)
-    if id_ret == id_:
-        if format == FORMAT_JSON:
-            sys.stdout.write(str(raw_json))
-        else:
-            sys.stdout.write('rhodecode returned:\n%s\n' % (_formatted_json))
-
-    else:
-        raise Exception('something went wrong. '
-                        'ID mismatch got %s, expected %s | %s' % (
-                                            id_ret, id_, _formatted_json))
+from rhodecode.bin.base import json, api_call, RcConf, FORMAT_JSON, FORMAT_PRETTY
 
 
 def argparser(argv):
     usage = (
-      "rhodecode_api [-h] [--format=FORMAT] [--apikey=APIKEY] [--apihost=APIHOST] "
-      " [--config=CONFIG] "
-      "_create_config or METHOD <key:val> <key2:val> ..."
+      "rhodecode-api [-h] [--format=FORMAT] [--apikey=APIKEY] [--apihost=APIHOST] "
+      "[--config=CONFIG] [--save-config] "
+      "METHOD <key:val> <key2:val> ...\n"
+      "Create config file: rhodecode-gist --apikey=<key> --apihost=http://rhodecode.server --save-config"
     )
 
     parser = argparse.ArgumentParser(description='RhodeCode API cli',
@@ -188,14 +46,15 b' def argparser(argv):'
     group.add_argument('--apikey', help='api access key')
     group.add_argument('--apihost', help='api host')
     group.add_argument('--config', help='config file')
+    group.add_argument('--save-config', action='store_true', help='save the given config into a file')
 
     group = parser.add_argument_group('API')
-    group.add_argument('method', metavar='METHOD', type=str,
+    group.add_argument('method', metavar='METHOD', nargs='?', type=str, default=None,
             help='API method name to call followed by key:value attributes',
     )
     group.add_argument('--format', dest='format', type=str,
-            help='output format default: `pretty` can '
-                 'be also `%s`' % FORMAT_JSON,
+            help='output format default: `%s` can '
+                 'be also `%s`' % (FORMAT_PRETTY, FORMAT_JSON),
             default=FORMAT_PRETTY
     )
     args, other = parser.parse_known_args()
@@ -207,7 +66,6 b' def main(argv=None):'
     Main execution function for cli
 
     :param argv:
-    :type argv:
     """
     if argv is None:
         argv = sys.argv
@@ -216,12 +74,13 b' def main(argv=None):'
     parser, args, other = argparser(argv)
 
     api_credentials_given = (args.apikey and args.apihost)
-    if args.method == '_create_config':
+    if args.save_config:
         if not api_credentials_given:
-            raise parser.error('_create_config requires --apikey and --apihost')
+            raise parser.error('--save-config requires --apikey and --apihost')
         conf = RcConf(config_location=args.config,
                       autocreate=True, config={'apikey': args.apikey,
                                                'apihost': args.apihost})
+        sys.exit()
 
     if not conf:
         conf = RcConf(config_location=args.config, autoload=True)
@@ -231,18 +90,31 b' def main(argv=None):'
                              '--apikey or --apihost in params')
 
     apikey = args.apikey or conf['apikey']
-    host = args.apihost or conf['apihost']
+    apihost = args.apihost or conf['apihost']
     method = args.method
-    if method == '_create_config':
-        sys.exit()
+
+    # if we don't have method here it's an error
+    if not method:
+        parser.error('Please specify method name')
 
     try:
         margs = dict(map(lambda s: s.split(':', 1), other))
     except Exception:
         sys.stderr.write('Error parsing arguments \n')
         sys.exit()
+    if args.format == FORMAT_PRETTY:
+        print 'Calling method %s => %s' % (method, apihost)
 
-    api_call(apikey, host, args.format, method, **margs)
+    json_resp = api_call(apikey, apihost, method, **margs)
+    if json_resp['error']:
+        json_data = json_resp['error']
+    else:
+        json_data = json_resp['result']
+    if args.format == FORMAT_JSON:
+        print json.dumps(json_data)
+    elif args.format == FORMAT_PRETTY:
+        print 'Server response \n%s' % (
+                json.dumps(json_data, indent=4, sort_keys=True))
     return 0
 
 if __name__ == '__main__':

rhodecode/config/deployment.ini_tmpl

@@ -29,24 +29,38 b' pdebug = false'
 #smtp_auth = 
 
 [server:main]
-## PASTE
-## nr of threads to spawn
+## PASTE ##
+#use = egg:Paste#http
+## nr of worker threads to spawn
 #threadpool_workers = 5
-
 ## max request before thread respawn
 #threadpool_max_requests = 10
-
 ## option to use threads of process
 #use_threadpool = true
 
-#use = egg:Paste#http
-
-## WAITRESS
+## WAITRESS ##
+use = egg:waitress#main
+## number of worker threads
 threads = 5
-## 100GB
+## MAX BODY SIZE 100GB
 max_request_body_size = 107374182400
-use = egg:waitress#main
+## use poll instead of select, fixes fd limits, may not work on old
+## windows systems.
+#asyncore_use_poll = True
 
+## GUNICORN ##
+#use = egg:gunicorn#main
+## number of process workers. You must set `instance_id = *` when this option
+## is set to more than one worker
+#workers = 1
+## process name
+#proc_name = rhodecode
+## type of worker class, one of sync, eventlet, gevent, tornado
+## recommended for bigger setup is using of of other than sync one
+#worker_class = sync
+#max_requests = 5
+
+## COMMON ##
 host = 127.0.0.1
 port = 5000
 
@@ -68,6 +82,10 b' lang = en'
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 
+## perform a full repository scan on each server start, this should be
+## set to false after first startup, to allow faster server restarts.
+initial_repo_scan = true
+
 ## uncomment and set this path to use archive download cache
 #archive_cache_dir = /tmp/tarballcache
 
@@ -89,9 +107,6 b' use_htsts = false'
 ## number of commits stats will parse on each iteration
 commit_parse_limit = 25
 
-## number of items displayed in lightweight dashboard before paginating is shown
-dashboard_items = 100
-
 ## use gravatar service to display avatars
 use_gravatar = true
 
@@ -111,6 +126,18 b' rss_include_diff = false'
 show_sha_length = 12
 show_revision_number = true
 
+## gist URL alias, used to create nicer urls for gist. This should be an
+## url that does rewrites to _admin/gists/<gistid>. 
+## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal
+## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/<gistid>
+gist_alias_url =
+
+## white list of API enabled controllers. This allows to add list of
+## controllers to which access will be enabled by api_key. eg: to enable
+## api access to raw_files put `FilesController:raw`, to enable access to patches
+## add `ChangesetController:changeset_patch`. This list should be "," separated
+## Syntax is <ControllerClass>:<function>. Check debug logs for generated names
+api_access_controllers_whitelist =
 
 ## alternative_gravatar_url allows you to use your own avatar server application
 ## the following parts of the URL will be replaced
@@ -186,6 +213,7 b' auth_ret_code ='
 ## codes don't break the transactions while 4XX codes do
 lock_ret_code = 423
 
+allow_repo_location_change = True
 
 ####################################
 ###        CELERY CONFIG        ####

rhodecode/config/environment.py

@@ -18,7 +18,7 b' from rhodecode.config.routing import mak'
 from rhodecode.lib import helpers
 from rhodecode.lib.auth import set_available_permissions
 from rhodecode.lib.utils import repo2db_mapper, make_ui, set_rhodecode_config,\
-    load_rcextensions, check_git_version
+    load_rcextensions, check_git_version, set_vcs_config
 from rhodecode.lib.utils2 import engine_from_config, str2bool
 from rhodecode.lib.db_manage import DbManage
 from rhodecode.model import init_model
@@ -87,18 +87,14 b' def load_environment(global_conf, app_co'
         if not int(os.environ.get('RC_WHOOSH_TEST_DISABLE', 0)):
             create_test_index(TESTS_TMP_PATH, config, True)
 
-    #check git version
-    check_git_version()
     DbManage.check_waitress()
     # MULTIPLE DB configs
     # Setup the SQLAlchemy database engine
     sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.')
     init_model(sa_engine_db1)
 
+    set_available_permissions(config)
     repos_path = make_ui('db').configitems('paths')[0][1]
-    repo2db_mapper(ScmModel().repo_scan(repos_path),
-                   remove_obsolete=False, install_git_hook=False)
-    set_available_permissions(config)
     config['base_path'] = repos_path
     set_rhodecode_config(config)
 
@@ -113,4 +109,12 b' def load_environment(global_conf, app_co'
     # store config reference into our module to skip import magic of
     # pylons
     rhodecode.CONFIG.update(config)
+    set_vcs_config(rhodecode.CONFIG)
+
+    #check git version
+    check_git_version()
+
+    if str2bool(config.get('initial_repo_scan', True)):
+        repo2db_mapper(ScmModel().repo_scan(repos_path),
+                       remove_obsolete=False, install_git_hook=False)
     return config

rhodecode/config/routing.py

@@ -68,6 +68,15 b' def make_map(config):'
         return is_valid_repos_group(repos_group_name, config['base_path'],
                                     skip_path_check=True)
 
+    def check_user_group(environ, match_dict):
+        """
+        check for valid user group for proper 404 handling
+
+        :param environ:
+        :param match_dict:
+        """
+        return True
+
     def check_int(environ, match_dict):
         return match_dict.get('id').isdigit()
 
@@ -122,19 +131,15 b' def make_map(config):'
              action="show", conditions=dict(method=["GET"],
                                             function=check_repo))
         #add repo perm member
-        m.connect('set_repo_perm_member', "/set_repo_perm_member/{repo_name:.*?}",
-             action="set_repo_perm_member",
-             conditions=dict(method=["POST"], function=check_repo))
+        m.connect('set_repo_perm_member',
+                  "/repos/{repo_name:.*?}/grant_perm",
+                  action="set_repo_perm_member",
+                  conditions=dict(method=["POST"], function=check_repo))
 
         #ajax delete repo perm user
-        m.connect('delete_repo_user', "/repos_delete_user/{repo_name:.*?}",
-             action="delete_perm_user",
-             conditions=dict(method=["DELETE"], function=check_repo))
-
-        #ajax delete repo perm users_group
-        m.connect('delete_repo_users_group',
-                  "/repos_delete_users_group/{repo_name:.*?}",
-                  action="delete_perm_users_group",
+        m.connect('delete_repo_perm_member',
+                  "/repos/{repo_name:.*?}/revoke_perm",
+                  action="delete_repo_perm_member",
                   conditions=dict(method=["DELETE"], function=check_repo))
 
         #settings actions
@@ -184,6 +189,18 b' def make_map(config):'
         m.connect("update_repos_group", "/repos_groups/{group_name:.*?}",
                   action="update", conditions=dict(method=["PUT"],
                                                    function=check_group))
+        #add repo group perm member
+        m.connect('set_repo_group_perm_member',
+                  "/repos_groups/{group_name:.*?}/grant_perm",
+                  action="set_repo_group_perm_member",
+                  conditions=dict(method=["POST"], function=check_group))
+
+        #ajax delete repo group perm
+        m.connect('delete_repo_group_perm_member',
+                  "/repos_groups/{group_name:.*?}/revoke_perm",
+                  action="delete_repo_group_perm_member",
+                  conditions=dict(method=["DELETE"], function=check_group))
+
         m.connect("delete_repos_group", "/repos_groups/{group_name:.*?}",
                   action="delete", conditions=dict(method=["DELETE"],
                                                    function=check_group_skip_path))
@@ -200,17 +217,6 b' def make_map(config):'
         m.connect("formatted_repos_group", "/repos_groups/{group_name:.*?}.{format}",
                   action="show", conditions=dict(method=["GET"],
                                                  function=check_group))
-        # ajax delete repository 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 repository 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,
@@ -269,7 +275,8 b' def make_map(config):'
         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"]))
+                  action="edit", conditions=dict(method=["GET"]),
+                  function=check_user_group)
         m.connect("formatted_edit_users_group",
                   "/users_groups/{id}.{format}/edit",
                   action="edit", conditions=dict(method=["GET"]))
@@ -279,9 +286,20 b' def make_map(config):'
                   action="show", conditions=dict(method=["GET"]))
 
         #EXTRAS USER ROUTES
-        m.connect("users_group_perm", "/users_groups_perm/{id}",
+        # update
+        m.connect("users_group_perm", "/users_groups/{id}/update_global_perm",
                   action="update_perm", conditions=dict(method=["PUT"]))
 
+        #add user group perm member
+        m.connect('set_user_group_perm_member', "/users_groups/{id}/grant_perm",
+             action="set_user_group_perm_member",
+             conditions=dict(method=["POST"]))
+
+        #ajax delete user group perm
+        m.connect('delete_user_group_perm_member', "/users_groups/{id}/revoke_perm",
+             action="delete_user_group_perm_member",
+             conditions=dict(method=["DELETE"]))
+
     #ADMIN GROUP REST ROUTES
     rmap.resource('group', 'groups',
                   controller='admin/groups', path_prefix=ADMIN_PREFIX)
@@ -352,27 +370,55 b' def make_map(config):'
                   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}",
+        m.connect("/notifications/{notification_id}",
                   action="update", conditions=dict(method=["PUT"]))
-        m.connect("/notification/{notification_id}",
+        m.connect("/notifications/{notification_id}",
                   action="delete", conditions=dict(method=["DELETE"]))
-        m.connect("edit_notification", "/notification/{notification_id}/edit",
+        m.connect("edit_notification", "/notifications/{notification_id}/edit",
                   action="edit", conditions=dict(method=["GET"]))
         m.connect("formatted_edit_notification",
-                  "/notification/{notification_id}.{format}/edit",
+                  "/notifications/{notification_id}.{format}/edit",
                   action="edit", conditions=dict(method=["GET"]))
-        m.connect("notification", "/notification/{notification_id}",
+        m.connect("notification", "/notifications/{notification_id}",
                   action="show", conditions=dict(method=["GET"]))
         m.connect("formatted_notification", "/notifications/{notification_id}.{format}",
                   action="show", conditions=dict(method=["GET"]))
 
+    #ADMIN GIST
+    with rmap.submapper(path_prefix=ADMIN_PREFIX,
+                        controller='admin/gists') as m:
+        m.connect("gists", "/gists",
+                  action="create", conditions=dict(method=["POST"]))
+        m.connect("gists", "/gists",
+                  action="index", conditions=dict(method=["GET"]))
+        m.connect("new_gist", "/gists/new",
+                  action="new", conditions=dict(method=["GET"]))
+        m.connect("formatted_new_gist", "/gists/new.{format}",
+                  action="new", conditions=dict(method=["GET"]))
+        m.connect("formatted_gists", "/gists.{format}",
+                  action="index", conditions=dict(method=["GET"]))
+        m.connect("/gists/{gist_id}",
+                  action="update", conditions=dict(method=["PUT"]))
+        m.connect("/gists/{gist_id}",
+                  action="delete", conditions=dict(method=["DELETE"]))
+        m.connect("edit_gist", "/gists/{gist_id}/edit",
+                  action="edit", conditions=dict(method=["GET"]))
+        m.connect("formatted_edit_gist",
+                  "/gists/{gist_id}/{format}/edit",
+                  action="edit", conditions=dict(method=["GET"]))
+        m.connect("gist", "/gists/{gist_id}",
+                  action="show", conditions=dict(method=["GET"]))
+        m.connect("formatted_gist", "/gists/{gist_id}/{format}",
+                  action="show", conditions=dict(method=["GET"]))
+        m.connect("formatted_gist_file", "/gists/{gist_id}/{format}/{revision}/{f_path:.*}",
+                  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
     #==========================================================================
@@ -500,6 +546,11 b' def make_map(config):'
                 controller='changeset', revision='tip', action='comment',
                 conditions=dict(function=check_repo))
 
+    rmap.connect('changeset_comment_preview',
+                 '/{repo_name:.*?}/changeset/comment/preview',
+                controller='changeset', action='preview_comment',
+                conditions=dict(function=check_repo, method=["POST"]))
+
     rmap.connect('changeset_comment_delete',
                  '/{repo_name:.*?}/changeset/comment/{comment_id}/delete',
                 controller='changeset', action='delete_comment',
@@ -563,13 +614,6 b' def make_map(config):'
     rmap.connect('summary_home_summary', '/{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('shortlog_file_home', '/{repo_name:.*?}/shortlog/{revision}/{f_path:.*}',
-                controller='shortlog', f_path=None,
-                conditions=dict(function=check_repo))
-
     rmap.connect('branches_home', '/{repo_name:.*?}/branches',
                 controller='branches', conditions=dict(function=check_repo))
 
@@ -582,6 +626,14 b' def make_map(config):'
     rmap.connect('changelog_home', '/{repo_name:.*?}/changelog',
                 controller='changelog', conditions=dict(function=check_repo))
 
+    rmap.connect('changelog_summary_home', '/{repo_name:.*?}/changelog_summary',
+                controller='changelog', action='changelog_summary',
+                conditions=dict(function=check_repo))
+
+    rmap.connect('changelog_file_home', '/{repo_name:.*?}/changelog/{revision}/{f_path:.*}',
+                controller='changelog', f_path=None,
+                conditions=dict(function=check_repo))
+
     rmap.connect('changelog_details', '/{repo_name:.*?}/changelog_details/{cs}',
                 controller='changelog', action='changelog_details',
                 conditions=dict(function=check_repo))

rhodecode/controllers/admin/admin.py

@@ -27,17 +27,17 b' import logging'
 
 from pylons import request, tmpl_context as c, url
 from sqlalchemy.orm import joinedload
-from webhelpers.paginate import Page
 from whoosh.qparser.default import QueryParser
+from whoosh.qparser.dateparse import DateParserPlugin
 from whoosh import query
 from sqlalchemy.sql.expression import or_, and_, func
 
+from rhodecode.model.db import UserLog, User
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 from rhodecode.lib.base import BaseController, render
-from rhodecode.model.db import UserLog, User
 from rhodecode.lib.utils2 import safe_int, remove_prefix, remove_suffix
 from rhodecode.lib.indexers import JOURNAL_SCHEMA
-from whoosh.qparser.dateparse import DateParserPlugin
+from rhodecode.lib.helpers import Page
 
 
 log = logging.getLogger(__name__)

rhodecode/controllers/admin/ldap_settings.py

@@ -71,8 +71,6 b' class LdapSettingsController(BaseControl'
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def __before__(self):
-        c.admin_user = session.get('admin_user')
-        c.admin_username = session.get('admin_username')
         c.search_scope_choices = self.search_scope_choices
         c.tls_reqcert_choices = self.tls_reqcert_choices
         c.tls_kind_choices = self.tls_kind_choices

rhodecode/controllers/admin/notifications.py

@@ -30,15 +30,13 b' from pylons import request'
 from pylons import tmpl_context as c, url
 from pylons.controllers.util import redirect, abort
 
-from webhelpers.paginate import Page
-
+from rhodecode.model.db import Notification
+from rhodecode.model.notification import NotificationModel
+from rhodecode.model.meta import Session
+from rhodecode.lib.auth import LoginRequired, NotAnonymous
 from rhodecode.lib.base import BaseController, render
-from rhodecode.model.db import Notification
-
-from rhodecode.model.notification import NotificationModel
-from rhodecode.lib.auth import LoginRequired, NotAnonymous
 from rhodecode.lib import helpers as h
-from rhodecode.model.meta import Session
+from rhodecode.lib.helpers import Page
 from rhodecode.lib.utils2 import safe_int
 
 

rhodecode/controllers/admin/permissions.py

@@ -38,7 +38,7 b' from rhodecode.lib.auth import LoginRequ'
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.forms import DefaultPermissionsForm
 from rhodecode.model.permission import PermissionModel
-from rhodecode.model.db import User, UserIpMap
+from rhodecode.model.db import User, UserIpMap, Permission
 from rhodecode.model.meta import Session
 
 log = logging.getLogger(__name__)
@@ -53,19 +53,21 b' class PermissionsController(BaseControll'
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def __before__(self):
-        c.admin_user = session.get('admin_user')
-        c.admin_username = session.get('admin_username')
         super(PermissionsController, self).__before__()
 
-        self.repo_perms_choices = [('repository.none', _('None'),),
+        c.repo_perms_choices = [('repository.none', _('None'),),
                                    ('repository.read', _('Read'),),
                                    ('repository.write', _('Write'),),
                                    ('repository.admin', _('Admin'),)]
-        self.group_perms_choices = [('group.none', _('None'),),
-                                    ('group.read', _('Read'),),
-                                    ('group.write', _('Write'),),
-                                    ('group.admin', _('Admin'),)]
-        self.register_choices = [
+        c.group_perms_choices = [('group.none', _('None'),),
+                                 ('group.read', _('Read'),),
+                                 ('group.write', _('Write'),),
+                                 ('group.admin', _('Admin'),)]
+        c.user_group_perms_choices = [('usergroup.none', _('None'),),
+                                      ('usergroup.read', _('Read'),),
+                                      ('usergroup.write', _('Write'),),
+                                      ('usergroup.admin', _('Admin'),)]
+        c.register_choices = [
             ('hg.register.none',
                 _('Disabled')),
             ('hg.register.manual_activate',
@@ -73,18 +75,22 b' class PermissionsController(BaseControll'
             ('hg.register.auto_activate',
                 _('Allowed with automatic account activation')), ]
 
-        self.create_choices = [('hg.create.none', _('Disabled')),
-                               ('hg.create.repository', _('Enabled'))]
+        c.extern_activate_choices = [
+            ('hg.extern_activate.manual', _('Manual activation of external account')),
+            ('hg.extern_activate.auto', _('Automatic activation of external account')),
+        ]
 
-        self.fork_choices = [('hg.fork.none', _('Disabled')),
-                             ('hg.fork.repository', _('Enabled'))]
+        c.repo_create_choices = [('hg.create.none', _('Disabled')),
+                                 ('hg.create.repository', _('Enabled'))]
 
-        # set the global template variables
-        c.repo_perms_choices = self.repo_perms_choices
-        c.group_perms_choices = self.group_perms_choices
-        c.register_choices = self.register_choices
-        c.create_choices = self.create_choices
-        c.fork_choices = self.fork_choices
+        c.user_group_create_choices = [('hg.usergroup.create.false', _('Disabled')),
+                                       ('hg.usergroup.create.true', _('Enabled'))]
+
+        c.repo_group_create_choices = [('hg.repogroup.create.false', _('Disabled')),
+                                       ('hg.repogroup.create.true', _('Enabled'))]
+
+        c.fork_choices = [('hg.fork.none', _('Disabled')),
+                          ('hg.fork.repository', _('Enabled'))]
 
     def index(self, format='html'):
         """GET /permissions: All items in the collection"""
@@ -107,23 +113,27 b' class PermissionsController(BaseControll'
         #           method='put')
         # url('permission', id=ID)
         if id == 'default':
-            c.user = default_user = User.get_by_username('default')
+            c.user = default_user = User.get_default_user()
             c.perm_user = AuthUser(user_id=default_user.user_id)
             c.user_ip_map = UserIpMap.query()\
                             .filter(UserIpMap.user == default_user).all()
-            permission_model = PermissionModel()
 
             _form = DefaultPermissionsForm(
-                    [x[0] for x in self.repo_perms_choices],
-                    [x[0] for x in self.group_perms_choices],
-                    [x[0] for x in self.register_choices],
-                    [x[0] for x in self.create_choices],
-                    [x[0] for x in self.fork_choices])()
+                    [x[0] for x in c.repo_perms_choices],
+                    [x[0] for x in c.group_perms_choices],
+                    [x[0] for x in c.user_group_perms_choices],
+                    [x[0] for x in c.repo_create_choices],
+                    [x[0] for x in c.repo_group_create_choices],
+                    [x[0] for x in c.user_group_create_choices],
+                    [x[0] for x in c.fork_choices],
+                    [x[0] for x in c.register_choices],
+                    [x[0] for x in c.extern_activate_choices],
+            )()
 
             try:
                 form_result = _form.to_python(dict(request.POST))
                 form_result.update({'perm_user_name': id})
-                permission_model.update(form_result)
+                PermissionModel().update(form_result)
                 Session().commit()
                 h.flash(_('Default permissions updated successfully'),
                         category='success')
@@ -156,6 +166,7 b' class PermissionsController(BaseControll'
     def show(self, id, format='html'):
         """GET /permissions/id: Show a specific item"""
         # url('permission', id=ID)
+        Permission.get_or_404(-1)
 
     def edit(self, id, format='html'):
         """GET /permissions/id/edit: Form to edit an existing item"""
@@ -163,23 +174,35 b' class PermissionsController(BaseControll'
 
         #this form can only edit default user permissions
         if id == 'default':
-            c.user = default_user = User.get_by_username('default')
-            defaults = {'anonymous': default_user.active}
-            c.perm_user = AuthUser(user_id=default_user.user_id)
+            c.user = User.get_default_user()
+            defaults = {'anonymous': c.user.active}
+            c.perm_user = c.user.AuthUser
             c.user_ip_map = UserIpMap.query()\
-                            .filter(UserIpMap.user == default_user).all()
-            for p in default_user.user_perms:
+                            .filter(UserIpMap.user == c.user).all()
+            for p in c.user.user_perms:
                 if p.permission.permission_name.startswith('repository.'):
                     defaults['default_repo_perm'] = p.permission.permission_name
 
                 if p.permission.permission_name.startswith('group.'):
                     defaults['default_group_perm'] = p.permission.permission_name
 
+                if p.permission.permission_name.startswith('usergroup.'):
+                    defaults['default_user_group_perm'] = p.permission.permission_name
+
+                if p.permission.permission_name.startswith('hg.create.'):
+                    defaults['default_repo_create'] = p.permission.permission_name
+
+                if p.permission.permission_name.startswith('hg.repogroup.'):
+                    defaults['default_repo_group_create'] = p.permission.permission_name
+
+                if p.permission.permission_name.startswith('hg.usergroup.'):
+                    defaults['default_user_group_create'] = p.permission.permission_name
+
                 if p.permission.permission_name.startswith('hg.register.'):
                     defaults['default_register'] = p.permission.permission_name
 
-                if p.permission.permission_name.startswith('hg.create.'):
-                    defaults['default_create'] = p.permission.permission_name
+                if p.permission.permission_name.startswith('hg.extern_activate.'):
+                    defaults['default_extern_activate'] = p.permission.permission_name
 
                 if p.permission.permission_name.startswith('hg.fork.'):
                     defaults['default_fork'] = p.permission.permission_name

rhodecode/controllers/admin/repos.py

@@ -40,17 +40,18 b' from rhodecode.lib.auth import LoginRequ'
     HasPermissionAnyDecorator, HasRepoPermissionAllDecorator, NotAnonymous,\
     HasPermissionAny, HasReposGroupPermissionAny, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController, render
-from rhodecode.lib.utils import invalidate_cache, action_logger, repo_name_slug
+from rhodecode.lib.utils import action_logger, repo_name_slug
 from rhodecode.lib.helpers import get_token
 from rhodecode.model.meta import Session
 from rhodecode.model.db import User, Repository, UserFollowing, RepoGroup,\
     RhodeCodeSetting, RepositoryField
 from rhodecode.model.forms import RepoForm, RepoFieldForm, RepoPermsForm
-from rhodecode.model.scm import ScmModel, GroupList
+from rhodecode.model.scm import ScmModel, RepoGroupList, RepoList
 from rhodecode.model.repo import RepoModel
 from rhodecode.lib.compat import json
 from sqlalchemy.sql.expression import func
 from rhodecode.lib.exceptions import AttachedForksError
+from rhodecode.lib.utils2 import safe_int
 
 log = logging.getLogger(__name__)
 
@@ -64,12 +65,10 b' class ReposController(BaseRepoController'
 
     @LoginRequired()
     def __before__(self):
-        c.admin_user = session.get('admin_user')
-        c.admin_username = session.get('admin_username')
         super(ReposController, self).__before__()
 
     def __load_defaults(self):
-        acl_groups = GroupList(RepoGroup.query().all(),
+        acl_groups = RepoGroupList(RepoGroup.query().all(),
                                perm_set=['group.write', 'group.admin'])
         c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
@@ -99,7 +98,7 b' class ReposController(BaseRepoController'
         choices, c.landing_revs = ScmModel().get_repo_landing_revs(c.repo_info)
         c.landing_revs_choices = choices
 
-        c.default_user_id = User.get_by_username('default').user_id
+        c.default_user_id = User.get_default_user().user_id
         c.in_public_journal = UserFollowing.query()\
             .filter(UserFollowing.user_id == c.default_user_id)\
             .filter(UserFollowing.follows_repository == c.repo_info).scalar()
@@ -124,23 +123,24 b' class ReposController(BaseRepoController'
 
         defaults = RepoModel()._get_defaults(repo_name)
 
+        _repos = Repository.query().order_by(Repository.repo_name).all()
+        read_access_repos = RepoList(_repos)
         c.repos_list = [('', _('--REMOVE FORK--'))]
-        c.repos_list += [(x.repo_id, x.repo_name) for x in
-                    Repository.query().order_by(Repository.repo_name).all()
-                    if x.repo_id != c.repo_info.repo_id]
+        c.repos_list += [(x.repo_id, x.repo_name)
+                         for x in read_access_repos
+                         if x.repo_id != c.repo_info.repo_id]
 
         defaults['id_fork_of'] = db_repo.fork.repo_id if db_repo.fork else ''
         return defaults
 
-    @HasPermissionAllDecorator('hg.admin')
     def index(self, format='html'):
         """GET /repos: All items in the collection"""
         # url('repos')
+        repo_list = Repository.query()\
+                                .order_by(func.lower(Repository.repo_name))\
+                                .all()
 
-        c.repos_list = Repository.query()\
-                        .order_by(func.lower(Repository.repo_name))\
-                        .all()
-
+        c.repos_list = RepoList(repo_list, perm_set=['repository.admin'])
         repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list,
                                                    admin=True,
                                                    super_user_actions=True)
@@ -216,7 +216,7 b' class ReposController(BaseRepoController'
             if not HasReposGroupPermissionAny('group.admin', 'group.write')(group_name=gr_name):
                 raise HTTPForbidden
 
-        acl_groups = GroupList(RepoGroup.query().all(),
+        acl_groups = RepoGroupList(RepoGroup.query().all(),
                                perm_set=['group.write', 'group.admin'])
         c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
@@ -266,7 +266,7 b' class ReposController(BaseRepoController'
         try:
             form_result = _form.to_python(dict(request.POST))
             repo = repo_model.update(repo_name, **form_result)
-            invalidate_cache('get_repo_cached_%s' % repo_name)
+            ScmModel().mark_for_invalidation(repo_name)
             h.flash(_('Repository %s updated successfully') % repo_name,
                     category='success')
             changed_name = repo.repo_name
@@ -319,7 +319,7 b' class ReposController(BaseRepoController'
             repo_model.delete(repo, forks=handle_forks)
             action_logger(self.rhodecode_user, 'admin_deleted_repo',
                   repo_name, self.ip_addr, self.sa)
-            invalidate_cache('get_repo_cached_%s' % repo_name)
+            ScmModel().mark_for_invalidation(repo_name)
             h.flash(_('Deleted repository %s') % repo_name, category='success')
             Session().commit()
         except AttachedForksError:
@@ -336,32 +336,8 b' class ReposController(BaseRepoController'
     @HasRepoPermissionAllDecorator('repository.admin')
     def set_repo_perm_member(self, repo_name):
         form = RepoPermsForm()().to_python(request.POST)
-
-        perms_new = form['perms_new']
-        perms_updates = form['perms_updates']
-        cur_repo = repo_name
-
-        # update permissions
-        for member, perm, member_type in perms_updates:
-            if member_type == 'user':
-                # this updates existing one
-                RepoModel().grant_user_permission(
-                    repo=cur_repo, user=member, perm=perm
-                )
-            else:
-                RepoModel().grant_users_group_permission(
-                    repo=cur_repo, group_name=member, perm=perm
-                )
-        # set new permissions
-        for member, perm, member_type in perms_new:
-            if member_type == 'user':
-                RepoModel().grant_user_permission(
-                    repo=cur_repo, user=member, perm=perm
-                )
-            else:
-                RepoModel().grant_users_group_permission(
-                    repo=cur_repo, group_name=member, perm=perm
-                )
+        RepoModel()._update_permissions(repo_name, form['perms_new'],
+                                        form['perms_updates'])
         #TODO: implement this
         #action_logger(self.rhodecode_user, 'admin_changed_repo_permissions',
         #              repo_name, self.ip_addr, self.sa)
@@ -370,42 +346,33 b' class ReposController(BaseRepoController'
         return redirect(url('edit_repo', repo_name=repo_name))
 
     @HasRepoPermissionAllDecorator('repository.admin')
-    def delete_perm_user(self, repo_name):
+    def delete_repo_perm_member(self, repo_name):
         """
         DELETE an existing repository permission user
 
         :param repo_name:
         """
         try:
-            RepoModel().revoke_user_permission(repo=repo_name,
-                                               user=request.POST['user_id'])
+            obj_type = request.POST.get('obj_type')
+            obj_id = None
+            if obj_type == 'user':
+                obj_id = safe_int(request.POST.get('user_id'))
+            elif obj_type == 'user_group':
+                obj_id = safe_int(request.POST.get('user_group_id'))
+
+            if obj_type == 'user':
+                RepoModel().revoke_user_permission(repo=repo_name, user=obj_id)
+            elif obj_type == 'user_group':
+                RepoModel().revoke_users_group_permission(
+                    repo=repo_name, group_name=obj_id
+                )
             #TODO: implement this
             #action_logger(self.rhodecode_user, 'admin_revoked_repo_permissions',
             #              repo_name, self.ip_addr, self.sa)
             Session().commit()
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('An error occurred during deletion of repository user'),
-                    category='error')
-            raise HTTPInternalServerError()
-
-    @HasRepoPermissionAllDecorator('repository.admin')
-    def delete_perm_users_group(self, repo_name):
-        """
-        DELETE an existing repository permission user group
-
-        :param repo_name:
-        """
-
-        try:
-            RepoModel().revoke_users_group_permission(
-                repo=repo_name, group_name=request.POST['users_group_id']
-            )
-            Session().commit()
-        except Exception:
-            log.error(traceback.format_exc())
-            h.flash(_('An error occurred during deletion of repository'
-                      ' user groups'),
+            h.flash(_('An error occurred during revoking of permission'),
                     category='error')
             raise HTTPInternalServerError()
 
@@ -504,7 +471,7 b' class ReposController(BaseRepoController'
         if cur_token == token:
             try:
                 repo_id = Repository.get_by_repo_name(repo_name).repo_id
-                user_id = User.get_by_username('default').user_id
+                user_id = User.get_default_user().user_id
                 self.scm_model.toggle_following_repo(repo_id, user_id)
                 h.flash(_('Updated repository visibility in public journal'),
                         category='success')
@@ -530,6 +497,7 b' class ReposController(BaseRepoController'
             ScmModel().pull_changes(repo_name, self.rhodecode_user.username)
             h.flash(_('Pulled from remote location'), category='success')
         except Exception, e:
+            log.error(traceback.format_exc())
             h.flash(_('An error occurred during pull from remote location'),
                     category='error')
 

rhodecode/controllers/admin/repos_groups.py

@@ -37,20 +37,21 b' from sqlalchemy.exc import IntegrityErro'
 
 import rhodecode
 from rhodecode.lib import helpers as h
-from rhodecode.lib.ext_json import json
+from rhodecode.lib.compat import json
 from rhodecode.lib.auth import LoginRequired, HasPermissionAnyDecorator,\
     HasReposGroupPermissionAnyDecorator, HasReposGroupPermissionAll,\
     HasPermissionAll
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import RepoGroup, Repository
+from rhodecode.model.scm import RepoGroupList
 from rhodecode.model.repos_group import ReposGroupModel
-from rhodecode.model.forms import ReposGroupForm
+from rhodecode.model.forms import ReposGroupForm, RepoGroupPermsForm
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from webob.exc import HTTPInternalServerError, HTTPNotFound
 from rhodecode.lib.utils2 import str2bool, safe_int
 from sqlalchemy.sql.expression import func
-from rhodecode.model.scm import GroupList
+
 
 log = logging.getLogger(__name__)
 
@@ -72,7 +73,7 b' class ReposGroupsController(BaseControll'
 
         #override the choices for this form, we need to filter choices
         #and display only those we have ADMIN right
-        groups_with_admin_rights = GroupList(RepoGroup.query().all(),
+        groups_with_admin_rights = RepoGroupList(RepoGroup.query().all(),
                                              perm_set=['group.admin'])
         c.repo_groups = RepoGroup.groups_choices(groups=groups_with_admin_rights,
                                                  show_empty_group=allow_empty_group)
@@ -94,12 +95,12 b' class ReposGroupsController(BaseControll'
         data = repo_group.get_dict()
         data['group_name'] = repo_group.name
 
-        # fill repository users
+        # fill repository group users
         for p in repo_group.repo_group_to_perm:
             data.update({'u_perm_%s' % p.user.username:
                              p.permission.permission_name})
 
-        # fill repository groups
+        # fill repository group groups
         for p in repo_group.users_group_to_perm:
             data.update({'g_perm_%s' % p.users_group.users_group_name:
                              p.permission.permission_name})
@@ -118,7 +119,8 b' class ReposGroupsController(BaseControll'
     def index(self, format='html'):
         """GET /repos_groups: All items in the collection"""
         # url('repos_groups')
-        group_iter = GroupList(RepoGroup.query().all(), perm_set=['group.admin'])
+        group_iter = RepoGroupList(RepoGroup.query().all(),
+                                   perm_set=['group.admin'])
         sk = lambda g: g.parents[0].group_name if g.parents else g.group_name
         c.groups = sorted(group_iter, key=sk)
         return render('admin/repos_groups/repos_groups_show.html')
@@ -190,7 +192,7 b' class ReposGroupsController(BaseControll'
         #           method='put')
         # url('repos_group', group_name=GROUP_NAME)
 
-        c.repos_group = ReposGroupModel()._get_repos_group(group_name)
+        c.repos_group = ReposGroupModel()._get_repo_group(group_name)
         if HasPermissionAll('hg.admin')('group edit'):
             #we're global admin, we're ok and we can create TOP level groups
             allow_empty_group = True
@@ -209,11 +211,6 b' class ReposGroupsController(BaseControll'
         )()
         try:
             form_result = repos_group_form.to_python(dict(request.POST))
-            if not c.rhodecode_user.is_admin:
-                if self._revoke_perms_on_yourself(form_result):
-                    msg = _('Cannot revoke permission for yourself as admin')
-                    h.flash(msg, category='warning')
-                    raise Exception('revoke admin permission on self')
 
             new_gr = ReposGroupModel().update(group_name, form_result)
             Session().commit()
@@ -247,7 +244,7 b' class ReposGroupsController(BaseControll'
         #           method='delete')
         # url('repos_group', group_name=GROUP_NAME)
 
-        gr = c.repos_group = ReposGroupModel()._get_repos_group(group_name)
+        gr = c.repos_group = ReposGroupModel()._get_repo_group(group_name)
         repos = gr.repositories.all()
         if repos:
             h.flash(_('This group contains %s repositores and cannot be '
@@ -268,55 +265,71 b' class ReposGroupsController(BaseControll'
             #TODO: in future action_logger(, '', '', '', self.sa)
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('Error occurred during deletion of repos '
-                      'group %s') % group_name, category='error')
+            h.flash(_('Error occurred during deletion of repository group %s')
+                    % group_name, category='error')
 
         return redirect(url('repos_groups'))
 
     @HasReposGroupPermissionAnyDecorator('group.admin')
-    def delete_repos_group_user_perm(self, group_name):
+    def set_repo_group_perm_member(self, group_name):
+        c.repos_group = ReposGroupModel()._get_repo_group(group_name)
+        form_result = RepoGroupPermsForm()().to_python(request.POST)
+        if not c.rhodecode_user.is_admin:
+            if self._revoke_perms_on_yourself(form_result):
+                msg = _('Cannot revoke permission for yourself as admin')
+                h.flash(msg, category='warning')
+                return redirect(url('edit_repos_group', group_name=group_name))
+        recursive = form_result['recursive']
+        # iterate over all members(if in recursive mode) of this groups and
+        # set the permissions !
+        # this can be potentially heavy operation
+        ReposGroupModel()._update_permissions(c.repos_group,
+                                              form_result['perms_new'],
+                                              form_result['perms_updates'],
+                                              recursive)
+        #TODO: implement this
+        #action_logger(self.rhodecode_user, 'admin_changed_repo_permissions',
+        #              repo_name, self.ip_addr, self.sa)
+        Session().commit()
+        h.flash(_('Repository Group permissions updated'), category='success')
+        return redirect(url('edit_repos_group', group_name=group_name))
+
+    @HasReposGroupPermissionAnyDecorator('group.admin')
+    def delete_repo_group_perm_member(self, group_name):
         """
         DELETE an existing repository group permission user
 
         :param group_name:
         """
         try:
+            obj_type = request.POST.get('obj_type')
+            obj_id = None
+            if obj_type == 'user':
+                obj_id = safe_int(request.POST.get('user_id'))
+            elif obj_type == 'user_group':
+                obj_id = safe_int(request.POST.get('user_group_id'))
+
             if not c.rhodecode_user.is_admin:
-                if c.rhodecode_user.user_id == safe_int(request.POST['user_id']):
+                if obj_type == 'user' and c.rhodecode_user.user_id == obj_id:
                     msg = _('Cannot revoke permission for yourself as admin')
                     h.flash(msg, category='warning')
                     raise Exception('revoke admin permission on self')
             recursive = str2bool(request.POST.get('recursive', False))
-            ReposGroupModel().delete_permission(
-                repos_group=group_name, obj=request.POST['user_id'],
-                obj_type='user', recursive=recursive
-            )
+            if obj_type == 'user':
+                ReposGroupModel().delete_permission(
+                    repos_group=group_name, obj=obj_id,
+                    obj_type='user', recursive=recursive
+                )
+            elif obj_type == 'user_group':
+                ReposGroupModel().delete_permission(
+                    repos_group=group_name, obj=obj_id,
+                    obj_type='users_group', recursive=recursive
+                )
+
             Session().commit()
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('An error occurred during deletion of group user'),
-                    category='error')
-            raise HTTPInternalServerError()
-
-    @HasReposGroupPermissionAnyDecorator('group.admin')
-    def delete_repos_group_users_group_perm(self, group_name):
-        """
-        DELETE an existing repository group permission user group
-
-        :param group_name:
-        """
-
-        try:
-            recursive = str2bool(request.POST.get('recursive', False))
-            ReposGroupModel().delete_permission(
-                repos_group=group_name, obj=request.POST['users_group_id'],
-                obj_type='users_group', recursive=recursive
-            )
-            Session().commit()
-        except Exception:
-            log.error(traceback.format_exc())
-            h.flash(_('An error occurred during deletion of group'
-                      ' user groups'),
+            h.flash(_('An error occurred during revoking of permission'),
                     category='error')
             raise HTTPInternalServerError()
 
@@ -337,7 +350,7 b' class ReposGroupsController(BaseControll'
         """GET /repos_groups/group_name: Show a specific item"""
         # url('repos_group', group_name=GROUP_NAME)
 
-        c.group = c.repos_group = ReposGroupModel()._get_repos_group(group_name)
+        c.group = c.repos_group = ReposGroupModel()._get_repo_group(group_name)
         c.group_repos = c.group.repositories.all()
 
         #overwrite our cached list with current filter
@@ -348,19 +361,15 b' class ReposGroupsController(BaseControll'
             .filter(RepoGroup.group_parent_id == c.group.group_id).all()
         c.groups = self.scm_model.get_repos_groups(groups)
 
-        if not c.visual.lightweight_dashboard:
-            c.repos_list = self.scm_model.get_repos(all_repos=gr_filter)
-        ## lightweight version of dashboard
-        else:
-            c.repos_list = Repository.query()\
-                            .filter(Repository.group_id == c.group.group_id)\
-                            .order_by(func.lower(Repository.repo_name))\
-                            .all()
+        c.repos_list = Repository.query()\
+                        .filter(Repository.group_id == c.group.group_id)\
+                        .order_by(func.lower(Repository.repo_name))\
+                        .all()
 
-            repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list,
-                                                       admin=False)
-            #json used to render the grid
-            c.data = json.dumps(repos_data)
+        repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list,
+                                                   admin=False)
+        #json used to render the grid
+        c.data = json.dumps(repos_data)
 
         return render('admin/repos_groups/repos_groups.html')
 
@@ -369,7 +378,7 b' class ReposGroupsController(BaseControll'
         """GET /repos_groups/group_name/edit: Form to edit an existing item"""
         # url('edit_repos_group', group_name=GROUP_NAME)
 
-        c.repos_group = ReposGroupModel()._get_repos_group(group_name)
+        c.repos_group = ReposGroupModel()._get_repo_group(group_name)
         #we can only allow moving empty group if it's already a top-level
         #group, ie has no parents, or we're admin
         if HasPermissionAll('hg.admin')('group edit'):

rhodecode/controllers/admin/settings.py

@@ -41,13 +41,13 b' from rhodecode.lib.auth import LoginRequ'
     HasReposGroupPermissionAll, HasReposGroupPermissionAny, AuthUser
 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, check_git_version
+from rhodecode.lib.utils import repo2db_mapper, set_rhodecode_config, \
+    check_git_version
 from rhodecode.model.db import RhodeCodeUi, Repository, RepoGroup, \
     RhodeCodeSetting, PullRequest, PullRequestReviewers
 from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \
     ApplicationUiSettingsForm, ApplicationVisualisationForm
-from rhodecode.model.scm import ScmModel, GroupList
+from rhodecode.model.scm import ScmModel, RepoGroupList
 from rhodecode.model.user import UserModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.db import User
@@ -55,7 +55,6 b' from rhodecode.model.notification import'
 from rhodecode.model.meta import Session
 from rhodecode.lib.utils2 import str2bool, safe_unicode
 from rhodecode.lib.compat import json
-from webob.exc import HTTPForbidden
 log = logging.getLogger(__name__)
 
 
@@ -68,15 +67,13 b' class SettingsController(BaseController)'
 
     @LoginRequired()
     def __before__(self):
-        c.admin_user = session.get('admin_user')
-        c.admin_username = session.get('admin_username')
+        super(SettingsController, self).__before__()
         c.modules = sorted([(p.project_name, p.version)
                             for p in pkg_resources.working_set]
                            + [('git', check_git_version())],
                            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'):
@@ -115,13 +112,17 b' class SettingsController(BaseController)'
 
         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)
+            invalidate_cache = request.POST.get('invalidate', False)
+            log.debug('rescanning repo location with destroy obsolete=%s'
+                      % (rm_obsolete,))
 
-            added, removed = repo2db_mapper(initial, rm_obsolete)
+            if invalidate_cache:
+                log.debug('invalidating all repositories cache')
+                for repo in Repository.get_all():
+                    ScmModel().mark_for_invalidation(repo.repo_name)
+
+            filesystem_repos = ScmModel().repo_scan()
+            added, removed = repo2db_mapper(filesystem_repos, rm_obsolete)
             _repr = lambda l: ', '.join(map(safe_unicode, l)) or '-'
             h.flash(_('Repositories successfully '
                       'rescanned added: %s ; removed: %s') %
@@ -186,6 +187,7 b' class SettingsController(BaseController)'
                 )
 
             try:
+                #TODO: rewrite this to something less ugly
                 sett1 = RhodeCodeSetting.get_by_name_or_create('show_public_icon')
                 sett1.app_settings_value = \
                     form_result['rhodecode_show_public_icon']
@@ -201,16 +203,21 b' class SettingsController(BaseController)'
                     form_result['rhodecode_stylify_metatags']
                 Session().add(sett3)
 
-                sett4 = RhodeCodeSetting.get_by_name_or_create('lightweight_dashboard')
-                sett4.app_settings_value = \
-                    form_result['rhodecode_lightweight_dashboard']
-                Session().add(sett4)
-
                 sett4 = RhodeCodeSetting.get_by_name_or_create('repository_fields')
                 sett4.app_settings_value = \
                     form_result['rhodecode_repository_fields']
                 Session().add(sett4)
 
+                sett5 = RhodeCodeSetting.get_by_name_or_create('dashboard_items')
+                sett5.app_settings_value = \
+                    form_result['rhodecode_dashboard_items']
+                Session().add(sett5)
+
+                sett6 = RhodeCodeSetting.get_by_name_or_create('show_version')
+                sett6.app_settings_value = \
+                    form_result['rhodecode_show_version']
+                Session().add(sett6)
+
                 Session().commit()
                 set_rhodecode_config(config)
                 h.flash(_('Updated visualisation settings'),
@@ -239,10 +246,10 b' class SettingsController(BaseController)'
                 sett = RhodeCodeUi.get_by_key('push_ssl')
                 sett.ui_value = form_result['web_push_ssl']
                 Session().add(sett)
-
-                sett = RhodeCodeUi.get_by_key('/')
-                sett.ui_value = form_result['paths_root_path']
-                Session().add(sett)
+                if c.visual.allow_repo_location_change:
+                    sett = RhodeCodeUi.get_by_key('/')
+                    sett.ui_value = form_result['paths_root_path']
+                    Session().add(sett)
 
                 #HOOKS
                 sett = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_UPDATE)

rhodecode/controllers/admin/users.py

@@ -41,8 +41,8 b' from rhodecode.lib.auth import LoginRequ'
     AuthUser
 from rhodecode.lib.base import BaseController, render
 
-from rhodecode.model.db import User, UserEmailMap, UserIpMap
-from rhodecode.model.forms import UserForm
+from rhodecode.model.db import User, UserEmailMap, UserIpMap, UserToPerm
+from rhodecode.model.forms import UserForm, CustomDefaultPermissionsForm
 from rhodecode.model.user import UserModel
 from rhodecode.model.meta import Session
 from rhodecode.lib.utils import action_logger
@@ -61,8 +61,6 b' class UsersController(BaseController):'
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def __before__(self):
-        c.admin_user = session.get('admin_user')
-        c.admin_username = session.get('admin_username')
         super(UsersController, self).__before__()
         c.available_permissions = config['available_permissions']
 
@@ -70,7 +68,9 b' class UsersController(BaseController):'
         """GET /users: All items in the collection"""
         # url('users')
 
-        c.users_list = User.query().order_by(User.username).all()
+        c.users_list = User.query().order_by(User.username)\
+                        .filter(User.username != User.DEFAULT_USER)\
+                        .all()
 
         users_data = []
         total_records = len(c.users_list)
@@ -223,6 +223,7 b' class UsersController(BaseController):'
     def show(self, id, format='html'):
         """GET /users/id: Show a specific item"""
         # url('user', id=ID)
+        User.get_or_404(-1)
 
     def edit(self, id, format='html'):
         """GET /users/id/edit: Form to edit an existing item"""
@@ -241,12 +242,13 b' class UsersController(BaseController):'
                         .filter(UserEmailMap.user == c.user).all()
         c.user_ip_map = UserIpMap.query()\
                         .filter(UserIpMap.user == c.user).all()
-        user_model = UserModel()
+        umodel = UserModel()
         c.ldap_dn = c.user.ldap_dn
         defaults = c.user.get_dict()
         defaults.update({
-            'create_repo_perm': user_model.has_perm(id, 'hg.create.repository'),
-            'fork_repo_perm': user_model.has_perm(id, 'hg.fork.repository'),
+         'create_repo_perm': umodel.has_perm(c.user, 'hg.create.repository'),
+         'create_user_group_perm': umodel.has_perm(c.user, 'hg.usergroup.create.true'),
+         'fork_repo_perm': umodel.has_perm(c.user, 'hg.fork.repository'),
         })
 
         return htmlfill.render(
@@ -259,39 +261,36 b' class UsersController(BaseController):'
     def update_perm(self, id):
         """PUT /users_perm/id: Update an existing item"""
         # url('user_perm', id=ID, method='put')
-        usr = User.get_or_404(id)
-        grant_create_perm = str2bool(request.POST.get('create_repo_perm'))
-        grant_fork_perm = str2bool(request.POST.get('fork_repo_perm'))
-        inherit_perms = str2bool(request.POST.get('inherit_default_permissions'))
-
-        user_model = UserModel()
+        user = User.get_or_404(id)
 
         try:
-            usr.inherit_default_permissions = inherit_perms
-            Session().add(usr)
+            form = CustomDefaultPermissionsForm()()
+            form_result = form.to_python(request.POST)
+
+            inherit_perms = form_result['inherit_default_permissions']
+            user.inherit_default_permissions = inherit_perms
+            Session().add(user)
+            user_model = UserModel()
 
-            if grant_create_perm:
-                user_model.revoke_perm(usr, 'hg.create.none')
-                user_model.grant_perm(usr, 'hg.create.repository')
-                h.flash(_("Granted 'repository create' permission to user"),
-                        category='success')
+            defs = UserToPerm.query()\
+                .filter(UserToPerm.user == user)\
+                .all()
+            for ug in defs:
+                Session().delete(ug)
+
+            if form_result['create_repo_perm']:
+                user_model.grant_perm(id, 'hg.create.repository')
             else:
-                user_model.revoke_perm(usr, 'hg.create.repository')
-                user_model.grant_perm(usr, 'hg.create.none')
-                h.flash(_("Revoked 'repository create' permission to user"),
-                        category='success')
-
-            if grant_fork_perm:
-                user_model.revoke_perm(usr, 'hg.fork.none')
-                user_model.grant_perm(usr, 'hg.fork.repository')
-                h.flash(_("Granted 'repository fork' permission to user"),
-                        category='success')
+                user_model.grant_perm(id, 'hg.create.none')
+            if form_result['create_user_group_perm']:
+                user_model.grant_perm(id, 'hg.usergroup.create.true')
             else:
-                user_model.revoke_perm(usr, 'hg.fork.repository')
-                user_model.grant_perm(usr, 'hg.fork.none')
-                h.flash(_("Revoked 'repository fork' permission to user"),
-                        category='success')
-
+                user_model.grant_perm(id, 'hg.usergroup.create.false')
+            if form_result['fork_repo_perm']:
+                user_model.grant_perm(id, 'hg.fork.repository')
+            else:
+                user_model.grant_perm(id, 'hg.fork.none')
+            h.flash(_("Updated permissions"), category='success')
             Session().commit()
         except Exception:
             log.error(traceback.format_exc())

rhodecode/controllers/admin/users_groups.py

@@ -33,19 +33,23 b' from pylons.controllers.util import abor'
 from pylons.i18n.translation import _
 
 from rhodecode.lib import helpers as h
-from rhodecode.lib.exceptions import UserGroupsAssignedException
-from rhodecode.lib.utils2 import safe_unicode, str2bool
-from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
+from rhodecode.lib.exceptions import UserGroupsAssignedException,\
+    RepoGroupAssignmentError
+from rhodecode.lib.utils2 import safe_unicode, str2bool, safe_int
+from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator,\
+    HasUserGroupPermissionAnyDecorator, HasPermissionAnyDecorator
 from rhodecode.lib.base import BaseController, render
-
+from rhodecode.model.scm import UserGroupList
 from rhodecode.model.users_group import UserGroupModel
-
+from rhodecode.model.repo import RepoModel
 from rhodecode.model.db import User, UserGroup, UserGroupToPerm,\
     UserGroupRepoToPerm, UserGroupRepoGroupToPerm
-from rhodecode.model.forms import UserGroupForm
+from rhodecode.model.forms import UserGroupForm, UserGroupPermsForm,\
+    CustomDefaultPermissionsForm
 from rhodecode.model.meta import Session
 from rhodecode.lib.utils import action_logger
 from sqlalchemy.orm import joinedload
+from webob.exc import HTTPInternalServerError
 
 log = logging.getLogger(__name__)
 
@@ -57,19 +61,89 b' class UsersGroupsController(BaseControll'
     #     map.resource('users_group', 'users_groups')
 
     @LoginRequired()
-    @HasPermissionAllDecorator('hg.admin')
     def __before__(self):
-        c.admin_user = session.get('admin_user')
-        c.admin_username = session.get('admin_username')
         super(UsersGroupsController, self).__before__()
         c.available_permissions = config['available_permissions']
 
+    def __load_data(self, user_group_id):
+        permissions = {
+            'repositories': {},
+            'repositories_groups': {}
+        }
+        ugroup_repo_perms = UserGroupRepoToPerm.query()\
+            .options(joinedload(UserGroupRepoToPerm.permission))\
+            .options(joinedload(UserGroupRepoToPerm.repository))\
+            .filter(UserGroupRepoToPerm.users_group_id == user_group_id)\
+            .all()
+
+        for gr in ugroup_repo_perms:
+            permissions['repositories'][gr.repository.repo_name]  \
+                = gr.permission.permission_name
+
+        ugroup_group_perms = UserGroupRepoGroupToPerm.query()\
+            .options(joinedload(UserGroupRepoGroupToPerm.permission))\
+            .options(joinedload(UserGroupRepoGroupToPerm.group))\
+            .filter(UserGroupRepoGroupToPerm.users_group_id == user_group_id)\
+            .all()
+
+        for gr in ugroup_group_perms:
+            permissions['repositories_groups'][gr.group.group_name] \
+                = gr.permission.permission_name
+        c.permissions = permissions
+        c.group_members_obj = sorted((x.user for x in c.users_group.members),
+                                     key=lambda u: u.username.lower())
+
+        c.group_members = [(x.user_id, x.username) for x in c.group_members_obj]
+        c.available_members = sorted(((x.user_id, x.username) for x in
+                                      User.query().all()),
+                                     key=lambda u: u[1].lower())
+        repo_model = RepoModel()
+        c.users_array = repo_model.get_users_js()
+        c.users_groups_array = repo_model.get_users_groups_js()
+        c.available_permissions = config['available_permissions']
+
+    def __load_defaults(self, user_group_id):
+        """
+        Load defaults settings for edit, and update
+
+        :param user_group_id:
+        """
+        user_group = UserGroup.get_or_404(user_group_id)
+        data = user_group.get_dict()
+
+        ug_model = UserGroupModel()
+
+        data.update({
+            'create_repo_perm': ug_model.has_perm(user_group,
+                                                  'hg.create.repository'),
+            'create_user_group_perm': ug_model.has_perm(user_group,
+                                                  'hg.usergroup.create.true'),
+            'fork_repo_perm': ug_model.has_perm(user_group,
+                                                'hg.fork.repository'),
+        })
+
+        # fill user group users
+        for p in user_group.user_user_group_to_perm:
+            data.update({'u_perm_%s' % p.user.username:
+                             p.permission.permission_name})
+
+        for p in user_group.user_group_user_group_to_perm:
+            data.update({'g_perm_%s' % p.user_group.users_group_name:
+                             p.permission.permission_name})
+
+        return data
+
     def index(self, format='html'):
         """GET /users_groups: All items in the collection"""
         # url('users_groups')
-        c.users_groups_list = UserGroup().query().all()
+
+        group_iter = UserGroupList(UserGroup().query().all(),
+                                   perm_set=['usergroup.admin'])
+        sk = lambda g: g.users_group_name
+        c.users_groups_list = sorted(group_iter, key=sk)
         return render('admin/users_groups/users_groups.html')
 
+    @HasPermissionAnyDecorator('hg.admin', 'hg.usergroup.create.true')
     def create(self):
         """POST /users_groups: Create a new item"""
         # url('users_groups')
@@ -78,7 +152,9 b' class UsersGroupsController(BaseControll'
         try:
             form_result = users_group_form.to_python(dict(request.POST))
             UserGroupModel().create(name=form_result['users_group_name'],
-                                     active=form_result['users_group_active'])
+                                    owner=self.rhodecode_user.user_id,
+                                    active=form_result['users_group_active'])
+
             gr = form_result['users_group_name']
             action_logger(self.rhodecode_user,
                           'admin_created_users_group:%s' % gr,
@@ -99,45 +175,13 b' class UsersGroupsController(BaseControll'
 
         return redirect(url('users_groups'))
 
+    @HasPermissionAnyDecorator('hg.admin', 'hg.usergroup.create.true')
     def new(self, format='html'):
         """GET /users_groups/new: Form to create a new item"""
         # url('new_users_group')
         return render('admin/users_groups/users_group_add.html')
 
-    def _load_data(self, id):
-        c.users_group.permissions = {
-            'repositories': {},
-            'repositories_groups': {}
-        }
-
-        ugroup_repo_perms = UserGroupRepoToPerm.query()\
-            .options(joinedload(UserGroupRepoToPerm.permission))\
-            .options(joinedload(UserGroupRepoToPerm.repository))\
-            .filter(UserGroupRepoToPerm.users_group_id == id)\
-            .all()
-
-        for gr in ugroup_repo_perms:
-            c.users_group.permissions['repositories'][gr.repository.repo_name]  \
-                = gr.permission.permission_name
-
-        ugroup_group_perms = UserGroupRepoGroupToPerm.query()\
-            .options(joinedload(UserGroupRepoGroupToPerm.permission))\
-            .options(joinedload(UserGroupRepoGroupToPerm.group))\
-            .filter(UserGroupRepoGroupToPerm.users_group_id == id)\
-            .all()
-
-        for gr in ugroup_group_perms:
-            c.users_group.permissions['repositories_groups'][gr.group.group_name] \
-                = gr.permission.permission_name
-
-        c.group_members_obj = sorted((x.user for x in c.users_group.members),
-                                     key=lambda u: u.username.lower())
-        c.group_members = [(x.user_id, x.username) for x in
-                           c.group_members_obj]
-        c.available_members = sorted(((x.user_id, x.username) for x in
-                                      User.query().all()),
-                                     key=lambda u: u[1].lower())
-
+    @HasUserGroupPermissionAnyDecorator('usergroup.admin')
     def update(self, id):
         """PUT /users_groups/id: Update an existing item"""
         # Forms posted to this method should contain a hidden field:
@@ -148,7 +192,7 b' class UsersGroupsController(BaseControll'
         # url('users_group', id=ID)
 
         c.users_group = UserGroup.get_or_404(id)
-        self._load_data(id)
+        self.__load_data(id)
 
         available_members = [safe_unicode(x[0]) for x in c.available_members]
 
@@ -190,6 +234,7 b' class UsersGroupsController(BaseControll'
 
         return redirect(url('edit_users_group', id=id))
 
+    @HasUserGroupPermissionAnyDecorator('usergroup.admin')
     def delete(self, id):
         """DELETE /users_groups/id: Delete an existing item"""
         # Forms posted to this method should contain a hidden field:
@@ -211,25 +256,76 b' class UsersGroupsController(BaseControll'
                     category='error')
         return redirect(url('users_groups'))
 
+    @HasUserGroupPermissionAnyDecorator('usergroup.admin')
+    def set_user_group_perm_member(self, id):
+        """
+        grant permission for given usergroup
+
+        :param id:
+        """
+        user_group = UserGroup.get_or_404(id)
+        form = UserGroupPermsForm()().to_python(request.POST)
+
+        # set the permissions !
+        try:
+            UserGroupModel()._update_permissions(user_group, form['perms_new'],
+                                                 form['perms_updates'])
+        except RepoGroupAssignmentError:
+            h.flash(_('Target group cannot be the same'), category='error')
+            return redirect(url('edit_users_group', id=id))
+        #TODO: implement this
+        #action_logger(self.rhodecode_user, 'admin_changed_repo_permissions',
+        #              repo_name, self.ip_addr, self.sa)
+        Session().commit()
+        h.flash(_('User Group permissions updated'), category='success')
+        return redirect(url('edit_users_group', id=id))
+
+    @HasUserGroupPermissionAnyDecorator('usergroup.admin')
+    def delete_user_group_perm_member(self, id):
+        """
+        DELETE an existing repository group permission user
+
+        :param group_name:
+        """
+        try:
+            obj_type = request.POST.get('obj_type')
+            obj_id = None
+            if obj_type == 'user':
+                obj_id = safe_int(request.POST.get('user_id'))
+            elif obj_type == 'user_group':
+                obj_id = safe_int(request.POST.get('user_group_id'))
+
+            if not c.rhodecode_user.is_admin:
+                if obj_type == 'user' and c.rhodecode_user.user_id == obj_id:
+                    msg = _('Cannot revoke permission for yourself as admin')
+                    h.flash(msg, category='warning')
+                    raise Exception('revoke admin permission on self')
+            if obj_type == 'user':
+                UserGroupModel().revoke_user_permission(user_group=id,
+                                                        user=obj_id)
+            elif obj_type == 'user_group':
+                UserGroupModel().revoke_users_group_permission(target_user_group=id,
+                                                               user_group=obj_id)
+            Session().commit()
+        except Exception:
+            log.error(traceback.format_exc())
+            h.flash(_('An error occurred during revoking of permission'),
+                    category='error')
+            raise HTTPInternalServerError()
+
     def show(self, id, format='html'):
         """GET /users_groups/id: Show a specific item"""
         # url('users_group', id=ID)
 
+    @HasUserGroupPermissionAnyDecorator('usergroup.admin')
     def edit(self, id, format='html'):
         """GET /users_groups/id/edit: Form to edit an existing item"""
         # url('edit_users_group', id=ID)
 
         c.users_group = UserGroup.get_or_404(id)
-        self._load_data(id)
+        self.__load_data(id)
 
-        ug_model = UserGroupModel()
-        defaults = c.users_group.get_dict()
-        defaults.update({
-            'create_repo_perm': ug_model.has_perm(c.users_group,
-                                                  'hg.create.repository'),
-            'fork_repo_perm': ug_model.has_perm(c.users_group,
-                                                'hg.fork.repository'),
-        })
+        defaults = self.__load_defaults(id)
 
         return htmlfill.render(
             render('admin/users_groups/users_group_edit.html'),
@@ -238,43 +334,42 b' class UsersGroupsController(BaseControll'
             force_defaults=False
         )
 
+    @HasUserGroupPermissionAnyDecorator('usergroup.admin')
     def update_perm(self, id):
         """PUT /users_perm/id: Update an existing item"""
         # url('users_group_perm', id=ID, method='put')
 
         users_group = UserGroup.get_or_404(id)
-        grant_create_perm = str2bool(request.POST.get('create_repo_perm'))
-        grant_fork_perm = str2bool(request.POST.get('fork_repo_perm'))
-        inherit_perms = str2bool(request.POST.get('inherit_default_permissions'))
-
-        usergroup_model = UserGroupModel()
 
         try:
+            form = CustomDefaultPermissionsForm()()
+            form_result = form.to_python(request.POST)
+
+            inherit_perms = form_result['inherit_default_permissions']
             users_group.inherit_default_permissions = inherit_perms
             Session().add(users_group)
+            usergroup_model = UserGroupModel()
 
-            if grant_create_perm:
-                usergroup_model.revoke_perm(id, 'hg.create.none')
-                usergroup_model.grant_perm(id, 'hg.create.repository')
-                h.flash(_("Granted 'repository create' permission to user group"),
-                        category='success')
-            else:
-                usergroup_model.revoke_perm(id, 'hg.create.repository')
-                usergroup_model.grant_perm(id, 'hg.create.none')
-                h.flash(_("Revoked 'repository create' permission to user group"),
-                        category='success')
+            defs = UserGroupToPerm.query()\
+                .filter(UserGroupToPerm.users_group == users_group)\
+                .all()
+            for ug in defs:
+                Session().delete(ug)
 
-            if grant_fork_perm:
-                usergroup_model.revoke_perm(id, 'hg.fork.none')
-                usergroup_model.grant_perm(id, 'hg.fork.repository')
-                h.flash(_("Granted 'repository fork' permission to user group"),
-                        category='success')
+            if form_result['create_repo_perm']:
+                usergroup_model.grant_perm(id, 'hg.create.repository')
+            else:
+                usergroup_model.grant_perm(id, 'hg.create.none')
+            if form_result['create_user_group_perm']:
+                usergroup_model.grant_perm(id, 'hg.usergroup.create.true')
             else:
-                usergroup_model.revoke_perm(id, 'hg.fork.repository')
+                usergroup_model.grant_perm(id, 'hg.usergroup.create.false')
+            if form_result['fork_repo_perm']:
+                usergroup_model.grant_perm(id, 'hg.fork.repository')
+            else:
                 usergroup_model.grant_perm(id, 'hg.fork.none')
-                h.flash(_("Revoked 'repository fork' permission to user group"),
-                        category='success')
 
+            h.flash(_("Updated permissions"), category='success')
             Session().commit()
         except Exception:
             log.error(traceback.format_exc())

rhodecode/controllers/api/api.py

@@ -25,6 +25,7 b''
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 
+import time
 import traceback
 import logging
 
@@ -34,19 +35,30 b' from rhodecode.lib.auth import PasswordG'
     HasPermissionAnyApi, HasRepoPermissionAnyApi
 from rhodecode.lib.utils import map_groups, repo2db_mapper
 from rhodecode.lib.utils2 import str2bool, time_to_datetime, safe_int
-from rhodecode.lib import helpers as h
 from rhodecode.model.meta import Session
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.user import UserModel
 from rhodecode.model.users_group import UserGroupModel
+from rhodecode.model.repos_group import ReposGroupModel
 from rhodecode.model.db import Repository, RhodeCodeSetting, UserIpMap,\
-    Permission
+    Permission, User, Gist
 from rhodecode.lib.compat import json
+from rhodecode.lib.exceptions import DefaultUserException
+from rhodecode.model.gist import GistModel
 
 log = logging.getLogger(__name__)
 
 
+def store_update(updates, attr, name):
+    """
+    Stores param in updates dict if it's not instance of Optional
+    allows easy updates of passed in params
+    """
+    if not isinstance(attr, Optional):
+        updates[name] = attr
+
+
 class OptionalAttr(object):
     """
     Special Optional Option that defines other attribute
@@ -113,7 +125,7 b' def get_repo_or_error(repoid):'
     """
     Get repo by id or name or return JsonRPCError if not found
 
-    :param userid:
+    :param repoid:
     """
     repo = RepoModel().get_repo(repoid)
     if repo is None:
@@ -121,6 +133,19 b' def get_repo_or_error(repoid):'
     return repo
 
 
+def get_repo_group_or_error(repogroupid):
+    """
+    Get repo group by id or name or return JsonRPCError if not found
+
+    :param repogroupid:
+    """
+    repo_group = ReposGroupModel()._get_repo_group(repogroupid)
+    if repo_group is None:
+        raise JSONRPCError(
+            'repository group `%s` does not exist' % (repogroupid,))
+    return repo_group
+
+
 def get_users_group_or_error(usersgroupid):
     """
     Get user group by id or name or return JsonRPCError if not found
@@ -212,7 +237,7 b' class ApiController(JSONRPCController):'
         :param repoid:
         """
         repo = get_repo_or_error(repoid)
-        if HasPermissionAnyApi('hg.admin')(user=apiuser) is False:
+        if not HasPermissionAnyApi('hg.admin')(user=apiuser):
             # check if we have admin permission for this repo !
             if HasRepoPermissionAnyApi('repository.admin',
                                        'repository.write')(user=apiuser,
@@ -220,16 +245,15 b' class ApiController(JSONRPCController):'
                 raise JSONRPCError('repository `%s` does not exist' % (repoid))
 
         try:
-            invalidated_keys = ScmModel().mark_for_invalidation(repo.repo_name)
-            Session().commit()
-            return ('Cache for repository `%s` was invalidated: '
-                    'invalidated cache keys: %s' % (repoid, invalidated_keys))
+            ScmModel().mark_for_invalidation(repo.repo_name)
+            return ('Caches of repository `%s` was invalidated' % repoid)
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError(
                 'Error occurred during cache invalidation action'
             )
 
+    # permission check inside
     def lock(self, apiuser, repoid, locked=Optional(None),
              userid=Optional(OAttr('apiuser'))):
         """
@@ -266,27 +290,47 b' class ApiController(JSONRPCController):'
             lockobj = Repository.getlock(repo)
 
             if lockobj[0] is None:
-                return ('Repo `%s` not locked. Locked=`False`.'
-                        % (repo.repo_name))
+                _d = {
+                    'repo': repo.repo_name,
+                    'locked': False,
+                    'locked_since': None,
+                    'locked_by': None,
+                    'msg': 'Repo `%s` not locked.' % repo.repo_name
+                }
+                return _d
             else:
                 userid, time_ = lockobj
-                user = get_user_or_error(userid)
+                lock_user = get_user_or_error(userid)
+                _d = {
+                    'repo': repo.repo_name,
+                    'locked': True,
+                    'locked_since': time_,
+                    'locked_by': lock_user.username,
+                    'msg': ('Repo `%s` locked by `%s`. '
+                            % (repo.repo_name,
+                               json.dumps(time_to_datetime(time_))))
+                }
+                return _d
 
-                return ('Repo `%s` locked by `%s`. Locked=`True`. '
-                        'Locked since: `%s`'
-                    % (repo.repo_name, user.username,
-                       json.dumps(time_to_datetime(time_))))
-
+        # force locked state through a flag
         else:
             locked = str2bool(locked)
             try:
                 if locked:
-                    Repository.lock(repo, user.user_id)
+                    lock_time = time.time()
+                    Repository.lock(repo, user.user_id, lock_time)
                 else:
+                    lock_time = None
                     Repository.unlock(repo)
-
-                return ('User `%s` set lock state for repo `%s` to `%s`'
-                        % (user.username, repo.repo_name, locked))
+                _d = {
+                    'repo': repo.repo_name,
+                    'locked': locked,
+                    'locked_since': lock_time,
+                    'locked_by': user.username,
+                    'msg': ('User `%s` set lock state for repo `%s` to `%s`'
+                            % (user.username, repo.repo_name, locked))
+                }
+                return _d
             except Exception:
                 log.error(traceback.format_exc())
                 raise JSONRPCError(
@@ -302,9 +346,8 b' class ApiController(JSONRPCController):'
         :param apiuser:
         :param userid:
         """
-        if HasPermissionAnyApi('hg.admin')(user=apiuser):
-            pass
-        else:
+
+        if not HasPermissionAnyApi('hg.admin')(user=apiuser):
             #make sure normal user does not pass someone else userid,
             #he is not allowed to do that
             if not isinstance(userid, Optional) and userid != apiuser.user_id:
@@ -354,7 +397,7 b' class ApiController(JSONRPCController):'
         :param apiuser:
         :param userid:
         """
-        if HasPermissionAnyApi('hg.admin')(user=apiuser) is False:
+        if not HasPermissionAnyApi('hg.admin')(user=apiuser):
             #make sure normal user does not pass someone else userid,
             #he is not allowed to do that
             if not isinstance(userid, Optional) and userid != apiuser.user_id:
@@ -379,12 +422,15 b' class ApiController(JSONRPCController):'
         """
 
         result = []
-        for user in UserModel().get_all():
+        users_list = User.query().order_by(User.username)\
+                        .filter(User.username != User.DEFAULT_USER)\
+                        .all()
+        for user in users_list:
             result.append(user.get_api_data())
         return result
 
     @HasPermissionAllDecorator('hg.admin')
-    def create_user(self, apiuser, username, email, password,
+    def create_user(self, apiuser, username, email, password=Optional(None),
                     firstname=Optional(None), lastname=Optional(None),
                     active=Optional(True), admin=Optional(False),
                     ldap_dn=Optional(None)):
@@ -479,6 +525,9 b' class ApiController(JSONRPCController):'
                 msg='updated user ID:%s %s' % (user.user_id, user.username),
                 user=user.get_api_data()
             )
+        except DefaultUserException:
+            log.error(traceback.format_exc())
+            raise JSONRPCError('editing default user is forbidden')
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError('failed to update user `%s`' % userid)
@@ -538,12 +587,15 b' class ApiController(JSONRPCController):'
         return result
 
     @HasPermissionAllDecorator('hg.admin')
-    def create_users_group(self, apiuser, group_name, active=Optional(True)):
+    def create_users_group(self, apiuser, group_name,
+                           owner=Optional(OAttr('apiuser')),
+                           active=Optional(True)):
         """
         Creates an new usergroup
 
         :param apiuser:
         :param group_name:
+        :param owner:
         :param active:
         """
 
@@ -551,8 +603,14 b' class ApiController(JSONRPCController):'
             raise JSONRPCError("user group `%s` already exist" % group_name)
 
         try:
+            if isinstance(owner, Optional):
+                owner = apiuser.user_id
+
+            owner = get_user_or_error(owner)
             active = Optional.extract(active)
-            ug = UserGroupModel().create(name=group_name, active=active)
+            ug = UserGroupModel().create(name=group_name,
+                                         owner=owner,
+                                         active=active)
             Session().commit()
             return dict(
                 msg='created new user group `%s`' % group_name,
@@ -633,10 +691,10 b' class ApiController(JSONRPCController):'
         """
         repo = get_repo_or_error(repoid)
 
-        if HasPermissionAnyApi('hg.admin')(user=apiuser) is False:
+        if not HasPermissionAnyApi('hg.admin')(user=apiuser):
             # check if we have admin permission for this repo !
-            if HasRepoPermissionAnyApi('repository.admin')(user=apiuser,
-                                            repo_name=repo.repo_name) is False:
+            if not HasRepoPermissionAnyApi('repository.admin')(user=apiuser,
+                                            repo_name=repo.repo_name):
                 raise JSONRPCError('repository `%s` does not exist' % (repoid))
 
         members = []
@@ -665,6 +723,7 b' class ApiController(JSONRPCController):'
         data['followers'] = followers
         return data
 
+    # permission check inside
     def get_repos(self, apiuser):
         """"
         Get all repositories
@@ -792,6 +851,71 b' class ApiController(JSONRPCController):'
             log.error(traceback.format_exc())
             raise JSONRPCError('failed to create repository `%s`' % repo_name)
 
+    # permission check inside
+    def update_repo(self, apiuser, repoid, name=Optional(None),
+                    owner=Optional(OAttr('apiuser')),
+                    group=Optional(None),
+                    description=Optional(''), private=Optional(False),
+                    clone_uri=Optional(None), landing_rev=Optional('tip'),
+                    enable_statistics=Optional(False),
+                    enable_locking=Optional(False),
+                    enable_downloads=Optional(False)):
+
+        """
+        Updates repo
+
+        :param apiuser: filled automatically from apikey
+        :type apiuser: AuthUser
+        :param repoid: repository name or repository id
+        :type repoid: str or int
+        :param name:
+        :param owner:
+        :param group:
+        :param description:
+        :param private:
+        :param clone_uri:
+        :param landing_rev:
+        :param enable_statistics:
+        :param enable_locking:
+        :param enable_downloads:
+        """
+        repo = get_repo_or_error(repoid)
+        if not HasPermissionAnyApi('hg.admin')(user=apiuser):
+            # check if we have admin permission for this repo !
+            if not HasRepoPermissionAnyApi('repository.admin')(user=apiuser,
+                                                               repo_name=repo.repo_name):
+                raise JSONRPCError('repository `%s` does not exist' % (repoid,))
+
+        updates = {
+            # update function requires this.
+            'repo_name': repo.repo_name
+        }
+        repo_group = group
+        if not isinstance(repo_group, Optional):
+            repo_group = get_repo_group_or_error(repo_group)
+            repo_group = repo_group.group_id
+        try:
+            store_update(updates, name, 'repo_name')
+            store_update(updates, repo_group, 'repo_group')
+            store_update(updates, owner, 'user')
+            store_update(updates, description, 'repo_description')
+            store_update(updates, private, 'repo_private')
+            store_update(updates, clone_uri, 'clone_uri')
+            store_update(updates, landing_rev, 'repo_landing_rev')
+            store_update(updates, enable_statistics, 'repo_enable_statistics')
+            store_update(updates, enable_locking, 'repo_enable_locking')
+            store_update(updates, enable_downloads, 'repo_enable_downloads')
+
+            RepoModel().update(repo, **updates)
+            Session().commit()
+            return dict(
+                msg='updated repo ID:%s %s' % (repo.repo_id, repo.repo_name),
+                repository=repo.get_api_data()
+            )
+        except Exception:
+            log.error(traceback.format_exc())
+            raise JSONRPCError('failed to update repo `%s`' % repoid)
+
     @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository')
     def fork_repo(self, apiuser, repoid, fork_name, owner=Optional(OAttr('apiuser')),
                   description=Optional(''), copy_permissions=Optional(False),
@@ -853,6 +977,7 b' class ApiController(JSONRPCController):'
                                                             fork_name)
             )
 
+    # perms handled inside
     def delete_repo(self, apiuser, repoid, forks=Optional(None)):
         """
         Deletes a given repository
@@ -874,9 +999,9 b' class ApiController(JSONRPCController):'
             _forks_msg = ''
             _forks = [f for f in repo.forks]
             if handle_forks == 'detach':
-                _forks_msg = ' ' + _('Detached %s forks') % len(_forks)
+                _forks_msg = ' ' + 'Detached %s forks' % len(_forks)
             elif handle_forks == 'delete':
-                _forks_msg = ' ' + _('Deleted %s forks') % len(_forks)
+                _forks_msg = ' ' + 'Deleted %s forks' % len(_forks)
             elif _forks:
                 raise JSONRPCError(
                     'Cannot delete `%s` it still contains attached forks'
@@ -1029,3 +1154,34 b' class ApiController(JSONRPCController):'
                     users_group.users_group_name, repo.repo_name
                 )
             )
+
+    def create_gist(self, apiuser, files, owner=Optional(OAttr('apiuser')),
+                    gist_type=Optional(Gist.GIST_PUBLIC), lifetime=Optional(-1),
+                    description=Optional('')):
+
+        try:
+            if isinstance(owner, Optional):
+                owner = apiuser.user_id
+
+            owner = get_user_or_error(owner)
+            description = Optional.extract(description)
+            gist_type = Optional.extract(gist_type)
+            lifetime = Optional.extract(lifetime)
+
+            # files: {
+            #    'filename': {'content':'...', 'lexer': null},
+            #    'filename2': {'content':'...', 'lexer': null}
+            #}
+            gist = GistModel().create(description=description,
+                                      owner=owner,
+                                      gist_mapping=files,
+                                      gist_type=gist_type,
+                                      lifetime=lifetime)
+            Session().commit()
+            return dict(
+                msg='created new gist',
+                gist=gist.get_api_data()
+            )
+        except Exception:
+            log.error(traceback.format_exc())
+            raise JSONRPCError('failed to create gist')

rhodecode/controllers/bookmarks.py

@@ -36,12 +36,12 b' log = logging.getLogger(__name__)'
 
 class BookmarksController(BaseRepoController):
 
+    def __before__(self):
+        super(BookmarksController, self).__before__()
+
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
-    def __before__(self):
-        super(BookmarksController, self).__before__()
-
     def index(self):
         if c.rhodecode_repo.alias != 'hg':
             raise HTTPNotFound()

rhodecode/controllers/branches.py

@@ -38,12 +38,12 b' log = logging.getLogger(__name__)'
 
 class BranchesController(BaseRepoController):
 
+    def __before__(self):
+        super(BranchesController, self).__before__()
+
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
-    def __before__(self):
-        super(BranchesController, self).__before__()
-
     def index(self):
 
         def _branchtags(localrepo):
@@ -72,5 +72,4 b' class BranchesController(BaseRepoControl'
                                              key=lambda ctx: ctx[0],
                                              reverse=False))
 
-
         return render('branches/branches.html')

rhodecode/controllers/changelog.py

@@ -37,22 +37,65 b' from rhodecode.lib.helpers import RepoPa'
 from rhodecode.lib.compat import json
 from rhodecode.lib.graphmod import _colored, _dagwalker
 from rhodecode.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError,\
-    EmptyRepositoryError
+    ChangesetError, NodeDoesNotExistError, EmptyRepositoryError
 from rhodecode.lib.utils2 import safe_int
+from webob.exc import HTTPNotFound
 
 log = logging.getLogger(__name__)
 
 
+def _load_changelog_summary():
+    p = safe_int(request.GET.get('page'), 1)
+    size = safe_int(request.GET.get('size'), 10)
+
+    def url_generator(**kw):
+        return url('changelog_summary_home',
+                   repo_name=c.rhodecode_db_repo.repo_name, size=size, **kw)
+
+    collection = c.rhodecode_repo
+
+    c.repo_changesets = RepoPage(collection, page=p,
+                                 items_per_page=size,
+                                 url=url_generator)
+    page_revisions = [x.raw_id for x in list(c.repo_changesets)]
+    c.comments = c.rhodecode_db_repo.get_comments(page_revisions)
+    c.statuses = c.rhodecode_db_repo.statuses(page_revisions)
+
+
 class ChangelogController(BaseRepoController):
 
-    @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
-                                   'repository.admin')
     def __before__(self):
         super(ChangelogController, self).__before__()
         c.affected_files_cut_off = 60
 
-    def index(self):
+    def _graph(self, repo, revs_int, repo_size, size, p):
+        """
+        Generates a DAG graph for repo
+
+        :param repo:
+        :param revs_int:
+        :param repo_size:
+        :param size:
+        :param p:
+        """
+        if not revs_int:
+            c.jsdata = json.dumps([])
+            return
+
+        data = []
+        revs = revs_int
+
+        dag = _dagwalker(repo, revs, repo.alias)
+        dag = _colored(dag)
+        for (id, type, ctx, vtx, edges) in dag:
+            data.append(['', vtx, edges])
+
+        c.jsdata = json.dumps(data)
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
+    def index(self, repo_name, revision=None, f_path=None):
         limit = 100
         default = 20
         if request.GET.get('size'):
@@ -65,20 +108,33 b' class ChangelogController(BaseRepoContro'
         c.size = max(c.size, 1)
         p = safe_int(request.GET.get('page', 1), 1)
         branch_name = request.GET.get('branch', None)
+        c.changelog_for_path = f_path
         try:
-            if branch_name:
-                collection = [z for z in
-                              c.rhodecode_repo.get_changesets(start=0,
-                                                    branch_name=branch_name)]
-                c.total_cs = len(collection)
+
+            if f_path:
+                log.debug('generating changelog for path %s' % f_path)
+                # get the history for the file !
+                tip_cs = c.rhodecode_repo.get_changeset()
+                try:
+                    collection = tip_cs.get_file_history(f_path)
+                except (NodeDoesNotExistError, ChangesetError):
+                    #this node is not present at tip !
+                    try:
+                        cs = self.__get_cs_or_redirect(revision, repo_name)
+                        collection = cs.get_file_history(f_path)
+                    except RepositoryError, e:
+                        h.flash(str(e), category='warning')
+                        redirect(h.url('changelog_home', repo_name=repo_name))
+                collection = list(reversed(collection))
             else:
-                collection = c.rhodecode_repo
-                c.total_cs = len(c.rhodecode_repo)
+                collection = c.rhodecode_repo.get_changesets(start=0,
+                                                        branch_name=branch_name)
+            c.total_cs = len(collection)
 
             c.pagination = RepoPage(collection, page=p, item_count=c.total_cs,
-                                    items_per_page=c.size, branch=branch_name)
+                                    items_per_page=c.size, branch=branch_name,)
             collection = list(c.pagination)
-            page_revisions = [x.raw_id for x in collection]
+            page_revisions = [x.raw_id for x in c.pagination]
             c.comments = c.rhodecode_db_repo.get_comments(page_revisions)
             c.statuses = c.rhodecode_db_repo.statuses(page_revisions)
         except (EmptyRepositoryError), e:
@@ -89,37 +145,31 b' class ChangelogController(BaseRepoContro'
             h.flash(str(e), category='error')
             return redirect(url('changelog_home', repo_name=c.repo_name))
 
-        self._graph(c.rhodecode_repo, collection, c.total_cs, c.size, p)
-
         c.branch_name = branch_name
         c.branch_filters = [('', _('All Branches'))] + \
             [(k, k) for k in c.rhodecode_repo.branches.keys()]
+        _revs = []
+        if not f_path:
+            _revs = [x.revision for x in c.pagination]
+        self._graph(c.rhodecode_repo, _revs, c.total_cs, c.size, p)
 
         return render('changelog/changelog.html')
 
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     def changelog_details(self, cs):
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             c.cs = c.rhodecode_repo.get_changeset(cs)
             return render('changelog/changelog_details.html')
-
-    def _graph(self, repo, collection, repo_size, size, p):
-        """
-        Generates a DAG graph for mercurial
+        raise HTTPNotFound()
 
-        :param repo: repo instance
-        :param size: number of commits to show
-        :param p: page number
-        """
-        if not collection:
-            c.jsdata = json.dumps([])
-            return
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
+    def changelog_summary(self, repo_name):
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
+            _load_changelog_summary()
 
-        data = []
-        revs = [x.revision for x in collection]
-
-        dag = _dagwalker(repo, revs, repo.alias)
-        dag = _colored(dag)
-        for (id, type, ctx, vtx, edges) in dag:
-            data.append(['', vtx, edges])
-
-        c.jsdata = json.dumps(data)
+            return render('changelog/changelog_summary_data.html')
+        raise HTTPNotFound()

rhodecode/controllers/changeset.py

@@ -37,7 +37,8 b' from rhodecode.lib.vcs.exceptions import'
     ChangesetDoesNotExistError
 
 import rhodecode.lib.helpers as h
-from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
+from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\
+    NotAnonymous
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import action_logger
 from rhodecode.lib.compat import OrderedDict
@@ -169,9 +170,6 b' def _context_url(GET, fileid=None):'
 
 class ChangesetController(BaseRepoController):
 
-    @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
-                                   'repository.admin')
     def __before__(self):
         super(ChangesetController, self).__before__()
         c.affected_files_cut_off = 60
@@ -179,7 +177,7 b' class ChangesetController(BaseRepoContro'
         c.users_array = repo_model.get_users_js()
         c.users_groups_array = repo_model.get_users_groups_js()
 
-    def index(self, revision, method='show'):
+    def _index(self, revision, method):
         c.anchor_url = anchor_url
         c.ignorews_url = _ignorews_url
         c.context_url = _context_url
@@ -236,7 +234,7 b' class ChangesetController(BaseRepoContro'
                 # show comments from them
 
                 prs = set([x.pull_request for x in
-                           filter(lambda x: x.pull_request != None, st)])
+                           filter(lambda x: x.pull_request is not None, st)])
 
                 for pr in prs:
                     c.comments.extend(pr.comments)
@@ -267,9 +265,8 b' class ChangesetController(BaseRepoContro'
                     c.limited_diff = True
                 for f in _parsed:
                     st = f['stats']
-                    if st[0] != 'b':
-                        c.lines_added += st[0]
-                        c.lines_deleted += st[1]
+                    c.lines_added += st['added']
+                    c.lines_deleted += st['deleted']
                     fid = h.FID(changeset.raw_id, f['filename'])
                     diff = diff_processor.as_html(enable_comments=enable_comments,
                                                   parsed_lines=[f])
@@ -311,15 +308,34 b' class ChangesetController(BaseRepoContro'
             else:
                 return render('changeset/changeset_range.html')
 
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
+    def index(self, revision, method='show'):
+        return self._index(revision, method=method)
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     def changeset_raw(self, revision):
-        return self.index(revision, method='raw')
+        return self._index(revision, method='raw')
 
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     def changeset_patch(self, revision):
-        return self.index(revision, method='patch')
+        return self._index(revision, method='patch')
 
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     def changeset_download(self, revision):
-        return self.index(revision, method='download')
+        return self._index(revision, method='download')
 
+    @LoginRequired()
+    @NotAnonymous()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     @jsonify
     def comment(self, repo_name, revision):
         status = request.POST.get('changeset_status')
@@ -382,6 +398,22 b' class ChangesetController(BaseRepoContro'
 
         return data
 
+    @LoginRequired()
+    @NotAnonymous()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
+    def preview_comment(self):
+        if not request.environ.get('HTTP_X_PARTIAL_XHR'):
+            raise HTTPBadRequest()
+        text = request.POST.get('text')
+        if text:
+            return h.rst_w_mentions(text)
+        return ''
+
+    @LoginRequired()
+    @NotAnonymous()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     @jsonify
     def delete_comment(self, repo_name, comment_id):
         co = ChangesetComment.get(comment_id)
@@ -393,6 +425,9 b' class ChangesetController(BaseRepoContro'
         else:
             raise HTTPForbidden()
 
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     @jsonify
     def changeset_info(self, repo_name, revision):
         if request.is_xhr:

rhodecode/controllers/compare.py

@@ -23,8 +23,10 b''
 #
 # 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 re
 
 from webob.exc import HTTPNotFound
 from pylons import request, response, session, tmpl_context as c, url
@@ -32,25 +34,23 b' from pylons.controllers.util import abor'
 from pylons.i18n.translation import _
 
 from rhodecode.lib.vcs.exceptions import EmptyRepositoryError, RepositoryError
+from rhodecode.lib.vcs.utils import safe_str
+from rhodecode.lib.vcs.utils.hgcompat import scmutil
 from rhodecode.lib import helpers as h
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib import diffs
+from rhodecode.lib import diffs, unionrepo
 
 from rhodecode.model.db import Repository
-from rhodecode.model.pull_request import PullRequestModel
 from webob.exc import HTTPBadRequest
 from rhodecode.lib.diffs import LimitedDiffContainer
-from rhodecode.lib.vcs.backends.base import EmptyChangeset
+
 
 log = logging.getLogger(__name__)
 
 
 class CompareController(BaseRepoController):
 
-    @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
-                                   'repository.admin')
     def __before__(self):
         super(CompareController, self).__before__()
 
@@ -82,6 +82,81 b' class CompareController(BaseRepoControll'
                 redirect(h.url('summary_home', repo_name=repo.repo_name))
             raise HTTPBadRequest()
 
+    def _get_changesets(self, alias, org_repo, org_ref, other_repo, other_ref, merge):
+        """
+        Returns a list of changesets that can be merged from org_repo@org_ref
+        to other_repo@other_ref ... and the ancestor that would be used for merge
+
+        :param org_repo:
+        :param org_ref:
+        :param other_repo:
+        :param other_ref:
+        :param tmp:
+        """
+
+        ancestor = None
+
+        if alias == 'hg':
+            # lookup up the exact node id
+            _revset_predicates = {
+                    'branch': 'branch',
+                    'book': 'bookmark',
+                    'tag': 'tag',
+                    'rev': 'id',
+                }
+
+            org_rev_spec = "max(%s(%%s))" % _revset_predicates[org_ref[0]]
+            org_revs = org_repo._repo.revs(org_rev_spec, safe_str(org_ref[1]))
+            org_rev = org_repo._repo[org_revs[-1] if org_revs else -1].hex()
+
+            other_revs_spec = "max(%s(%%s))" % _revset_predicates[other_ref[0]]
+            other_revs = other_repo._repo.revs(other_revs_spec, safe_str(other_ref[1]))
+            other_rev = other_repo._repo[other_revs[-1] if other_revs else -1].hex()
+
+            #case two independent repos
+            if org_repo != other_repo:
+                hgrepo = unionrepo.unionrepository(other_repo.baseui,
+                                                   other_repo.path,
+                                                   org_repo.path)
+                # all the changesets we are looking for will be in other_repo,
+                # so rev numbers from hgrepo can be used in other_repo
+
+            #no remote compare do it on the same repository
+            else:
+                hgrepo = other_repo._repo
+
+            if merge:
+                revs = hgrepo.revs("ancestors(id(%s)) and not ancestors(id(%s)) and not id(%s)",
+                                   other_rev, org_rev, org_rev)
+
+                ancestors = hgrepo.revs("ancestor(id(%s), id(%s))", org_rev, other_rev)
+                if ancestors:
+                    # pick arbitrary ancestor - but there is usually only one
+                    ancestor = hgrepo[ancestors[0]].hex()
+            else:
+                # TODO: have both + and - changesets
+                revs = hgrepo.revs("id(%s) :: id(%s) - id(%s)",
+                                   org_rev, other_rev, org_rev)
+
+            changesets = [other_repo.get_changeset(rev) for rev in revs]
+
+        elif alias == 'git':
+            if org_repo != other_repo:
+                raise Exception('Comparing of different GIT repositories is not'
+                                'allowed. Got %s != %s' % (org_repo, other_repo))
+
+            so, se = org_repo.run_git_command(
+                'log --reverse --pretty="format: %%H" -s -p %s..%s'
+                    % (org_ref[1], other_ref[1])
+            )
+            changesets = [org_repo.get_changeset(cs)
+                          for cs in re.findall(r'[0-9a-fA-F]{40}', so)]
+
+        return changesets, ancestor
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     def index(self, org_ref_type, org_ref, other_ref_type, other_ref):
         # org_ref will be evaluated in org_repo
         org_repo = c.rhodecode_db_repo.repo_name
@@ -140,13 +215,17 b' class CompareController(BaseRepoControll'
         c.org_ref_type = org_ref[0]
         c.other_ref_type = other_ref[0]
 
-        c.cs_ranges, c.ancestor = PullRequestModel().get_compare_data(
-            org_repo, org_ref, other_repo, other_ref, merge)
+        c.cs_ranges, c.ancestor = self._get_changesets(org_repo.scm_instance.alias,
+                                                       org_repo.scm_instance, org_ref,
+                                                       other_repo.scm_instance, other_ref,
+                                                       merge)
 
         c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in
                                                    c.cs_ranges])
+        if not c.ancestor:
+            log.warning('Unable to find ancestor revision')
+
         if partial:
-            assert c.ancestor
             return render('compare/compare_cs.html')
 
         if c.ancestor:
@@ -161,9 +240,11 b' class CompareController(BaseRepoControll'
 
         diff_limit = self.cut_off_limit if not c.fulldiff else None
 
-        _diff = diffs.differ(org_repo, org_ref, other_repo, other_ref)
+        log.debug('running diff between %s and %s in %s'
+                  % (org_ref, other_ref, org_repo.scm_instance.path))
+        txtdiff = org_repo.scm_instance.get_diff(rev1=safe_str(org_ref[1]), rev2=safe_str(other_ref[1]))
 
-        diff_processor = diffs.DiffProcessor(_diff or '', format='gitdiff',
+        diff_processor = diffs.DiffProcessor(txtdiff or '', format='gitdiff',
                                              diff_limit=diff_limit)
         _parsed = diff_processor.prepare()
 
@@ -177,12 +258,12 b' class CompareController(BaseRepoControll'
         c.lines_deleted = 0
         for f in _parsed:
             st = f['stats']
-            if st[0] != 'b':
-                c.lines_added += st[0]
-                c.lines_deleted += st[1]
+            if not st['binary']:
+                c.lines_added += st['added']
+                c.lines_deleted += st['deleted']
             fid = h.FID('', f['filename'])
             c.files.append([fid, f['operation'], f['filename'], f['stats']])
-            diff = diff_processor.as_html(enable_comments=False, parsed_lines=[f])
-            c.changes[fid] = [f['operation'], f['filename'], diff]
+            htmldiff = diff_processor.as_html(enable_comments=False, parsed_lines=[f])
+            c.changes[fid] = [f['operation'], f['filename'], htmldiff]
 
         return render('compare/compare_diff.html')

rhodecode/controllers/error.py

@@ -87,8 +87,8 b' class ErrorController(BaseController):'
         return fapp(request.environ, self.start_response)
 
     def get_error_explanation(self, code):
-        ''' get the error explanations of int codes
-            [400, 401, 403, 404, 500]'''
+        """ get the error explanations of int codes
+            [400, 401, 403, 404, 500]"""
         try:
             code = int(code)
         except Exception:

rhodecode/controllers/feed.py

@@ -76,8 +76,8 b' class FeedController(BaseRepoController)'
             limited_diff = True
 
         for st in _parsed:
-            st.update({'added': st['stats'][0],
-                       'removed': st['stats'][1]})
+            st.update({'added': st['stats']['added'],
+                       'removed': st['stats']['deleted']})
             changes.append('\n %(operation)s %(filename)s '
                            '(%(added)s lines added, %(removed)s lines removed)'
                             % st)
@@ -87,9 +87,8 b' class FeedController(BaseRepoController)'
         return diff_processor, changes
 
     def __get_desc(self, cs):
-        desc_msg = []
-        desc_msg.append((_('%s committed on %s')
-                         % (h.person(cs.author), h.fmt_date(cs.date))) + '<br/>')
+        desc_msg = [(_('%s committed on %s')
+                     % (h.person(cs.author), h.fmt_date(cs.date))) + '<br/>']
         #branches, tags, bookmarks
         if cs.branch:
             desc_msg.append('branch: %s<br/>' % cs.branch)
@@ -118,7 +117,7 b' class FeedController(BaseRepoController)'
         """Produce an atom-1.0 feed via feedgenerator module"""
 
         @cache_region('long_term')
-        def _get_feed_from_cache(key):
+        def _get_feed_from_cache(key, kind):
             feed = Atom1Feed(
                  title=self.title % repo_name,
                  link=url('summary_home', repo_name=repo_name,
@@ -140,18 +139,17 b' class FeedController(BaseRepoController)'
             response.content_type = feed.mime_type
             return feed.writeString('utf-8')
 
-        key = repo_name + '_ATOM'
-        inv = CacheInvalidation.invalidate(key)
-        if inv is not None:
-            region_invalidate(_get_feed_from_cache, None, key)
-            CacheInvalidation.set_valid(inv.cache_key)
-        return _get_feed_from_cache(key)
+        kind = 'ATOM'
+        valid = CacheInvalidation.test_and_set_valid(repo_name, kind)
+        if not valid:
+            region_invalidate(_get_feed_from_cache, None, repo_name, kind)
+        return _get_feed_from_cache(repo_name, kind)
 
     def rss(self, repo_name):
         """Produce an rss2 feed via feedgenerator module"""
 
         @cache_region('long_term')
-        def _get_feed_from_cache(key):
+        def _get_feed_from_cache(key, kind):
             feed = Rss201rev2Feed(
                 title=self.title % repo_name,
                 link=url('summary_home', repo_name=repo_name,
@@ -173,9 +171,8 b' class FeedController(BaseRepoController)'
             response.content_type = feed.mime_type
             return feed.writeString('utf-8')
 
-        key = repo_name + '_RSS'
-        inv = CacheInvalidation.invalidate(key)
-        if inv is not None:
-            region_invalidate(_get_feed_from_cache, None, key)
-            CacheInvalidation.set_valid(inv.cache_key)
-        return _get_feed_from_cache(key)
+        kind = 'RSS'
+        valid = CacheInvalidation.test_and_set_valid(repo_name, kind)
+        if not valid:
+            region_invalidate(_get_feed_from_cache, None, repo_name, kind)
+        return _get_feed_from_cache(repo_name, kind)

rhodecode/controllers/files.py

@@ -32,7 +32,7 b' import shutil'
 from pylons import request, response, tmpl_context as c, url
 from pylons.i18n.translation import _
 from pylons.controllers.util import redirect
-from rhodecode.lib.utils import jsonify
+from rhodecode.lib.utils import jsonify, action_logger
 
 from rhodecode.lib import diffs
 from rhodecode.lib import helpers as h
@@ -57,6 +57,7 b' from rhodecode.model.db import Repositor'
 from rhodecode.controllers.changeset import anchor_url, _ignorews_url,\
     _context_url, get_line_ctx, get_ignore_ws
 from webob.exc import HTTPNotFound
+from rhodecode.lib.exceptions import NonRelativePathError
 
 
 log = logging.getLogger(__name__)
@@ -303,7 +304,7 b' class FilesController(BaseRepoController'
             first_line = sl[0] if sl else ''
             # modes:  0 - Unix, 1 - Mac, 2 - DOS
             mode = detect_mode(first_line, 0)
-            content = convert_line_endings(r_post.get('content'), mode)
+            content = convert_line_endings(r_post.get('content', ''), mode)
 
             message = r_post.get('message') or c.default_message
             author = self.rhodecode_user.full_contact
@@ -352,11 +353,11 b' class FilesController(BaseRepoController'
 
         if r_post:
             unix_mode = 0
-            content = convert_line_endings(r_post.get('content'), unix_mode)
+            content = convert_line_endings(r_post.get('content', ''), unix_mode)
 
             message = r_post.get('message') or c.default_message
             filename = r_post.get('filename')
-            location = r_post.get('location')
+            location = r_post.get('location', '')
             file_obj = r_post.get('upload_file', None)
 
             if file_obj is not None and hasattr(file_obj, 'filename'):
@@ -371,25 +372,32 b' class FilesController(BaseRepoController'
                 h.flash(_('No filename'), category='warning')
                 return redirect(url('changeset_home', repo_name=c.repo_name,
                                     revision='tip'))
-            if location.startswith('/') or location.startswith('.') or '../' in location:
-                h.flash(_('Location must be relative path and must not '
-                          'contain .. in path'), category='warning')
-                return redirect(url('changeset_home', repo_name=c.repo_name,
-                                    revision='tip'))
-            if location:
-                location = os.path.normpath(location)
+            #strip all crap out of file, just leave the basename
             filename = os.path.basename(filename)
             node_path = os.path.join(location, filename)
             author = self.rhodecode_user.full_contact
 
             try:
-                self.scm_model.create_node(repo=c.rhodecode_repo,
-                                           repo_name=repo_name, cs=c.cs,
-                                           user=self.rhodecode_user.user_id,
-                                           author=author, message=message,
-                                           content=content, f_path=node_path)
+                nodes = {
+                    node_path: {
+                        'content': content
+                    }
+                }
+                self.scm_model.create_nodes(
+                    user=c.rhodecode_user.user_id, repo=c.rhodecode_db_repo,
+                    message=message,
+                    nodes=nodes,
+                    parent_cs=c.cs,
+                    author=author,
+                )
+
                 h.flash(_('Successfully committed to %s') % node_path,
                         category='success')
+            except NonRelativePathError, e:
+                h.flash(_('Location must be relative path and must not '
+                          'contain .. in path'), category='warning')
+                return redirect(url('changeset_home', repo_name=c.repo_name,
+                                    revision='tip'))
             except (NodeError, NodeAlreadyExistsError), e:
                 h.flash(_(e), category='error')
             except Exception:
@@ -484,7 +492,10 b' class FilesController(BaseRepoController'
                         os.remove(archive)
                     break
                 yield data
-
+        # store download action
+        action_logger(user=c.rhodecode_user,
+                      action='user_downloaded_archive:%s' % (archive_name),
+                      repo=repo_name, ipaddr=self.ip_addr, commit=True)
         response.content_disposition = str('attachment; filename=%s' % (archive_name))
         response.content_type = str(content_type)
         return get_chunked_archive(archive)

rhodecode/controllers/followers.py

@@ -37,12 +37,12 b' log = logging.getLogger(__name__)'
 
 class FollowersController(BaseRepoController):
 
+    def __before__(self):
+        super(FollowersController, self).__before__()
+
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
-    def __before__(self):
-        super(FollowersController, self).__before__()
-
     def followers(self, repo_name):
         p = safe_int(request.GET.get('page', 1), 1)
         repo_id = c.rhodecode_db_repo.repo_id

rhodecode/controllers/forks.py

@@ -42,7 +42,7 b' from rhodecode.model.db import Repositor'
     RhodeCodeUi
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.forms import RepoForkForm
-from rhodecode.model.scm import ScmModel, GroupList
+from rhodecode.model.scm import ScmModel, RepoGroupList
 from rhodecode.lib.utils2 import safe_int
 
 log = logging.getLogger(__name__)
@@ -50,12 +50,11 b' log = logging.getLogger(__name__)'
 
 class ForksController(BaseRepoController):
 
-    @LoginRequired()
     def __before__(self):
         super(ForksController, self).__before__()
 
     def __load_defaults(self):
-        acl_groups = GroupList(RepoGroup.query().all(),
+        acl_groups = RepoGroupList(RepoGroup.query().all(),
                                perm_set=['group.write', 'group.admin'])
         c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
@@ -78,7 +77,7 b' class ForksController(BaseRepoController'
             h.not_mapped_error(repo_name)
             return redirect(url('repos'))
 
-        c.default_user_id = User.get_by_username('default').user_id
+        c.default_user_id = User.get_default_user().user_id
         c.in_public_journal = UserFollowing.query()\
             .filter(UserFollowing.user_id == c.default_user_id)\
             .filter(UserFollowing.follows_repository == c.repo_info).scalar()
@@ -107,6 +106,7 b' class ForksController(BaseRepoController'
 
         return defaults
 
+    @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def forks(self, repo_name):
@@ -128,6 +128,7 b' class ForksController(BaseRepoController'
 
         return render('/forks/forks.html')
 
+    @LoginRequired()
     @NotAnonymous()
     @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository')
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
@@ -147,6 +148,7 b' class ForksController(BaseRepoController'
             force_defaults=False
         )
 
+    @LoginRequired()
     @NotAnonymous()
     @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository')
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

rhodecode/controllers/home.py

@@ -32,7 +32,7 b' from sqlalchemy.sql.expression import fu'
 
 import rhodecode
 from rhodecode.lib import helpers as h
-from rhodecode.lib.ext_json import json
+from rhodecode.lib.compat import json
 from rhodecode.lib.auth import LoginRequired
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import Repository
@@ -44,30 +44,27 b' log = logging.getLogger(__name__)'
 
 class HomeController(BaseController):
 
-    @LoginRequired()
     def __before__(self):
         super(HomeController, self).__before__()
 
+    @LoginRequired()
     def index(self):
         c.groups = self.scm_model.get_repos_groups()
         c.group = None
 
-        if not c.visual.lightweight_dashboard:
-            c.repos_list = self.scm_model.get_repos()
-        ## lightweight version of dashboard
-        else:
-            c.repos_list = Repository.query()\
-                            .filter(Repository.group_id == None)\
-                            .order_by(func.lower(Repository.repo_name))\
-                            .all()
+        c.repos_list = Repository.query()\
+                        .filter(Repository.group_id == None)\
+                        .order_by(func.lower(Repository.repo_name))\
+                        .all()
 
-            repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list,
-                                                       admin=False)
-            #json used to render the grid
-            c.data = json.dumps(repos_data)
+        repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list,
+                                                   admin=False)
+        #json used to render the grid
+        c.data = json.dumps(repos_data)
 
         return render('/index.html')
 
+    @LoginRequired()
     def repo_switcher(self):
         if request.is_xhr:
             all_repos = Repository.query().order_by(Repository.repo_name).all()
@@ -78,6 +75,7 b' class HomeController(BaseController):'
         else:
             raise HTTPBadRequest()
 
+    @LoginRequired()
     def branch_tag_switcher(self, repo_name):
         if request.is_xhr:
             c.rhodecode_db_repo = Repository.get_by_repo_name(c.repo_name)

rhodecode/controllers/journal.py

@@ -29,21 +29,21 b' from sqlalchemy import or_'
 from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.expression import func
 
-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 _
 
+from rhodecode.controllers.admin.admin import _journal_filter
+from rhodecode.model.db import UserLog, UserFollowing, Repository, User
+from rhodecode.model.meta import Session
+from rhodecode.model.repo import RepoModel
 import rhodecode.lib.helpers as h
+from rhodecode.lib.helpers import Page
 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 rhodecode.lib.utils2 import safe_int, AttributeDict
-from rhodecode.controllers.admin.admin import _journal_filter
-from rhodecode.model.repo import RepoModel
 from rhodecode.lib.compat import json
 
 log = logging.getLogger(__name__)
@@ -58,6 +58,137 b' class JournalController(BaseController):'
         self.feed_nr = 20
         c.search_term = request.GET.get('filter')
 
+    def _get_daily_aggregate(self, journal):
+        groups = []
+        for k, g in groupby(journal, lambda x: x.action_as_day):
+            user_group = []
+            #groupby username if it's a present value, else fallback to journal username
+            for _, g2 in groupby(list(g), lambda x: x.user.username if x.user else x.username):
+                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
+            try:
+                journal = _journal_filter(journal, c.search_term)
+            except Exception:
+                # we want this to crash for now
+                raise
+            journal = journal.filter(filtering_criterion)\
+                        .order_by(UserLog.action_date.desc())
+        else:
+            journal = []
+
+        return journal
+
+    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]:
+            user = entry.user
+            if user is None:
+                #fix deleted users
+                user = AttributeDict({'short_contact': entry.username,
+                                      'email': '',
+                                      'full_contact': ''})
+            action, action_extra, ico = h.action_parser(entry, feed=True)
+            title = "%s - %s %s" % (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=user.email,
+                          author_name=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]:
+            user = entry.user
+            if user is None:
+                #fix deleted users
+                user = AttributeDict({'short_contact': entry.username,
+                                      'email': '',
+                                      'full_contact': ''})
+            action, action_extra, ico = h.action_parser(entry, feed=True)
+            title = "%s - %s %s" % (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=user.email,
+                          author_name=user.full_contact,
+                          description=desc)
+
+        response.content_type = feed.mime_type
+        return feed.writeString('utf-8')
+
     @LoginRequired()
     @NotAnonymous()
     def index(self):
@@ -172,51 +303,6 b' class JournalController(BaseController):'
             .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 = []
-            #groupby username if it's a present value, else fallback to journal username
-            for _, g2 in groupby(list(g), lambda x: x.user.username if x.user else x.username):
-                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
-            try:
-                journal = _journal_filter(journal, c.search_term)
-            except Exception:
-                # we want this to crash for now
-                raise
-            journal = journal.filter(filtering_criterion)\
-                        .order_by(UserLog.action_date.desc())
-        else:
-            journal = []
-
-        return journal
-
     @LoginRequired()
     @NotAnonymous()
     def toggle_following(self):
@@ -268,92 +354,6 b' class JournalController(BaseController):'
             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]:
-            user = entry.user
-            if user is None:
-                #fix deleted users
-                user = AttributeDict({'short_contact': entry.username,
-                                      'email': '',
-                                      'full_contact': ''})
-            action, action_extra, ico = h.action_parser(entry, feed=True)
-            title = "%s - %s %s" % (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=user.email,
-                          author_name=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]:
-            user = entry.user
-            if user is None:
-                #fix deleted users
-                user = AttributeDict({'short_contact': entry.username,
-                                      'email': '',
-                                      'full_contact': ''})
-            action, action_extra, ico = h.action_parser(entry, feed=True)
-            title = "%s - %s %s" % (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=user.email,
-                          author_name=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):
         """

rhodecode/controllers/login.py

@@ -126,7 +126,7 b' class LoginController(BaseController):'
     @HasPermissionAnyDecorator('hg.admin', 'hg.register.auto_activate',
                                'hg.register.manual_activate')
     def register(self):
-        c.auto_active = 'hg.register.auto_activate' in User.get_by_username('default')\
+        c.auto_active = 'hg.register.auto_activate' in User.get_default_user()\
             .AuthUser.permissions['global']
 
         if request.POST:

rhodecode/controllers/pullrequests.py

@@ -30,8 +30,8 b' from webob.exc import HTTPNotFound, HTTP'
 from collections import defaultdict
 from itertools import groupby
 
-from pylons import request, response, session, tmpl_context as c, url
-from pylons.controllers.util import abort, redirect
+from pylons import request, tmpl_context as c, url
+from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 
 from rhodecode.lib.compat import json
@@ -42,18 +42,16 b' from rhodecode.lib.helpers import Page'
 from rhodecode.lib import helpers as h
 from rhodecode.lib import diffs
 from rhodecode.lib.utils import action_logger, jsonify
+from rhodecode.lib.vcs.utils import safe_str
 from rhodecode.lib.vcs.exceptions import EmptyRepositoryError
-from rhodecode.lib.vcs.backends.base import EmptyChangeset
 from rhodecode.lib.diffs import LimitedDiffContainer
-from rhodecode.model.db import User, PullRequest, ChangesetStatus,\
-    ChangesetComment
+from rhodecode.model.db import  PullRequest, ChangesetStatus, ChangesetComment
 from rhodecode.model.pull_request import PullRequestModel
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.comment import ChangesetCommentsModel
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.forms import PullRequestForm
-from mercurial import scmutil
 from rhodecode.lib.utils2 import safe_int
 
 log = logging.getLogger(__name__)
@@ -61,47 +59,67 b' log = logging.getLogger(__name__)'
 
 class PullrequestsController(BaseRepoController):
 
-    @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
-                                   'repository.admin')
     def __before__(self):
         super(PullrequestsController, self).__before__()
         repo_model = RepoModel()
         c.users_array = repo_model.get_users_js()
         c.users_groups_array = repo_model.get_users_groups_js()
 
-    def _get_repo_refs(self, repo, rev=None, branch_rev=None):
+    def _get_repo_refs(self, repo, rev=None, branch=None, branch_rev=None):
         """return a structure with repo's interesting changesets, suitable for
-        the selectors in pullrequest.html"""
+        the selectors in pullrequest.html
 
+        rev: a revision that must be in the list somehow and selected by default
+        branch: a branch that must be in the list and selected by default - even if closed
+        branch_rev: a revision of which peers should be preferred and available."""
         # list named branches that has been merged to this named branch - it should probably merge back
         peers = []
+
+        if rev:
+            rev = safe_str(rev)
+
+        if branch:
+            branch = safe_str(branch)
+
         if branch_rev:
+            branch_rev = safe_str(branch_rev)
             # not restricting to merge() would also get branch point and be better
             # (especially because it would get the branch point) ... but is currently too expensive
-            revs = ["sort(parents(branch(id('%s')) and merge()) - branch(id('%s')))" %
-                    (branch_rev, branch_rev)]
             otherbranches = {}
-            for i in scmutil.revrange(repo._repo, revs):
+            for i in repo._repo.revs(
+                "sort(parents(branch(id(%s)) and merge()) - branch(id(%s)))",
+                branch_rev, branch_rev):
                 cs = repo.get_changeset(i)
                 otherbranches[cs.branch] = cs.raw_id
-            for branch, node in otherbranches.iteritems():
-                selected = 'branch:%s:%s' % (branch, node)
-                peers.append((selected, branch))
+            for abranch, node in otherbranches.iteritems():
+                selected = 'branch:%s:%s' % (abranch, node)
+                peers.append((selected, abranch))
 
         selected = None
+
         branches = []
-        for branch, branchrev in repo.branches.iteritems():
-            n = 'branch:%s:%s' % (branch, branchrev)
-            branches.append((n, branch))
+        for abranch, branchrev in repo.branches.iteritems():
+            n = 'branch:%s:%s' % (abranch, branchrev)
+            branches.append((n, abranch))
             if rev == branchrev:
                 selected = n
+            if branch == abranch:
+                selected = n
+                branch = None
+        if branch: # branch not in list - it is probably closed
+            revs = repo._repo.revs('max(branch(%s))', branch)
+            if revs:
+                cs = repo.get_changeset(revs[0])
+                selected = 'branch:%s:%s' % (branch, cs.raw_id)
+                branches.append((selected, branch))
+
         bookmarks = []
         for bookmark, bookmarkrev in repo.bookmarks.iteritems():
             n = 'book:%s:%s' % (bookmark, bookmarkrev)
             bookmarks.append((n, bookmark))
             if rev == bookmarkrev:
                 selected = n
+
         tags = []
         for tag, tagrev in repo.tags.iteritems():
             n = 'tag:%s:%s' % (tag, tagrev)
@@ -139,6 +157,74 b' class PullrequestsController(BaseRepoCon'
                                                    pull_request.reviewers]
         return (self.rhodecode_user.admin or owner or reviewer)
 
+    def _load_compare_data(self, pull_request, enable_comments=True):
+        """
+        Load context data needed for generating compare diff
+
+        :param pull_request:
+        """
+        org_repo = pull_request.org_repo
+        (org_ref_type,
+         org_ref_name,
+         org_ref_rev) = pull_request.org_ref.split(':')
+
+        other_repo = org_repo
+        (other_ref_type,
+         other_ref_name,
+         other_ref_rev) = pull_request.other_ref.split(':')
+
+        # despite opening revisions for bookmarks/branches/tags, we always
+        # convert this to rev to prevent changes after bookmark or branch change
+        org_ref = ('rev', org_ref_rev)
+        other_ref = ('rev', other_ref_rev)
+
+        c.org_repo = org_repo
+        c.other_repo = other_repo
+
+        c.fulldiff = fulldiff = request.GET.get('fulldiff')
+
+        c.cs_ranges = [org_repo.get_changeset(x) for x in pull_request.revisions]
+
+        c.statuses = org_repo.statuses([x.raw_id for x in c.cs_ranges])
+
+        c.org_ref = org_ref[1]
+        c.org_ref_type = org_ref[0]
+        c.other_ref = other_ref[1]
+        c.other_ref_type = other_ref[0]
+
+        diff_limit = self.cut_off_limit if not fulldiff else None
+
+        # we swap org/other ref since we run a simple diff on one repo
+        log.debug('running diff between %s and %s in %s'
+                  % (other_ref, org_ref, org_repo.scm_instance.path))
+        txtdiff = org_repo.scm_instance.get_diff(rev1=safe_str(other_ref[1]), rev2=safe_str(org_ref[1]))
+
+        diff_processor = diffs.DiffProcessor(txtdiff or '', format='gitdiff',
+                                             diff_limit=diff_limit)
+        _parsed = diff_processor.prepare()
+
+        c.limited_diff = False
+        if isinstance(_parsed, LimitedDiffContainer):
+            c.limited_diff = True
+
+        c.files = []
+        c.changes = {}
+        c.lines_added = 0
+        c.lines_deleted = 0
+
+        for f in _parsed:
+            st = f['stats']
+            c.lines_added += st['added']
+            c.lines_deleted += st['deleted']
+            fid = h.FID('', f['filename'])
+            c.files.append([fid, f['operation'], f['filename'], f['stats']])
+            htmldiff = diff_processor.as_html(enable_comments=enable_comments,
+                                              parsed_lines=[f])
+            c.changes[fid] = [f['operation'], f['filename'], htmldiff]
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     def show_all(self, repo_name):
         c.pull_requests = PullRequestModel().get_all(repo_name)
         c.repo_name = repo_name
@@ -153,7 +239,10 b' class PullrequestsController(BaseRepoCon'
 
         return render('/pullrequests/pullrequest_show_all.html')
 
+    @LoginRequired()
     @NotAnonymous()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     def index(self):
         org_repo = c.rhodecode_db_repo
 
@@ -172,11 +261,12 b' class PullrequestsController(BaseRepoCon'
         # rev_start is not directly useful - its parent could however be used
         # as default for other and thus give a simple compare view
         #other_rev = request.POST.get('rev_start')
+        branch = request.GET.get('branch')
 
         c.org_repos = []
         c.org_repos.append((org_repo.repo_name, org_repo.repo_name))
         c.default_org_repo = org_repo.repo_name
-        c.org_refs, c.default_org_ref = self._get_repo_refs(org_repo.scm_instance, org_rev)
+        c.org_refs, c.default_org_ref = self._get_repo_refs(org_repo.scm_instance, rev=org_rev, branch=branch)
 
         c.other_repos = []
         other_repos_info = {}
@@ -215,7 +305,10 b' class PullrequestsController(BaseRepoCon'
 
         return render('/pullrequests/pullrequest.html')
 
+    @LoginRequired()
     @NotAnonymous()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     def create(self, repo_name):
         repo = RepoModel()._get_repo(repo_name)
         try:
@@ -236,12 +329,11 b' class PullrequestsController(BaseRepoCon'
         org_ref = 'rev:merge:%s' % _form['merge_rev']
         other_repo = _form['other_repo']
         other_ref = 'rev:ancestor:%s' % _form['ancestor_rev']
-        revisions = _form['revisions']
+        revisions = [x for x in reversed(_form['revisions'])]
         reviewers = _form['review_members']
 
         title = _form['pullrequest_title']
         description = _form['pullrequest_desc']
-
         try:
             pull_request = PullRequestModel().create(
                 self.rhodecode_user.user_id, org_repo, org_ref, other_repo,
@@ -259,7 +351,10 b' class PullrequestsController(BaseRepoCon'
         return redirect(url('pullrequest_show', repo_name=other_repo,
                             pull_request_id=pull_request.pull_request_id))
 
+    @LoginRequired()
     @NotAnonymous()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     @jsonify
     def update(self, repo_name, pull_request_id):
         pull_request = PullRequest.get_or_404(pull_request_id)
@@ -276,7 +371,10 b' class PullrequestsController(BaseRepoCon'
             return True
         raise HTTPForbidden()
 
+    @LoginRequired()
     @NotAnonymous()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     @jsonify
     def delete(self, repo_name, pull_request_id):
         pull_request = PullRequest.get_or_404(pull_request_id)
@@ -289,70 +387,9 b' class PullrequestsController(BaseRepoCon'
             return redirect(url('admin_settings_my_account', anchor='pullrequests'))
         raise HTTPForbidden()
 
-    def _load_compare_data(self, pull_request, enable_comments=True):
-        """
-        Load context data needed for generating compare diff
-
-        :param pull_request:
-        :type pull_request:
-        """
-        org_repo = pull_request.org_repo
-        (org_ref_type,
-         org_ref_name,
-         org_ref_rev) = pull_request.org_ref.split(':')
-
-        other_repo = org_repo
-        (other_ref_type,
-         other_ref_name,
-         other_ref_rev) = pull_request.other_ref.split(':')
-
-        # despite opening revisions for bookmarks/branches/tags, we always
-        # convert this to rev to prevent changes after bookmark or branch change
-        org_ref = ('rev', org_ref_rev)
-        other_ref = ('rev', other_ref_rev)
-
-        c.org_repo = org_repo
-        c.other_repo = other_repo
-
-        c.fulldiff = fulldiff = request.GET.get('fulldiff')
-
-        c.cs_ranges = [org_repo.get_changeset(x) for x in pull_request.revisions]
-
-        c.statuses = org_repo.statuses([x.raw_id for x in c.cs_ranges])
-
-        c.org_ref = org_ref[1]
-        c.org_ref_type = org_ref[0]
-        c.other_ref = other_ref[1]
-        c.other_ref_type = other_ref[0]
-
-        diff_limit = self.cut_off_limit if not fulldiff else None
-
-        #we swap org/other ref since we run a simple diff on one repo
-        _diff = diffs.differ(org_repo, other_ref, other_repo, org_ref)
-
-        diff_processor = diffs.DiffProcessor(_diff or '', format='gitdiff',
-                                             diff_limit=diff_limit)
-        _parsed = diff_processor.prepare()
-
-        c.limited_diff = False
-        if isinstance(_parsed, LimitedDiffContainer):
-            c.limited_diff = True
-
-        c.files = []
-        c.changes = {}
-        c.lines_added = 0
-        c.lines_deleted = 0
-        for f in _parsed:
-            st = f['stats']
-            if st[0] != 'b':
-                c.lines_added += st[0]
-                c.lines_deleted += st[1]
-            fid = h.FID('', f['filename'])
-            c.files.append([fid, f['operation'], f['filename'], f['stats']])
-            diff = diff_processor.as_html(enable_comments=enable_comments,
-                                          parsed_lines=[f])
-            c.changes[fid] = [f['operation'], f['filename'], diff]
-
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     def show(self, repo_name, pull_request_id):
         repo_model = RepoModel()
         c.users_array = repo_model.get_users_js()
@@ -421,7 +458,10 b' class PullrequestsController(BaseRepoCon'
         c.ancestor = None # there is one - but right here we don't know which
         return render('/pullrequests/pullrequest_show.html')
 
+    @LoginRequired()
     @NotAnonymous()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     @jsonify
     def comment(self, repo_name, pull_request_id):
         pull_request = PullRequest.get_or_404(pull_request_id)
@@ -496,7 +536,10 b' class PullrequestsController(BaseRepoCon'
 
         return data
 
+    @LoginRequired()
     @NotAnonymous()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     @jsonify
     def delete_comment(self, repo_name, comment_id):
         co = ChangesetComment.get(comment_id)

rhodecode/controllers/search.py

@@ -28,30 +28,28 b' import urllib'
 from pylons.i18n.translation import _
 from pylons import request, config, tmpl_context as c
 
+from whoosh.index import open_dir, EmptyIndexError
+from whoosh.qparser import QueryParser, QueryParserError
+from whoosh.query import Phrase, Wildcard, Term, Prefix
+from webhelpers.util import update_params
+
 from rhodecode.lib.auth import LoginRequired
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.indexers import CHGSETS_SCHEMA, SCHEMA, CHGSET_IDX_NAME, \
     IDX_NAME, WhooshResultWrapper
-
-from webhelpers.paginate import Page
-from webhelpers.util import update_params
-
-from whoosh.index import open_dir, EmptyIndexError
-from whoosh.qparser import QueryParser, QueryParserError
-from whoosh.query import Phrase, Wildcard, Term, Prefix
 from rhodecode.model.repo import RepoModel
 from rhodecode.lib.utils2 import safe_str, safe_int
-
+from rhodecode.lib.helpers import Page
 
 log = logging.getLogger(__name__)
 
 
 class SearchController(BaseRepoController):
 
-    @LoginRequired()
     def __before__(self):
         super(SearchController, self).__before__()
 
+    @LoginRequired()
     def index(self, repo_name=None):
         c.repo_name = repo_name
         c.formated_results = []

rhodecode/controllers/summary.py

@@ -55,6 +55,7 b' from rhodecode.lib.celerylib.tasks impor'
 from rhodecode.lib.helpers import RepoPage
 from rhodecode.lib.compat import json, OrderedDict
 from rhodecode.lib.vcs.nodes import FileNode
+from rhodecode.controllers.changelog import _load_changelog_summary
 
 log = logging.getLogger(__name__)
 
@@ -65,23 +66,76 b" README_FILES = [''.join([x[0][0], x[1][0"
 
 class SummaryController(BaseRepoController):
 
-    @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
-                                   'repository.admin')
     def __before__(self):
         super(SummaryController, self).__before__()
 
+    def _get_download_links(self, repo):
+
+        download_l = []
+
+        branches_group = ([], _("Branches"))
+        tags_group = ([], _("Tags"))
+
+        for name, chs in c.rhodecode_repo.branches.items():
+            #chs = chs.split(':')[-1]
+            branches_group[0].append((chs, name),)
+        download_l.append(branches_group)
+
+        for name, chs in c.rhodecode_repo.tags.items():
+            #chs = chs.split(':')[-1]
+            tags_group[0].append((chs, name),)
+        download_l.append(tags_group)
+
+        return download_l
+
+    def __get_readme_data(self, db_repo):
+        repo_name = db_repo.repo_name
+
+        @cache_region('long_term')
+        def _get_readme_from_cache(key, kind):
+            readme_data = None
+            readme_file = None
+            log.debug('Looking for README file')
+            try:
+                # get's the landing revision! or tip if fails
+                cs = db_repo.get_landing_changeset()
+                if isinstance(cs, EmptyChangeset):
+                    raise EmptyRepositoryError()
+                renderer = MarkupRenderer()
+                for f in README_FILES:
+                    try:
+                        readme = cs.get_node(f)
+                        if not isinstance(readme, FileNode):
+                            continue
+                        readme_file = f
+                        log.debug('Found README file `%s` rendering...' %
+                                  readme_file)
+                        readme_data = renderer.render(readme.content, f)
+                        break
+                    except NodeDoesNotExistError:
+                        continue
+            except ChangesetError:
+                log.error(traceback.format_exc())
+                pass
+            except EmptyRepositoryError:
+                pass
+            except Exception:
+                log.error(traceback.format_exc())
+
+            return readme_data, readme_file
+
+        kind = 'README'
+        valid = CacheInvalidation.test_and_set_valid(repo_name, kind)
+        if not valid:
+            region_invalidate(_get_readme_from_cache, None, repo_name, kind)
+        return _get_readme_from_cache(repo_name, kind)
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     def index(self, repo_name):
         c.dbrepo = dbrepo = c.rhodecode_db_repo
-
-        def url_generator(**kw):
-            return url('shortlog_home', repo_name=repo_name, size=10, **kw)
-
-        c.repo_changesets = RepoPage(c.rhodecode_repo, page=1,
-                                     items_per_page=10, url=url_generator)
-        page_revisions = [x.raw_id for x in list(c.repo_changesets)]
-        c.statuses = c.rhodecode_db_repo.statuses(page_revisions)
-
+        _load_changelog_summary()
         if self.rhodecode_user.username == 'default':
             # for default(anonymous) user we don't need to pass credentials
             username = ''
@@ -114,19 +168,6 b' class SummaryController(BaseRepoControll'
 
         c.clone_repo_url = uri
         c.clone_repo_url_id = uri_id
-        c.repo_tags = OrderedDict()
-        for name, hash_ in c.rhodecode_repo.tags.items()[:10]:
-            try:
-                c.repo_tags[name] = c.rhodecode_repo.get_changeset(hash_)
-            except ChangesetError:
-                c.repo_tags[name] = EmptyChangeset(hash_)
-
-        c.repo_branches = OrderedDict()
-        for name, hash_ in c.rhodecode_repo.branches.items()[:10]:
-            try:
-                c.repo_branches[name] = c.rhodecode_repo.get_changeset(hash_)
-            except ChangesetError:
-                c.repo_branches[name] = EmptyChangeset(hash_)
 
         td = date.today() + timedelta(days=1)
         td_1m = td - timedelta(days=calendar.mdays[td.month])
@@ -189,72 +230,13 b' class SummaryController(BaseRepoControll'
             self.__get_readme_data(c.rhodecode_db_repo)
         return render('summary/summary.html')
 
+    @LoginRequired()
     @NotAnonymous()
+    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
+                                   'repository.admin')
     @jsonify
     def repo_size(self, repo_name):
         if request.is_xhr:
             return c.rhodecode_db_repo._repo_size()
         else:
             raise HTTPBadRequest()
-
-    def __get_readme_data(self, db_repo):
-        repo_name = db_repo.repo_name
-
-        @cache_region('long_term')
-        def _get_readme_from_cache(key):
-            readme_data = None
-            readme_file = None
-            log.debug('Looking for README file')
-            try:
-                # get's the landing revision! or tip if fails
-                cs = db_repo.get_landing_changeset()
-                if isinstance(cs, EmptyChangeset):
-                    raise EmptyRepositoryError()
-                renderer = MarkupRenderer()
-                for f in README_FILES:
-                    try:
-                        readme = cs.get_node(f)
-                        if not isinstance(readme, FileNode):
-                            continue
-                        readme_file = f
-                        log.debug('Found README file `%s` rendering...' %
-                                  readme_file)
-                        readme_data = renderer.render(readme.content, f)
-                        break
-                    except NodeDoesNotExistError:
-                        continue
-            except ChangesetError:
-                log.error(traceback.format_exc())
-                pass
-            except EmptyRepositoryError:
-                pass
-            except Exception:
-                log.error(traceback.format_exc())
-
-            return readme_data, readme_file
-
-        key = repo_name + '_README'
-        inv = CacheInvalidation.invalidate(key)
-        if inv is not None:
-            region_invalidate(_get_readme_from_cache, None, key)
-            CacheInvalidation.set_valid(inv.cache_key)
-        return _get_readme_from_cache(key)
-
-    def _get_download_links(self, repo):
-
-        download_l = []
-
-        branches_group = ([], _("Branches"))
-        tags_group = ([], _("Tags"))
-
-        for name, chs in c.rhodecode_repo.branches.items():
-            #chs = chs.split(':')[-1]
-            branches_group[0].append((chs, name),)
-        download_l.append(branches_group)
-
-        for name, chs in c.rhodecode_repo.tags.items():
-            #chs = chs.split(':')[-1]
-            tags_group[0].append((chs, name),)
-        download_l.append(tags_group)
-
-        return download_l

rhodecode/controllers/tags.py

@@ -35,12 +35,12 b' log = logging.getLogger(__name__)'
 
 class TagsController(BaseRepoController):
 
+    def __before__(self):
+        super(TagsController, self).__before__()
+
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
-    def __before__(self):
-        super(TagsController, self).__before__()
-
     def index(self):
         c.repo_tags = OrderedDict()
 

rhodecode/i18n/en/LC_MESSAGES/rhodecode.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: rhodecode 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-04-05 10:19-0700\n"
+"POT-Creation-Date: 2013-06-01 18:38+0200\n"
 "PO-Revision-Date: 2011-02-25 19:13+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <[e-mail]>\n"
@@ -17,38 +17,37 b' msgstr ""'
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: rhodecode/controllers/changelog.py:95
+#: rhodecode/controllers/changelog.py:149
 msgid "All Branches"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:83
+#: rhodecode/controllers/changeset.py:84
 msgid "Show white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
+#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
 msgid "Ignore white space"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:163
+#: rhodecode/controllers/changeset.py:164
 #, python-format
 msgid "%s line context"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:329
-#: rhodecode/controllers/pullrequests.py:438
+#: rhodecode/controllers/changeset.py:345
+#: rhodecode/controllers/pullrequests.py:481
 #, python-format
 msgid "Status change -> %s"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:360
+#: rhodecode/controllers/changeset.py:376
 msgid ""
 "Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr ""
 
 #: rhodecode/controllers/compare.py:74
-#: rhodecode/controllers/pullrequests.py:167
-#: rhodecode/controllers/shortlog.py:100
+#: rhodecode/controllers/pullrequests.py:259
 msgid "There are no changesets yet"
 msgstr ""
 
@@ -89,8 +88,8 b' msgid "%s %s feed"'
 msgstr ""
 
 #: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:134
-#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/changeset/changeset.html:141
+#: rhodecode/templates/changeset/changeset.html:153
 #: rhodecode/templates/compare/compare_diff.html:58
 #: rhodecode/templates/compare/compare_diff.html:69
 #: rhodecode/templates/pullrequests/pullrequest_show.html:131
@@ -98,115 +97,116 b' msgstr ""'
 msgid "Changeset was too big and was cut off..."
 msgstr ""
 
-#: rhodecode/controllers/feed.py:91
+#: rhodecode/controllers/feed.py:90
 #, python-format
 msgid "%s committed on %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:88
-msgid "Click here to add new file"
-msgstr ""
-
 #: rhodecode/controllers/files.py:89
+msgid "Click here to add new file"
+msgstr ""
+
+#: rhodecode/controllers/files.py:90
 #, python-format
 msgid "There are no files yet %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335
+#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:279
+#: rhodecode/controllers/files.py:283
 msgid "You can only edit files with revision being a valid branch "
 msgstr ""
 
-#: rhodecode/controllers/files.py:293
+#: rhodecode/controllers/files.py:297
 #, python-format
 msgid "Edited file %s via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:309
+#: rhodecode/controllers/files.py:313
 msgid "No changes"
 msgstr ""
 
-#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388
+#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394
 #, python-format
 msgid "Successfully committed to %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394
+#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/controllers/files.py:347
+#: rhodecode/controllers/files.py:351
 msgid "Added file via RhodeCode"
 msgstr ""
 
-#: rhodecode/controllers/files.py:364
-msgid "No content"
-msgstr ""
-
 #: rhodecode/controllers/files.py:368
-msgid "No filename"
+msgid "No content"
 msgstr ""
 
 #: rhodecode/controllers/files.py:372
+msgid "No filename"
+msgstr ""
+
+#: rhodecode/controllers/files.py:397
 msgid "Location must be relative path and must not contain .. in path"
 msgstr ""
 
-#: rhodecode/controllers/files.py:420
-msgid "Downloads disabled"
-msgstr ""
-
 #: rhodecode/controllers/files.py:431
+msgid "Downloads disabled"
+msgstr ""
+
+#: rhodecode/controllers/files.py:442
 #, python-format
 msgid "Unknown revision %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:433
+#: rhodecode/controllers/files.py:444
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/controllers/files.py:435
+#: rhodecode/controllers/files.py:446
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/controllers/files.py:617
+#: rhodecode/controllers/files.py:631
 #: rhodecode/templates/changeset/changeset_range.html:9
+#: rhodecode/templates/email_templates/pull_request.html:12
+#: rhodecode/templates/pullrequests/pullrequest.html:124
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131
-#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606
+#: rhodecode/controllers/files.py:632 rhodecode/controllers/pullrequests.py:152
+#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682
 #: rhodecode/templates/switch_to_list.html:3
 #: rhodecode/templates/branches/branches.html:10
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132
-#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617
+#: rhodecode/controllers/files.py:633 rhodecode/controllers/pullrequests.py:153
+#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693
 #: rhodecode/templates/switch_to_list.html:15
-#: rhodecode/templates/shortlog/shortlog_data.html:10
 #: rhodecode/templates/tags/tags.html:10
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:175
+#: rhodecode/controllers/forks.py:176
 #, python-format
 msgid "Forked repository %s as %s"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:189
+#: rhodecode/controllers/forks.py:190
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318
+#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153
 msgid "public journal"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322
+#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157
 #: rhodecode/templates/journal/journal.html:12
 msgid "journal"
 msgstr ""
@@ -225,71 +225,71 b' msgid ""'
 "email"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:118
+#: rhodecode/controllers/pullrequests.py:139
 #: rhodecode/templates/changeset/changeset.html:10
-#: rhodecode/templates/email_templates/changeset_comment.html:15
+#: rhodecode/templates/email_templates/changeset_comment.html:8
 msgid "Changeset"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:128
+#: rhodecode/controllers/pullrequests.py:149
 msgid "Special"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:129
+#: rhodecode/controllers/pullrequests.py:150
 msgid "Peer branches"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612
+#: rhodecode/controllers/pullrequests.py:151 rhodecode/model/scm.py:688
 #: rhodecode/templates/switch_to_list.html:28
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:228
+#: rhodecode/controllers/pullrequests.py:324
 msgid "Pull request requires a title with min. 3 chars"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:230
+#: rhodecode/controllers/pullrequests.py:326
 msgid "Error creating pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:251
+#: rhodecode/controllers/pullrequests.py:346
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:254
+#: rhodecode/controllers/pullrequests.py:349
 msgid "Error occurred during sending pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:287
+#: rhodecode/controllers/pullrequests.py:388
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:441
+#: rhodecode/controllers/pullrequests.py:484
 msgid "Closing with"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:478
+#: rhodecode/controllers/pullrequests.py:521
 msgid "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr ""
 
-#: rhodecode/controllers/search.py:134
+#: rhodecode/controllers/search.py:132
 msgid "Invalid search query. Try quoting it."
 msgstr ""
 
-#: rhodecode/controllers/search.py:139
+#: rhodecode/controllers/search.py:137
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr ""
 
-#: rhodecode/controllers/search.py:143
+#: rhodecode/controllers/search.py:141
 msgid "An error occurred during this search operation"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:141
+#: rhodecode/controllers/summary.py:182
 msgid "No data loaded yet"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:147
+#: rhodecode/controllers/summary.py:188
 #: rhodecode/templates/summary/summary.html:149
 msgid "Statistics are disabled for this repository"
 msgstr ""
@@ -302,6 +302,43 b' msgstr ""'
 msgid "Error occurred during update of defaults"
 msgstr ""
 
+#: rhodecode/controllers/admin/gists.py:56
+msgid "forever"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:57
+#, fuzzy
+msgid "5 minutes"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:58
+#, fuzzy
+msgid "1 hour"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:59
+#, fuzzy
+msgid "1 day"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:60
+#, fuzzy
+msgid "1 month"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:62
+msgid "Lifetime"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:127
+msgid "Error occurred during gist creation"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:165
+#, python-format
+msgid "Deleted gist %s"
+msgstr ""
+
 #: rhodecode/controllers/admin/ldap_settings.py:50
 msgid "BASE"
 msgstr ""
@@ -346,35 +383,39 b' msgstr ""'
 msgid "START_TLS on LDAP connection"
 msgstr ""
 
-#: rhodecode/controllers/admin/ldap_settings.py:126
+#: rhodecode/controllers/admin/ldap_settings.py:124
 msgid "LDAP settings updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/ldap_settings.py:130
+#: rhodecode/controllers/admin/ldap_settings.py:128
 msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
 msgstr ""
 
-#: rhodecode/controllers/admin/ldap_settings.py:147
+#: rhodecode/controllers/admin/ldap_settings.py:145
 msgid "Error occurred during update of ldap settings"
 msgstr ""
 
+#: rhodecode/controllers/admin/permissions.py:58
+#: rhodecode/controllers/admin/permissions.py:62
+#: rhodecode/controllers/admin/permissions.py:66
+msgid "None"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:59
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
+msgid "Read"
+msgstr ""
+
 #: rhodecode/controllers/admin/permissions.py:60
 #: rhodecode/controllers/admin/permissions.py:64
-msgid "None"
+#: rhodecode/controllers/admin/permissions.py:68
+msgid "Write"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
-msgid "Read"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:62
-#: rhodecode/controllers/admin/permissions.py:66
-msgid "Write"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:63
-#: rhodecode/controllers/admin/permissions.py:67
+#: rhodecode/controllers/admin/permissions.py:69
 #: rhodecode/templates/admin/defaults/defaults.html:9
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
@@ -395,41 +436,55 b' msgstr ""'
 #: rhodecode/templates/admin/users_groups/users_group_add.html:8
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:292
-#: rhodecode/templates/base/base.html:293
-#: rhodecode/templates/base/base.html:299
-#: rhodecode/templates/base/base.html:300
+#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:318
+#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:325
 msgid "Admin"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:70
-#: rhodecode/controllers/admin/permissions.py:76
-#: rhodecode/controllers/admin/permissions.py:79
-msgid "Disabled"
-msgstr ""
-
 #: rhodecode/controllers/admin/permissions.py:72
-msgid "Allowed with manual account activation"
+#: rhodecode/controllers/admin/permissions.py:83
+#: rhodecode/controllers/admin/permissions.py:86
+#: rhodecode/controllers/admin/permissions.py:89
+#: rhodecode/controllers/admin/permissions.py:92
+msgid "Disabled"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:74
+msgid "Allowed with manual account activation"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:76
 msgid "Allowed with automatic account activation"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:77
+#: rhodecode/controllers/admin/permissions.py:79
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444
+msgid "Manual activation of external account"
+msgstr ""
+
 #: rhodecode/controllers/admin/permissions.py:80
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445
+msgid "Automatic activation of external account"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:84
+#: rhodecode/controllers/admin/permissions.py:87
+#: rhodecode/controllers/admin/permissions.py:90
+#: rhodecode/controllers/admin/permissions.py:93
 msgid "Enabled"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:128
+#: rhodecode/controllers/admin/permissions.py:138
 msgid "Default permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:142
+#: rhodecode/controllers/admin/permissions.py:152
 msgid "Error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:127
+#: rhodecode/controllers/admin/repos.py:128
 msgid "--REMOVE FORK--"
 msgstr ""
 
@@ -448,230 +503,223 b' msgstr ""'
 msgid "Error creating repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:266
+#: rhodecode/controllers/admin/repos.py:270
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:284
+#: rhodecode/controllers/admin/repos.py:288
 #, python-format
 msgid "Error occurred during update of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:311
-#: rhodecode/controllers/api/api.py:877
+#: rhodecode/controllers/admin/repos.py:315
 #, python-format
 msgid "Detached %s forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:314
-#: rhodecode/controllers/api/api.py:879
+#: rhodecode/controllers/admin/repos.py:318
 #, python-format
 msgid "Deleted %s forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:319
+#: rhodecode/controllers/admin/repos.py:323
 #, python-format
 msgid "Deleted repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:322
+#: rhodecode/controllers/admin/repos.py:326
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:327
+#: rhodecode/controllers/admin/repos.py:331
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:365
+#: rhodecode/controllers/admin/repos.py:345
 msgid "Repository permissions updated"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:384
-msgid "An error occurred during deletion of repository user"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:403
-msgid "An error occurred during deletion of repository user groups"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:421
+#: rhodecode/controllers/admin/repos.py:375
+#: rhodecode/controllers/admin/repos_groups.py:332
+#: rhodecode/controllers/admin/users_groups.py:312
+msgid "An error occurred during revoking of permission"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:392
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:438
+#: rhodecode/controllers/admin/repos.py:409
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:458
-#: rhodecode/controllers/admin/repos.py:485
+#: rhodecode/controllers/admin/repos.py:429
+#: rhodecode/controllers/admin/repos.py:456
 msgid "An error occurred during unlocking"
 msgstr ""
 
+#: rhodecode/controllers/admin/repos.py:447
+msgid "Unlocked"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:450
+msgid "Locked"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:452
+#, python-format
+msgid "Repository has been %s"
+msgstr ""
+
 #: rhodecode/controllers/admin/repos.py:476
-msgid "Unlocked"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:479
-msgid "Locked"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:481
-#, python-format
-msgid "Repository has been %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:505
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:509
+#: rhodecode/controllers/admin/repos.py:480
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302
+#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302
 msgid "Token mismatch"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:527
+#: rhodecode/controllers/admin/repos.py:498
 msgid "Pulled from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:529
+#: rhodecode/controllers/admin/repos.py:501
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:545
+#: rhodecode/controllers/admin/repos.py:517
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:547
+#: rhodecode/controllers/admin/repos.py:519
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:551
+#: rhodecode/controllers/admin/repos.py:523
 msgid "An error occurred during this operation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:590
+#: rhodecode/controllers/admin/repos.py:562
 msgid "An error occurred during creation of field"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:604
+#: rhodecode/controllers/admin/repos.py:576
 msgid "An error occurred during removal of field"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:145
+#: rhodecode/controllers/admin/repos_groups.py:147
 #, python-format
 msgid "Created repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:157
+#: rhodecode/controllers/admin/repos_groups.py:159
 #, python-format
 msgid "Error occurred during creation of repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:214
-#: rhodecode/controllers/admin/repos_groups.py:286
-msgid "Cannot revoke permission for yourself as admin"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:220
+#: rhodecode/controllers/admin/repos_groups.py:217
 #, python-format
 msgid "Updated repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:235
+#: rhodecode/controllers/admin/repos_groups.py:232
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:253
+#: rhodecode/controllers/admin/repos_groups.py:250
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:260
+#: rhodecode/controllers/admin/repos_groups.py:257
 #, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:266
+#: rhodecode/controllers/admin/repos_groups.py:263
 #, python-format
 msgid "Removed repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:271
+#: rhodecode/controllers/admin/repos_groups.py:268
 #, python-format
 msgid "Error occurred during deletion of repos group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:297
-msgid "An error occurred during deletion of group user"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:318
-msgid "An error occurred during deletion of group user groups"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:126
+#: rhodecode/controllers/admin/repos_groups.py:279
+#: rhodecode/controllers/admin/repos_groups.py:314
+#: rhodecode/controllers/admin/users_groups.py:300
+msgid "Cannot revoke permission for yourself as admin"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:294
+msgid "Repository Group permissions updated"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:123
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:135
+#: rhodecode/controllers/admin/settings.py:132
 msgid "Whoosh reindex task scheduled"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:166
+#: rhodecode/controllers/admin/settings.py:163
 msgid "Updated application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:170
-#: rhodecode/controllers/admin/settings.py:301
+#: rhodecode/controllers/admin/settings.py:167
+#: rhodecode/controllers/admin/settings.py:304
 msgid "Error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:216
+#: rhodecode/controllers/admin/settings.py:219
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:221
+#: rhodecode/controllers/admin/settings.py:224
 msgid "Error occurred during updating visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:297
+#: rhodecode/controllers/admin/settings.py:300
 msgid "Updated VCS settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:311
+#: rhodecode/controllers/admin/settings.py:314
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:323
+#: rhodecode/controllers/admin/settings.py:326
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:327
+#: rhodecode/controllers/admin/settings.py:330
 msgid "Error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:346
+#: rhodecode/controllers/admin/settings.py:349
 msgid "Email task created"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:410
+#: rhodecode/controllers/admin/settings.py:413
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:452
+#: rhodecode/controllers/admin/settings.py:455
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:467
+#: rhodecode/controllers/admin/settings.py:470
 #: rhodecode/controllers/admin/users.py:198
 #, python-format
 msgid "Error occurred during update of user %s"
@@ -699,111 +747,92 b' msgstr ""'
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:233
+#: rhodecode/controllers/admin/users.py:234
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:276
-msgid "Granted 'repository create' permission to user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:281
-msgid "Revoked 'repository create' permission to user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:287
-msgid "Granted 'repository fork' permission to user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:292
-msgid "Revoked 'repository fork' permission to user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:298
-#: rhodecode/controllers/admin/users_groups.py:281
+#: rhodecode/controllers/admin/users.py:293
+#: rhodecode/controllers/admin/users_groups.py:372
+msgid "Updated permissions"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:297
+#: rhodecode/controllers/admin/users_groups.py:376
 msgid "An error occurred during permissions saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:312
+#: rhodecode/controllers/admin/users.py:311
 #, python-format
 msgid "Added email %s to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:318
+#: rhodecode/controllers/admin/users.py:317
 msgid "An error occurred during email saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:328
+#: rhodecode/controllers/admin/users.py:327
 msgid "Removed email from user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:341
+#: rhodecode/controllers/admin/users.py:340
 #, python-format
 msgid "Added ip %s to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:347
+#: rhodecode/controllers/admin/users.py:346
 msgid "An error occurred during ip saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:359
+#: rhodecode/controllers/admin/users.py:358
 msgid "Removed ip from user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:86
+#: rhodecode/controllers/admin/users_groups.py:162
 #, python-format
 msgid "Created user group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:97
+#: rhodecode/controllers/admin/users_groups.py:173
 #, python-format
 msgid "Error occurred during creation of user group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:166
-#, python-format
-msgid "Updated user group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:188
-#, python-format
-msgid "Error occurred during update of user group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:205
-msgid "Successfully deleted user group"
-msgstr ""
-
 #: rhodecode/controllers/admin/users_groups.py:210
+#, python-format
+msgid "Updated user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:232
+#, python-format
+msgid "Error occurred during update of user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:250
+msgid "Successfully deleted user group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:255
 msgid "An error occurred during deletion of user group"
 msgstr ""
 
-#: rhodecode/controllers/admin/users_groups.py:259
-msgid "Granted 'repository create' permission to user group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:264
-msgid "Revoked 'repository create' permission to user group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:270
-msgid "Granted 'repository fork' permission to user group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:275
-msgid "Revoked 'repository fork' permission to user group"
-msgstr ""
-
-#: rhodecode/lib/auth.py:530
+#: rhodecode/controllers/admin/users_groups.py:274
+msgid "Target group cannot be the same"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:280
+msgid "User Group permissions updated"
+msgstr ""
+
+#: rhodecode/lib/auth.py:544
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 
-#: rhodecode/lib/auth.py:579
+#: rhodecode/lib/auth.py:593
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
-#: rhodecode/lib/auth.py:620
+#: rhodecode/lib/auth.py:634
 msgid "You need to be a signed in to view this page"
 msgstr ""
 
@@ -819,152 +848,176 b' msgstr ""'
 msgid "No changes detected"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:394
+#: rhodecode/lib/helpers.py:428
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:506
+#: rhodecode/lib/helpers.py:539
 msgid "True"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:509
+#: rhodecode/lib/helpers.py:542
 msgid "False"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:547
+#: rhodecode/lib/helpers.py:580
 #, python-format
 msgid "Deleted branch: %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:550
+#: rhodecode/lib/helpers.py:583
 #, python-format
 msgid "Created tag: %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:563
+#: rhodecode/lib/helpers.py:596
 msgid "Changeset not found"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:615
+#: rhodecode/lib/helpers.py:646
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:621
+#: rhodecode/lib/helpers.py:652
 msgid "compare view"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:641
+#: rhodecode/lib/helpers.py:672
 msgid "and"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:642
+#: rhodecode/lib/helpers.py:673
 #, python-format
 msgid "%s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44
+#: rhodecode/lib/helpers.py:674 rhodecode/templates/changelog/changelog.html:53
 msgid "revisions"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:667
+#: rhodecode/lib/helpers.py:698
 #, python-format
 msgid "fork name %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:684
+#: rhodecode/lib/helpers.py:715
 #: rhodecode/templates/pullrequests/pullrequest_show.html:8
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:690
+#: rhodecode/lib/helpers.py:725
 msgid "[deleted] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702
+#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739
 msgid "[created] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:694
+#: rhodecode/lib/helpers.py:729
 msgid "[created] repository as fork"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704
+#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741
 msgid "[forked] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706
+#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743
 msgid "[updated] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:700
+#: rhodecode/lib/helpers.py:735
+msgid "[downloaded] archive from repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:737
 msgid "[delete] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:708
+#: rhodecode/lib/helpers.py:745
 msgid "[created] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:710
+#: rhodecode/lib/helpers.py:747
 msgid "[updated] user"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:712
+#: rhodecode/lib/helpers.py:749
 msgid "[created] user group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:714
+#: rhodecode/lib/helpers.py:751
 msgid "[updated] user group"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:716
+#: rhodecode/lib/helpers.py:753
 msgid "[commented] on revision in repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:718
+#: rhodecode/lib/helpers.py:755
 msgid "[commented] on pull request for"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:720
+#: rhodecode/lib/helpers.py:757
 msgid "[closed] pull request for"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:722
+#: rhodecode/lib/helpers.py:759
 msgid "[pushed] into"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:724
+#: rhodecode/lib/helpers.py:761
 msgid "[committed via RhodeCode] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:726
+#: rhodecode/lib/helpers.py:763
 msgid "[pulled from remote] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:728
+#: rhodecode/lib/helpers.py:765
 msgid "[pulled] from"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:730
+#: rhodecode/lib/helpers.py:767
 msgid "[started following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:732
+#: rhodecode/lib/helpers.py:769
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:910
+#: rhodecode/lib/helpers.py:1088
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:914
+#: rhodecode/lib/helpers.py:1092
 msgid "No Files"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1198
+#: rhodecode/lib/helpers.py:1158
+msgid "new file"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1161
+msgid "mod"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1164
+msgid "del"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1167
+msgid "rename"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1172
+msgid "chmod"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1404
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -976,221 +1029,299 b' msgstr ""'
 msgid "cannot create new union repository"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:411
+#: rhodecode/lib/utils2.py:410
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:412
+#: rhodecode/lib/utils2.py:411
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
+#: rhodecode/lib/utils2.py:412
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
 #: rhodecode/lib/utils2.py:413
 #, python-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d hour"
+msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/lib/utils2.py:414
 #, python-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d minute"
+msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/lib/utils2.py:415
 #, python-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rhodecode/lib/utils2.py:416
-#, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:432
+#: rhodecode/lib/utils2.py:431
 #, python-format
 msgid "in %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:434
+#: rhodecode/lib/utils2.py:433
 #, python-format
 msgid "%s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:436
+#: rhodecode/lib/utils2.py:435
 #, python-format
 msgid "in %s and %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:439
+#: rhodecode/lib/utils2.py:438
 #, python-format
 msgid "%s and %s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:442
+#: rhodecode/lib/utils2.py:441
 msgid "just now"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1289 rhodecode/model/db.py:1388
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413
 msgid "Repository no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414
 msgid "Repository read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415
 msgid "Repository write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416
 msgid "Repository admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308
 msgid "Repositories Group no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309
 msgid "Repositories Group read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310
 msgid "Repositories Group write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311
 msgid "Repositories Group admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411
 msgid "RhodeCode Administrator"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434
 msgid "Repository creation disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435
 msgid "Repository creation enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437
 msgid "Repository forking disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438
 msgid "Repository forking enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1403
 msgid "Register disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1404
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1407
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939
 msgid "Not Reviewed"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940
 msgid "Approved"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941
 msgid "Rejected"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942
 msgid "Under Review"
 msgstr ""
 
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275
+msgid "top level"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418
+msgid "Repository group no access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419
+msgid "Repository group read access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420
+msgid "Repository group write access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421
+msgid "Repository group admin access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423
+msgid "User group no access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424
+msgid "User group read access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425
+msgid "User group write access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426
+msgid "User group admin access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428
+msgid "Repository Group creation disabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429
+msgid "Repository Group creation enabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431
+msgid "User Group creation disabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432
+msgid "User Group creation enabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440
+msgid "Registration disabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441
+msgid "User Registration with manual account activation"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442
+msgid "User Registration with automatic account activation"
+msgstr ""
+
 #: rhodecode/model/comment.py:75
 #, python-format
 msgid "on line %s"
 msgstr ""
 
-#: rhodecode/model/comment.py:219
+#: rhodecode/model/comment.py:220
 msgid "[Mention]"
 msgstr ""
 
-#: rhodecode/model/db.py:1252
-msgid "top level"
-msgstr ""
-
-#: rhodecode/model/db.py:1393
-msgid "Repository group no access"
-msgstr ""
-
-#: rhodecode/model/db.py:1394
-msgid "Repository group read access"
-msgstr ""
-
-#: rhodecode/model/db.py:1395
-msgid "Repository group write access"
-msgstr ""
-
-#: rhodecode/model/db.py:1396
-msgid "Repository group admin access"
-msgstr ""
-
 #: rhodecode/model/forms.py:43
 msgid "Please enter a login"
 msgstr ""
@@ -1209,42 +1340,42 b' msgstr ""'
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
-#: rhodecode/model/notification.py:224
+#: rhodecode/model/notification.py:228
 #, python-format
 msgid "%(user)s commented on changeset at %(when)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:225
-#, python-format
-msgid "%(user)s sent message at %(when)s"
-msgstr ""
-
-#: rhodecode/model/notification.py:226
-#, python-format
-msgid "%(user)s mentioned you at %(when)s"
-msgstr ""
-
-#: rhodecode/model/notification.py:227
-#, python-format
-msgid "%(user)s registered in RhodeCode at %(when)s"
-msgstr ""
-
-#: rhodecode/model/notification.py:228
-#, python-format
-msgid "%(user)s opened new pull request at %(when)s"
-msgstr ""
-
 #: rhodecode/model/notification.py:229
 #, python-format
+msgid "%(user)s sent message at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:230
+#, python-format
+msgid "%(user)s mentioned you at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:231
+#, python-format
+msgid "%(user)s registered in RhodeCode at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:232
+#, python-format
+msgid "%(user)s opened new pull request at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:233
+#, python-format
 msgid "%(user)s commented on pull request at %(when)s"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:104
+#: rhodecode/model/pull_request.py:98
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr ""
 
-#: rhodecode/model/scm.py:598
+#: rhodecode/model/scm.py:674
 msgid "latest tip"
 msgstr ""
 
@@ -1297,7 +1428,7 b' msgstr ""'
 #: rhodecode/model/validators.py:89
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
-" dashes and must begin with alphanumeric character"
+" dashes and must begin with alphanumeric character or underscore"
 msgstr ""
 
 #: rhodecode/model/validators.py:117
@@ -1398,47 +1529,51 b' msgstr ""'
 msgid "You don't have permissions to create a group in this location"
 msgstr ""
 
-#: rhodecode/model/validators.py:557
+#: rhodecode/model/validators.py:559
 msgid "This username or user group name is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:650
+#: rhodecode/model/validators.py:652
 msgid "This is not a valid path"
 msgstr ""
 
-#: rhodecode/model/validators.py:665
+#: rhodecode/model/validators.py:667
 msgid "This e-mail address is already taken"
 msgstr ""
 
-#: rhodecode/model/validators.py:685
+#: rhodecode/model/validators.py:687
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr ""
 
-#: rhodecode/model/validators.py:722
+#: rhodecode/model/validators.py:724
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 
-#: rhodecode/model/validators.py:735
+#: rhodecode/model/validators.py:737
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
-#: rhodecode/model/validators.py:767
+#: rhodecode/model/validators.py:769
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
-#: rhodecode/model/validators.py:768
+#: rhodecode/model/validators.py:770
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
 
-#: rhodecode/model/validators.py:800
+#: rhodecode/model/validators.py:803
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 
+#: rhodecode/model/validators.py:817
+msgid "Filename cannot be inside a directory"
+msgstr ""
+
 #: rhodecode/templates/index.html:5
 msgid "Dashboard"
 msgstr ""
@@ -1484,29 +1619,28 b' msgid "You have admin right to this grou'
 msgstr ""
 
 #: rhodecode/templates/index_base.html:40
-#: rhodecode/templates/index_base.html:140
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43
 #: rhodecode/templates/admin/users_groups/users_group_add.html:32
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33
-#: rhodecode/templates/admin/users_groups/users_groups.html:34
+#: rhodecode/templates/admin/users_groups/users_groups.html:37
 msgid "Group name"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:41
-#: rhodecode/templates/index_base.html:83
-#: rhodecode/templates/index_base.html:142
-#: rhodecode/templates/index_base.html:180
-#: rhodecode/templates/index_base.html:270
+#: rhodecode/templates/index_base.html:123
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
-#: rhodecode/templates/admin/repos/repo_edit.html:75
+#: rhodecode/templates/admin/repos/repo_edit.html:68
 #: rhodecode/templates/admin/repos/repos.html:73
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44
+#: rhodecode/templates/email_templates/changeset_comment.html:9
+#: rhodecode/templates/email_templates/pull_request.html:9
 #: rhodecode/templates/forks/fork.html:56
-#: rhodecode/templates/pullrequests/pullrequest.html:101
+#: rhodecode/templates/pullrequests/pullrequest.html:43
+#: rhodecode/templates/pullrequests/pullrequest_show.html:81
 #: rhodecode/templates/summary/summary.html:106
 msgid "Description"
 msgstr ""
@@ -1514,27 +1648,25 b' msgstr ""'
 #: rhodecode/templates/index_base.html:51
 #: rhodecode/templates/admin/permissions/permissions.html:55
 #: rhodecode/templates/admin/repos/repo_add_base.html:29
-#: rhodecode/templates/admin/repos/repo_edit.html:49
+#: rhodecode/templates/admin/repos/repo_edit.html:50
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57
 #: rhodecode/templates/forks/fork.html:47
 msgid "Repository group"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:82
-#: rhodecode/templates/index_base.html:178
-#: rhodecode/templates/index_base.html:268
+#: rhodecode/templates/index_base.html:121
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
 #: rhodecode/templates/admin/repos/repos.html:71
 #: rhodecode/templates/admin/users/user_edit_my_account.html:172
-#: rhodecode/templates/base/perms_summary.html:14
-#: rhodecode/templates/bookmarks/bookmarks.html:34
+#: rhodecode/templates/base/perms_summary.html:37
+#: rhodecode/templates/bookmarks/bookmarks.html:48
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
 #: rhodecode/templates/branches/branches.html:47
 #: rhodecode/templates/branches/branches_data.html:6
 #: rhodecode/templates/files/files_browser.html:47
 #: rhodecode/templates/journal/journal.html:193
-#: rhodecode/templates/journal/journal.html:296
+#: rhodecode/templates/journal/journal.html:283
 #: rhodecode/templates/summary/summary.html:55
 #: rhodecode/templates/summary/summary.html:124
 #: rhodecode/templates/tags/tags.html:48
@@ -1542,109 +1674,78 b' msgstr ""'
 msgid "Name"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:84
-msgid "Last change"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:85
-#: rhodecode/templates/index_base.html:183
-#: rhodecode/templates/index_base.html:273
+#: rhodecode/templates/index_base.html:124
+msgid "Last Change"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:126
 #: rhodecode/templates/admin/repos/repos.html:74
 #: rhodecode/templates/admin/users/user_edit_my_account.html:174
 #: rhodecode/templates/journal/journal.html:195
-#: rhodecode/templates/journal/journal.html:298
+#: rhodecode/templates/journal/journal.html:285
 msgid "Tip"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:86
-#: rhodecode/templates/index_base.html:185
-#: rhodecode/templates/index_base.html:275
-#: rhodecode/templates/admin/repos/repo_edit.html:121
+#: rhodecode/templates/index_base.html:128
+#: rhodecode/templates/admin/repos/repo_edit.html:114
 #: rhodecode/templates/admin/repos/repos.html:76
 msgid "Owner"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:87
-msgid "Atom"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:171
-#: rhodecode/templates/index_base.html:209
-#: rhodecode/templates/index_base.html:296
-#: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:196
+#: rhodecode/templates/index_base.html:136
+#: rhodecode/templates/admin/repos/repos.html:84
+#: rhodecode/templates/admin/users/user_edit_my_account.html:183
 #: rhodecode/templates/admin/users/users.html:107
-#: rhodecode/templates/bookmarks/bookmarks.html:58
+#: rhodecode/templates/bookmarks/bookmarks.html:74
 #: rhodecode/templates/branches/branches.html:73
-#: rhodecode/templates/journal/journal.html:217
-#: rhodecode/templates/journal/journal.html:320
+#: rhodecode/templates/journal/journal.html:204
+#: rhodecode/templates/journal/journal.html:294
 #: rhodecode/templates/tags/tags.html:74
 msgid "Click to sort ascending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:172
-#: rhodecode/templates/index_base.html:210
-#: rhodecode/templates/index_base.html:297
-#: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:197
+#: rhodecode/templates/index_base.html:137
+#: rhodecode/templates/admin/repos/repos.html:85
+#: rhodecode/templates/admin/users/user_edit_my_account.html:184
 #: rhodecode/templates/admin/users/users.html:108
-#: rhodecode/templates/bookmarks/bookmarks.html:59
+#: rhodecode/templates/bookmarks/bookmarks.html:75
 #: rhodecode/templates/branches/branches.html:74
-#: rhodecode/templates/journal/journal.html:218
-#: rhodecode/templates/journal/journal.html:321
+#: rhodecode/templates/journal/journal.html:205
+#: rhodecode/templates/journal/journal.html:295
 #: rhodecode/templates/tags/tags.html:75
 msgid "Click to sort descending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:181
-#: rhodecode/templates/index_base.html:271
-msgid "Last Change"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:211
-#: rhodecode/templates/admin/repos/repos.html:99
-#: rhodecode/templates/admin/users/user_edit_my_account.html:198
-#: rhodecode/templates/admin/users/users.html:109
-#: rhodecode/templates/bookmarks/bookmarks.html:60
-#: rhodecode/templates/branches/branches.html:75
-#: rhodecode/templates/journal/journal.html:219
-#: rhodecode/templates/journal/journal.html:322
-#: rhodecode/templates/tags/tags.html:76
-msgid "No records found."
-msgstr ""
-
-#: rhodecode/templates/index_base.html:212
-#: rhodecode/templates/index_base.html:299
-#: rhodecode/templates/admin/repos/repos.html:100
-#: rhodecode/templates/admin/users/user_edit_my_account.html:199
+#: rhodecode/templates/index_base.html:138
+msgid "No repositories found."
+msgstr ""
+
+#: rhodecode/templates/index_base.html:139
+#: rhodecode/templates/admin/repos/repos.html:87
+#: rhodecode/templates/admin/users/user_edit_my_account.html:186
 #: rhodecode/templates/admin/users/users.html:110
-#: rhodecode/templates/bookmarks/bookmarks.html:61
+#: rhodecode/templates/bookmarks/bookmarks.html:77
 #: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:220
-#: rhodecode/templates/journal/journal.html:323
+#: rhodecode/templates/journal/journal.html:207
+#: rhodecode/templates/journal/journal.html:297
 #: rhodecode/templates/tags/tags.html:77
 msgid "Data error."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:213
-#: rhodecode/templates/index_base.html:300
-#: rhodecode/templates/admin/repos/repos.html:101
+#: rhodecode/templates/index_base.html:140
+#: rhodecode/templates/admin/repos/repos.html:88
 #: rhodecode/templates/admin/users/user_edit_my_account.html:58
-#: rhodecode/templates/admin/users/user_edit_my_account.html:200
+#: rhodecode/templates/admin/users/user_edit_my_account.html:187
 #: rhodecode/templates/admin/users/users.html:111
-#: rhodecode/templates/bookmarks/bookmarks.html:62
+#: rhodecode/templates/bookmarks/bookmarks.html:78
 #: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:221
-#: rhodecode/templates/journal/journal.html:324
+#: rhodecode/templates/journal/journal.html:208
+#: rhodecode/templates/journal/journal.html:298
 #: rhodecode/templates/tags/tags.html:78
 msgid "Loading..."
 msgstr ""
 
-#: rhodecode/templates/index_base.html:298
-msgid "No repositories found."
-msgstr ""
-
-#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227
+#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239
 msgid "Log In"
 msgstr ""
 
@@ -1659,7 +1760,7 b' msgstr ""'
 #: rhodecode/templates/admin/users/user_edit.html:57
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:31
 #: rhodecode/templates/admin/users/users.html:77
-#: rhodecode/templates/base/base.html:203
+#: rhodecode/templates/base/base.html:215
 #: rhodecode/templates/summary/summary.html:123
 msgid "Username"
 msgstr ""
@@ -1667,7 +1768,7 b' msgstr ""'
 #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
 #: rhodecode/templates/admin/ldap/ldap.html:46
 #: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:212
+#: rhodecode/templates/base/base.html:224
 msgid "Password"
 msgstr ""
 
@@ -1683,7 +1784,7 b' msgstr ""'
 msgid "Forgot your password ?"
 msgstr ""
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235
 msgid "Don't have an account ?"
 msgstr ""
 
@@ -1752,7 +1853,7 b' msgstr ""'
 #: rhodecode/templates/repo_switcher_list.html:10
 #: rhodecode/templates/admin/defaults/defaults.html:44
 #: rhodecode/templates/admin/repos/repo_add_base.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:85
+#: rhodecode/templates/admin/repos/repo_edit.html:78
 #: rhodecode/templates/data_table/_dt_elements.html:61
 #: rhodecode/templates/summary/summary.html:77
 msgid "Private repository"
@@ -1775,13 +1876,13 b' msgid "There are no tags yet"'
 msgstr ""
 
 #: rhodecode/templates/switch_to_list.html:35
-#: rhodecode/templates/bookmarks/bookmarks_data.html:32
+#: rhodecode/templates/bookmarks/bookmarks_data.html:37
 msgid "There are no bookmarks yet"
 msgstr ""
 
 #: rhodecode/templates/admin/admin.html:5
 #: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/base/base.html:68
+#: rhodecode/templates/base/base.html:73
 msgid "Admin journal"
 msgstr ""
 
@@ -1807,9 +1908,9 b' msgstr[1] ""'
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
 #: rhodecode/templates/admin/users/user_edit_my_account.html:176
 #: rhodecode/templates/admin/users/users.html:87
-#: rhodecode/templates/admin/users_groups/users_groups.html:37
+#: rhodecode/templates/admin/users_groups/users_groups.html:40
 #: rhodecode/templates/journal/journal.html:197
-#: rhodecode/templates/journal/journal.html:300
+#: rhodecode/templates/journal/journal.html:287
 msgid "Action"
 msgstr ""
 
@@ -1819,7 +1920,7 b' msgid "Repository"'
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:8
-#: rhodecode/templates/bookmarks/bookmarks.html:35
+#: rhodecode/templates/bookmarks/bookmarks.html:49
 #: rhodecode/templates/bookmarks/bookmarks_data.html:7
 #: rhodecode/templates/branches/branches.html:48
 #: rhodecode/templates/branches/branches_data.html:7
@@ -1842,19 +1943,18 b' msgid "Repositories defaults"'
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:11
-#: rhodecode/templates/base/base.html:75
+#: rhodecode/templates/base/base.html:80
 msgid "Defaults"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:35
 #: rhodecode/templates/admin/repos/repo_add_base.html:38
-#: rhodecode/templates/admin/repos/repo_edit.html:58
 msgid "Type"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:48
 #: rhodecode/templates/admin/repos/repo_add_base.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:89
+#: rhodecode/templates/admin/repos/repo_edit.html:82
 #: rhodecode/templates/forks/fork.html:69
 msgid ""
 "Private repositories are only visible to people explicitly added as "
@@ -1862,60 +1962,185 b' msgid ""'
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:55
-#: rhodecode/templates/admin/repos/repo_edit.html:94
+#: rhodecode/templates/admin/repos/repo_edit.html:87
 msgid "Enable statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:59
-#: rhodecode/templates/admin/repos/repo_edit.html:98
+#: rhodecode/templates/admin/repos/repo_edit.html:91
 msgid "Enable statistics window on summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:103
+#: rhodecode/templates/admin/repos/repo_edit.html:96
 msgid "Enable downloads"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:107
+#: rhodecode/templates/admin/repos/repo_edit.html:100
 msgid "Enable download menu on summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:75
-#: rhodecode/templates/admin/repos/repo_edit.html:112
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
+#: rhodecode/templates/admin/repos/repo_edit.html:105
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64
 msgid "Enable locking"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:79
-#: rhodecode/templates/admin/repos/repo_edit.html:116
+#: rhodecode/templates/admin/repos/repo_edit.html:109
 msgid "Enable lock-by-pulling on repository."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:84
 #: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/permissions/permissions.html:92
-#: rhodecode/templates/admin/repos/repo_edit.html:148
-#: rhodecode/templates/admin/repos/repo_edit.html:173
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80
+#: rhodecode/templates/admin/permissions/permissions.html:122
+#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos/repo_edit.html:166
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96
 #: rhodecode/templates/admin/settings/hooks.html:73
 #: rhodecode/templates/admin/users/user_add.html:94
 #: rhodecode/templates/admin/users/user_edit.html:140
-#: rhodecode/templates/admin/users/user_edit.html:185
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:88
 #: rhodecode/templates/admin/users_groups/users_group_add.html:49
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:135
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:143
+#: rhodecode/templates/base/default_perms_box.html:53
 msgid "Save"
 msgstr ""
 
+#: rhodecode/templates/admin/gists/index.html:5
+#: rhodecode/templates/base/base.html:299
+msgid "Gists"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:10
+#, python-format
+msgid "Private Gists for user %s"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:12
+#, python-format
+msgid "Public Gists for user %s"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:14
+msgid "Public Gists"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:31
+#: rhodecode/templates/admin/gists/show.html:24
+#: rhodecode/templates/base/base.html:302
+msgid "Create new gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:48
+msgid "Created"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:51
+#: rhodecode/templates/admin/gists/index.html:53
+#: rhodecode/templates/admin/gists/show.html:43
+#: rhodecode/templates/admin/gists/show.html:45
+msgid "Expires"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:51
+#: rhodecode/templates/admin/gists/show.html:43
+msgid "never"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:68
+msgid "There are no gists yet"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:5
+#: rhodecode/templates/admin/gists/new.html:16
+msgid "New gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:37
+msgid "Gist description ..."
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:52
+msgid "Create private gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:53
+msgid "Create public gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:54
+#: rhodecode/templates/admin/permissions/permissions.html:123
+#: rhodecode/templates/admin/permissions/permissions.html:185
+#: rhodecode/templates/admin/repos/repo_edit.html:142
+#: rhodecode/templates/admin/repos/repo_edit.html:167
+#: rhodecode/templates/admin/repos/repo_edit.html:381
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97
+#: rhodecode/templates/admin/settings/settings.html:115
+#: rhodecode/templates/admin/settings/settings.html:196
+#: rhodecode/templates/admin/settings/settings.html:288
+#: rhodecode/templates/admin/users/user_edit.html:141
+#: rhodecode/templates/admin/users/user_edit.html:198
+#: rhodecode/templates/admin/users/user_edit.html:246
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:144
+#: rhodecode/templates/base/default_perms_box.html:54
+#: rhodecode/templates/files/files_add.html:80
+#: rhodecode/templates/files/files_edit.html:66
+#: rhodecode/templates/pullrequests/pullrequest.html:86
+msgid "Reset"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:5
+msgid "gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:9
+msgid "Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:36
+msgid "Public gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:38
+msgid "Private gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:54
+#: rhodecode/templates/admin/repos/repo_edit.html:299
+#: rhodecode/templates/changeset/changeset_file_comment.html:40
+msgid "Delete"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:54
+#, fuzzy
+msgid "Confirm to delete this gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:63
+#: rhodecode/templates/admin/gists/show.html:84
+#: rhodecode/templates/files/files_edit.html:48
+#: rhodecode/templates/files/files_source.html:25
+#: rhodecode/templates/files/files_source.html:55
+msgid "Show as raw"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:71
+msgid "created"
+msgstr ""
+
 #: rhodecode/templates/admin/ldap/ldap.html:5
 msgid "LDAP administration"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:11
 #: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:74
+#: rhodecode/templates/base/base.html:79
 msgid "LDAP"
 msgstr ""
 
@@ -2016,7 +2241,7 b' msgid "Show notification"'
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/show_notification.html:9
-#: rhodecode/templates/base/base.html:241
+#: rhodecode/templates/base/base.html:253
 msgid "Notifications"
 msgstr ""
 
@@ -2025,12 +2250,14 b' msgid "Permissions administration"'
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
+#: rhodecode/templates/admin/repos/repo_edit.html:151
 #: rhodecode/templates/admin/repos/repo_edit.html:158
-#: rhodecode/templates/admin/repos/repo_edit.html:165
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88
 #: rhodecode/templates/admin/users/user_edit.html:150
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:100
-#: rhodecode/templates/base/base.html:73
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:129
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
+#: rhodecode/templates/base/base.html:78
 msgid "Permissions"
 msgstr ""
 
@@ -2051,6 +2278,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/permissions/permissions.html:50
 #: rhodecode/templates/admin/permissions/permissions.html:63
+#: rhodecode/templates/admin/permissions/permissions.html:77
 msgid "Overwrite existing settings"
 msgstr ""
 
@@ -2062,86 +2290,85 b' msgid ""'
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:69
-msgid "Registration"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:77
+msgid "User group"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:76
+msgid ""
+"All default permissions on each user group will be reset to chosen "
+"permission, note that all custom default permission on repository groups "
+"will be lost"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:83
 msgid "Repository creation"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:85
+#: rhodecode/templates/admin/permissions/permissions.html:91
+msgid "User group creation"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:99
 msgid "Repository forking"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:93
-#: rhodecode/templates/admin/permissions/permissions.html:154
-#: rhodecode/templates/admin/repos/repo_edit.html:149
-#: rhodecode/templates/admin/repos/repo_edit.html:174
-#: rhodecode/templates/admin/repos/repo_edit.html:388
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81
-#: rhodecode/templates/admin/settings/settings.html:115
-#: rhodecode/templates/admin/settings/settings.html:187
-#: rhodecode/templates/admin/settings/settings.html:278
-#: rhodecode/templates/admin/users/user_edit.html:141
-#: rhodecode/templates/admin/users/user_edit.html:186
-#: rhodecode/templates/admin/users/user_edit.html:235
-#: rhodecode/templates/admin/users/user_edit.html:283
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/files/files_add.html:80
-#: rhodecode/templates/files/files_edit.html:66
-#: rhodecode/templates/pullrequests/pullrequest.html:110
-msgid "Reset"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:103
+#: rhodecode/templates/admin/permissions/permissions.html:107
+msgid "Registration"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:115
+msgid "External auth account activation"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:133
 msgid "Default User Permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:113
-#: rhodecode/templates/admin/users/user_edit.html:244
+#: rhodecode/templates/admin/permissions/permissions.html:144
+#: rhodecode/templates/admin/users/user_edit.html:207
 msgid "Allowed IP addresses"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:127
-#: rhodecode/templates/admin/repos/repo_edit.html:347
+#: rhodecode/templates/admin/permissions/permissions.html:158
+#: rhodecode/templates/admin/repos/repo_edit.html:340
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
-#: rhodecode/templates/admin/users/user_edit.html:212
-#: rhodecode/templates/admin/users/user_edit.html:257
-#: rhodecode/templates/admin/users_groups/users_groups.html:46
+#: rhodecode/templates/admin/users/user_edit.html:175
+#: rhodecode/templates/admin/users/user_edit.html:220
+#: rhodecode/templates/admin/users_groups/users_groups.html:54
 #: rhodecode/templates/data_table/_dt_elements.html:122
-#: rhodecode/templates/data_table/_dt_elements.html:130
+#: rhodecode/templates/data_table/_dt_elements.html:136
 msgid "delete"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:128
-#: rhodecode/templates/admin/users/user_edit.html:258
+#: rhodecode/templates/admin/permissions/permissions.html:159
+#: rhodecode/templates/admin/users/user_edit.html:221
 #, fuzzy, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:134
-#: rhodecode/templates/admin/users/user_edit.html:264
+#: rhodecode/templates/admin/permissions/permissions.html:165
+#: rhodecode/templates/admin/users/user_edit.html:227
 msgid "All IP addresses are allowed"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:145
-#: rhodecode/templates/admin/users/user_edit.html:275
+#: rhodecode/templates/admin/permissions/permissions.html:176
+#: rhodecode/templates/admin/users/user_edit.html:238
 msgid "New ip address"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:153
+#: rhodecode/templates/admin/permissions/permissions.html:184
 #: rhodecode/templates/admin/repos/repo_add_base.html:73
-#: rhodecode/templates/admin/repos/repo_edit.html:387
-#: rhodecode/templates/admin/users/user_edit.html:234
-#: rhodecode/templates/admin/users/user_edit.html:282
+#: rhodecode/templates/admin/repos/repo_edit.html:380
+#: rhodecode/templates/admin/users/user_edit.html:197
+#: rhodecode/templates/admin/users/user_edit.html:245
 msgid "Add"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add.html:12
 #: rhodecode/templates/admin/repos/repo_add.html:16
-#: rhodecode/templates/base/base.html:69 rhodecode/templates/base/base.html:103
-#: rhodecode/templates/base/base.html:263
+#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88
+#: rhodecode/templates/base/base.html:116
+#: rhodecode/templates/base/base.html:275
 msgid "Repositories"
 msgstr ""
 
@@ -2156,7 +2383,7 b' msgid "Clone from"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:24
-#: rhodecode/templates/admin/repos/repo_edit.html:44
+#: rhodecode/templates/admin/repos/repo_edit.html:45
 msgid "Optional http[s] url from which repository should be cloned."
 msgstr ""
 
@@ -2170,19 +2397,19 b' msgid "Type of repository to create."'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:47
-#: rhodecode/templates/admin/repos/repo_edit.html:66
+#: rhodecode/templates/admin/repos/repo_edit.html:59
 #: rhodecode/templates/forks/fork.html:38
 msgid "Landing revision"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:51
-#: rhodecode/templates/admin/repos/repo_edit.html:70
+#: rhodecode/templates/admin/repos/repo_edit.html:63
 #: rhodecode/templates/forks/fork.html:42
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:60
-#: rhodecode/templates/admin/repos/repo_edit.html:79
+#: rhodecode/templates/admin/repos/repo_edit.html:72
 #: rhodecode/templates/forks/fork.html:60
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
@@ -2194,245 +2421,249 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repo_edit.html:12
 #: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:11
-#: rhodecode/templates/base/base.html:76 rhodecode/templates/base/base.html:121
+#: rhodecode/templates/base/base.html:81 rhodecode/templates/base/base.html:134
 #: rhodecode/templates/summary/summary.html:212
 msgid "Settings"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:40
+#: rhodecode/templates/admin/repos/repo_edit.html:36
+msgid "Non-changeable id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:41
 msgid "Clone uri"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:53
+#: rhodecode/templates/admin/repos/repo_edit.html:54
 msgid "Optional select a group to put this repository into."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:126
+#: rhodecode/templates/admin/repos/repo_edit.html:119
 msgid "Change owner of this repository."
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit.html:177
+msgid "Advanced settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:180
+msgid "Statistics"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit.html:184
-msgid "Advanced settings"
+msgid "Reset current statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:184
+msgid "Confirm to remove current statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:187
-msgid "Statistics"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:191
-msgid "Reset current statistics"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:191
-msgid "Confirm to remove current statistics"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:194
 msgid "Fetched to rev"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:195
+#: rhodecode/templates/admin/repos/repo_edit.html:188
 msgid "Stats gathered"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:203
+#: rhodecode/templates/admin/repos/repo_edit.html:196
 msgid "Remote"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:207
+#: rhodecode/templates/admin/repos/repo_edit.html:200
 msgid "Pull changes from remote location"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:207
+#: rhodecode/templates/admin/repos/repo_edit.html:200
 msgid "Confirm to pull changes from remote side"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit.html:211
+msgid "Cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:215
+msgid "Invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:215
+msgid "Confirm to invalidate repository cache"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit.html:218
-msgid "Cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:222
-msgid "Invalidate repository cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:222
-msgid "Confirm to invalidate repository cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:225
 msgid ""
 "Manually invalidate cache for this repository. On first access repository"
 " will be cached again"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:230
+#: rhodecode/templates/admin/repos/repo_edit.html:223
 msgid "List of cached values"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:233
+#: rhodecode/templates/admin/repos/repo_edit.html:226
 msgid "Prefix"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:234
+#: rhodecode/templates/admin/repos/repo_edit.html:227
 msgid "Key"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:235
+#: rhodecode/templates/admin/repos/repo_edit.html:228
 #: rhodecode/templates/admin/users/user_add.html:86
 #: rhodecode/templates/admin/users/user_edit.html:124
 #: rhodecode/templates/admin/users/users.html:84
 #: rhodecode/templates/admin/users_groups/users_group_add.html:41
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-#: rhodecode/templates/admin/users_groups/users_groups.html:36
+#: rhodecode/templates/admin/users_groups/users_groups.html:39
 msgid "Active"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:250
-#: rhodecode/templates/base/base.html:280
-#: rhodecode/templates/base/base.html:281
+#: rhodecode/templates/admin/repos/repo_edit.html:243
+#: rhodecode/templates/base/base.html:292
+#: rhodecode/templates/base/base.html:293
 msgid "Public journal"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit.html:249
+msgid "Remove from public journal"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:251
+msgid "Add to public journal"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit.html:256
-msgid "Remove from public journal"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:258
-msgid "Add to public journal"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:263
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:270
+#: rhodecode/templates/admin/repos/repo_edit.html:263
 msgid "Locking"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:275
+#: rhodecode/templates/admin/repos/repo_edit.html:268
 msgid "Unlock locked repo"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:275
+#: rhodecode/templates/admin/repos/repo_edit.html:268
 msgid "Confirm to unlock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:278
-msgid "lock repo"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:278
+#: rhodecode/templates/admin/repos/repo_edit.html:271
+msgid "Lock repo"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:271
 msgid "Confirm to lock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:279
+#: rhodecode/templates/admin/repos/repo_edit.html:272
 msgid "Repository is not locked"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit.html:277
+msgid "Force locking on repository. Works only when anonymous access is disabled"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit.html:284
-msgid "Force locking on repository. Works only when anonymous access is disabled"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:291
 msgid "Set as fork of"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:296
-msgid "set"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:300
+#: rhodecode/templates/admin/repos/repo_edit.html:289
+msgid "Set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:293
 msgid "Manually set this repository as a fork of another from the list"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:306
-#: rhodecode/templates/changeset/changeset_file_comment.html:41
-msgid "Delete"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:315
+#: rhodecode/templates/admin/repos/repo_edit.html:308
 msgid "Remove this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:315
+#: rhodecode/templates/admin/repos/repo_edit.html:308
 msgid "Confirm to delete this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:317
+#: rhodecode/templates/admin/repos/repo_edit.html:310
 #, python-format
 msgid "this repository has %s fork"
 msgid_plural "this repository has %s forks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:318
+#: rhodecode/templates/admin/repos/repo_edit.html:311
 msgid "Detach forks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:319
+#: rhodecode/templates/admin/repos/repo_edit.html:312
 msgid "Delete forks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:322
+#: rhodecode/templates/admin/repos/repo_edit.html:315
 msgid ""
 "This repository will be renamed in a special way in order to be "
 "unaccesible for RhodeCode and VCS systems. If you need to fully delete it"
 " from file system please do it manually"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:336
+#: rhodecode/templates/admin/repos/repo_edit.html:329
 msgid "Extra fields"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:348
+#: rhodecode/templates/admin/repos/repo_edit.html:341
 #, fuzzy, python-format
 msgid "Confirm to delete this field: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:362
+#: rhodecode/templates/admin/repos/repo_edit.html:355
 msgid "New field key"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:370
+#: rhodecode/templates/admin/repos/repo_edit.html:363
 msgid "New field label"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:373
+#: rhodecode/templates/admin/repos/repo_edit.html:366
 msgid "Enter short label"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:379
+#: rhodecode/templates/admin/repos/repo_edit.html:372
 msgid "New field description"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:382
+#: rhodecode/templates/admin/repos/repo_edit.html:375
 msgid "Enter description of a field"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3
 msgid "none"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:4
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4
 msgid "read"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:5
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5
 msgid "write"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:6
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6
 msgid "admin"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:7
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7
 msgid "member"
 msgstr ""
 
@@ -2444,6 +2675,8 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:28
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35
 msgid "default"
 msgstr ""
 
@@ -2451,33 +2684,37 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:55
 msgid "revoke"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:83
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81
 msgid "Add another member"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:97
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:100
-msgid "Failed to remove user"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:112
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:116
-msgid "Failed to remove user group"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repos.html:5
 msgid "Repositories administration"
 msgstr ""
 
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86
-msgid "apply to children"
+#: rhodecode/templates/admin/repos/repos.html:86
+#: rhodecode/templates/admin/users/user_edit_my_account.html:185
+#: rhodecode/templates/admin/users/users.html:109
+#: rhodecode/templates/bookmarks/bookmarks.html:76
+#: rhodecode/templates/branches/branches.html:75
+#: rhodecode/templates/journal/journal.html:206
+#: rhodecode/templates/journal/journal.html:296
+#: rhodecode/templates/tags/tags.html:76
+msgid "No records found."
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
+msgid "apply to children"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88
 msgid ""
 "Set or revoke permission to all children of that group, including non-"
 "private repositories and other groups"
@@ -2503,7 +2740,7 b' msgstr ""'
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16
-#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:82
+#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91
 msgid "Repository groups"
 msgstr ""
 
@@ -2533,7 +2770,7 b' msgstr ""'
 msgid "Add child group"
 msgstr ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68
 msgid ""
 "Enable lock-by-pulling on group. This option will be applied to all other"
 " groups and repositories inside"
@@ -2548,15 +2785,21 b' msgid "Number of toplevel repositories"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64
+#: rhodecode/templates/admin/users_groups/users_groups.html:48
+#: rhodecode/templates/changeset/changeset_file_comment.html:73
+#: rhodecode/templates/changeset/changeset_file_comment.html:171
 msgid "Edit"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65
+#: rhodecode/templates/admin/users_groups/users_groups.html:49
 #: rhodecode/templates/base/perms_summary.html:29
-#: rhodecode/templates/base/perms_summary.html:48
-#: rhodecode/templates/base/perms_summary.html:50
+#: rhodecode/templates/base/perms_summary.html:60
+#: rhodecode/templates/base/perms_summary.html:62
 #: rhodecode/templates/data_table/_dt_elements.html:116
 #: rhodecode/templates/data_table/_dt_elements.html:117
+#: rhodecode/templates/data_table/_dt_elements.html:130
+#: rhodecode/templates/data_table/_dt_elements.html:131
 msgid "edit"
 msgstr ""
 
@@ -2654,8 +2897,8 b' msgid "Google Analytics code"'
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:114
-#: rhodecode/templates/admin/settings/settings.html:186
-#: rhodecode/templates/admin/settings/settings.html:277
+#: rhodecode/templates/admin/settings/settings.html:195
+#: rhodecode/templates/admin/settings/settings.html:287
 msgid "Save settings"
 msgstr ""
 
@@ -2668,133 +2911,154 b' msgid "General"'
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:134
-msgid "Use lightweight dashboard"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:140
 msgid "Use repository extra fields"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:147
+#: rhodecode/templates/admin/settings/settings.html:136
+msgid "Allows storing additional customized fields per repository."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:139
+msgid "Show RhodeCode version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:141
+msgid "Shows or hides displayed version of RhodeCode in the footer"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:146
+msgid "Dashboard items"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:150
+msgid ""
+"Number of items displayed in lightweight dashboard before pagination is "
+"shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:155
 msgid "Icons"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:152
+#: rhodecode/templates/admin/settings/settings.html:160
 msgid "Show public repo icon on repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:156
+#: rhodecode/templates/admin/settings/settings.html:164
 msgid "Show private repo icon on repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:163
+#: rhodecode/templates/admin/settings/settings.html:166
+msgid "Show public/private icons next to repositories names"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:172
 msgid "Meta-Tagging"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:168
+#: rhodecode/templates/admin/settings/settings.html:177
 msgid "Stylify recognised metatags:"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:195
-msgid "VCS settings"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:204
+msgid "VCS settings"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:213
 msgid "Web"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:209
+#: rhodecode/templates/admin/settings/settings.html:218
 msgid "Require SSL for vcs operations"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:211
+#: rhodecode/templates/admin/settings/settings.html:220
 msgid ""
 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it "
 "will return HTTP Error 406: Not Acceptable"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:217
-msgid "Hooks"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:222
-msgid "Update repository after push (hg update)"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:226
+msgid "Hooks"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:231
+msgid "Update repository after push (hg update)"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:235
 msgid "Show repository size after push"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:230
+#: rhodecode/templates/admin/settings/settings.html:239
 msgid "Log user push commands"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:234
-msgid "Log user pull commands"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:238
-msgid "Advanced setup"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:243
-msgid "Mercurial Extensions"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:248
-msgid "Enable largefiles extension"
+msgid "Log user pull commands"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:247
+msgid "Advanced setup"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:252
+msgid "Mercurial Extensions"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:257
+msgid "Enable largefiles extension"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:261
 msgid "Enable hgsubversion extension"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:254
+#: rhodecode/templates/admin/settings/settings.html:263
 msgid ""
 "Requires hgsubversion library installed. Allows cloning from svn remote "
 "locations"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:264
+#: rhodecode/templates/admin/settings/settings.html:274
 msgid "Repositories location"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:269
+#: rhodecode/templates/admin/settings/settings.html:279
 msgid ""
-"This a crucial application setting. If you are really sure you need to "
-"change this, you must restart application in order to make this setting "
-"take effect. Click this label to unlock."
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:270
-#: rhodecode/templates/base/base.html:131
+"Click to unlock. You must restart RhodeCode in order to make this setting"
+" take effect."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:280
+#: rhodecode/templates/base/base.html:143
 msgid "Unlock"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:272
+#: rhodecode/templates/admin/settings/settings.html:282
 msgid ""
 "Location where repositories are stored. After changing this value a "
 "restart, and rescan is required"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:292
+#: rhodecode/templates/admin/settings/settings.html:303
 msgid "Test Email"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:300
+#: rhodecode/templates/admin/settings/settings.html:311
 msgid "Email to"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:308
+#: rhodecode/templates/admin/settings/settings.html:319
 msgid "Send"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:314
+#: rhodecode/templates/admin/settings/settings.html:325
 msgid "System Info and Packages"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:317
-#: rhodecode/templates/changelog/changelog.html:42
+#: rhodecode/templates/admin/settings/settings.html:328
+#: rhodecode/templates/changelog/changelog.html:51
 msgid "Show"
 msgstr ""
 
@@ -2804,7 +3068,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/users/user_add.html:10
 #: rhodecode/templates/admin/users/user_edit.html:11
-#: rhodecode/templates/base/base.html:71
+#: rhodecode/templates/base/base.html:76
 msgid "Users"
 msgstr ""
 
@@ -2861,44 +3125,21 b' msgstr ""'
 msgid "New password confirmation"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:158
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:108
-msgid "Inherit default permissions"
-msgstr ""
-
 #: rhodecode/templates/admin/users/user_edit.html:163
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:113
-#, python-format
-msgid ""
-"Select to inherit permissions from %s settings. With this selected below "
-"options does not have any action"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:169
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:119
-msgid "Create repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:177
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:127
-msgid "Fork repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:200
 msgid "Email addresses"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:213
+#: rhodecode/templates/admin/users/user_edit.html:176
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:227
+#: rhodecode/templates/admin/users/user_edit.html:190
 msgid "New email address"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:242
+#: rhodecode/templates/base/base.html:254
 msgid "My account"
 msgstr ""
 
@@ -2935,7 +3176,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45
-#: rhodecode/templates/pullrequests/pullrequest_data.html:7
+#: rhodecode/templates/pullrequests/pullrequest_data.html:11
 #: rhodecode/templates/pullrequests/pullrequest_show.html:27
 #: rhodecode/templates/pullrequests/pullrequest_show.html:42
 msgid "Closed"
@@ -2955,7 +3196,7 b' msgid "I participate in"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42
-#: rhodecode/templates/pullrequests/pullrequest_data.html:11
+#: rhodecode/templates/pullrequests/pullrequest_data.html:8
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
 msgstr ""
@@ -2986,12 +3227,12 b' msgstr ""'
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:10
 #: rhodecode/templates/admin/users_groups/users_groups.html:11
-#: rhodecode/templates/base/base.html:72
+#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94
 msgid "User groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:12
-#: rhodecode/templates/admin/users_groups/users_groups.html:25
+#: rhodecode/templates/admin/users_groups/users_groups.html:26
 msgid "Add new user group"
 msgstr ""
 
@@ -3004,7 +3245,7 b' msgid "UserGroups"'
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:50
-#: rhodecode/templates/admin/users_groups/users_groups.html:35
+#: rhodecode/templates/admin/users_groups/users_groups.html:38
 msgid "Members"
 msgstr ""
 
@@ -3024,45 +3265,53 b' msgstr ""'
 msgid "Add all elements"
 msgstr ""
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:150
-msgid "Group members"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:167
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:109
 msgid "No members yet"
 msgstr ""
 
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:117
+msgid "Global Permissions"
+msgstr ""
+
 #: rhodecode/templates/admin/users_groups/users_groups.html:5
 msgid "User groups administration"
 msgstr ""
 
-#: rhodecode/templates/admin/users_groups/users_groups.html:47
+#: rhodecode/templates/admin/users_groups/users_groups.html:55
 #, fuzzy, python-format
 msgid "Confirm to delete this user group: %s"
 msgstr ""
 
+#: rhodecode/templates/admin/users_groups/users_groups.html:62
+msgid "There are no user groups yet"
+msgstr ""
+
 #: rhodecode/templates/base/base.html:42
-msgid "Submit a bug"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:108
+#, python-format
+msgid "Server instance: %s"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:52
+msgid "Report a bug"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:121
 #: rhodecode/templates/data_table/_dt_elements.html:9
 #: rhodecode/templates/data_table/_dt_elements.html:11
 #: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/pullrequests/pullrequest_show.html:81
 #: rhodecode/templates/summary/summary.html:8
 msgid "Summary"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:109
-#: rhodecode/templates/changelog/changelog.html:11
+#: rhodecode/templates/base/base.html:122
+#: rhodecode/templates/changelog/changelog.html:15
 #: rhodecode/templates/data_table/_dt_elements.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:19
 #: rhodecode/templates/data_table/_dt_elements.html:21
 msgid "Changelog"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:110
+#: rhodecode/templates/base/base.html:123
 #: rhodecode/templates/data_table/_dt_elements.html:25
 #: rhodecode/templates/data_table/_dt_elements.html:27
 #: rhodecode/templates/data_table/_dt_elements.html:29
@@ -3070,48 +3319,44 b' msgstr ""'
 msgid "Files"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:112
+#: rhodecode/templates/base/base.html:125
 msgid "Switch To"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:114
-#: rhodecode/templates/base/base.html:267
-msgid "loading..."
-msgstr ""
-
-#: rhodecode/templates/base/base.html:118
-msgid "Options"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:124
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:126
-msgid "Lightweight changelog"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:127
-#: rhodecode/templates/base/base.html:287
+#: rhodecode/templates/base/base.html:279
+msgid "loading..."
+msgstr ""
+
+#: rhodecode/templates/base/base.html:131
+msgid "Options"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:137
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:139
+#: rhodecode/templates/base/base.html:312
 #: rhodecode/templates/search/search.html:14
 #: rhodecode/templates/search/search.html:54
 msgid "Search"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:133
+#: rhodecode/templates/base/base.html:145
 msgid "Lock"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:141
+#: rhodecode/templates/base/base.html:153
 msgid "Follow"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:142
+#: rhodecode/templates/base/base.html:154
 msgid "Unfollow"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:145
+#: rhodecode/templates/base/base.html:157
 #: rhodecode/templates/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
 #: rhodecode/templates/data_table/_dt_elements.html:37
@@ -3120,60 +3365,113 b' msgstr ""'
 msgid "Fork"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:147
+#: rhodecode/templates/base/base.html:159
 msgid "Create Pull Request"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:165
 msgid "Show Pull Requests"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:165
 msgid "Pull Requests"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:190
+#: rhodecode/templates/base/base.html:202
 msgid "Not logged in"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:197
+#: rhodecode/templates/base/base.html:209
 msgid "Login to your account"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:220
+#: rhodecode/templates/base/base.html:232
 msgid "Forgot password ?"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:243
+#: rhodecode/templates/base/base.html:255
 msgid "Log Out"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:262
-msgid "Switch repository"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:274
-msgid "Show recent activity"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:275
-#: rhodecode/templates/journal/journal.html:4
-msgid "Journal"
+msgid "Switch repository"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:286
+msgid "Show recent activity"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:287
+#: rhodecode/templates/journal/journal.html:4
+msgid "Journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:298
+msgid "Show public gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:303
+msgid "All public gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:305
+msgid "My public gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:306
+msgid "My private gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:311
 msgid "Search in repositories"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:8
+#: rhodecode/templates/base/default_perms_box.html:14
+msgid "Inherit default permissions"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:18
+#, python-format
+msgid ""
+"Select to inherit permissions from %s settings. With this selected below "
+"options does not apply."
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:26
+msgid "Create repositories"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:30
+msgid "Select this option to allow repository creation for this user"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:35
+msgid "Create user groups"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:39
+msgid "Select this option to allow user group creation for this user"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:44
+msgid "Fork repositories"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:48
+msgid "Select this option to allow repository forking for this user"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:11
 msgid "No permissions defined yet"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:15
+#: rhodecode/templates/base/perms_summary.html:19
+#: rhodecode/templates/base/perms_summary.html:38
 msgid "Permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:16
+#: rhodecode/templates/base/perms_summary.html:20
+#: rhodecode/templates/base/perms_summary.html:39
 msgid "Edit Permission"
 msgstr ""
 
@@ -3183,7 +3481,7 b' msgid "Add another comment"'
 msgstr ""
 
 #: rhodecode/templates/base/root.html:44
-#: rhodecode/templates/data_table/_dt_elements.html:140
+#: rhodecode/templates/data_table/_dt_elements.html:147
 msgid "Stop following this repository"
 msgstr ""
 
@@ -3200,7 +3498,7 b' msgid "members"'
 msgstr ""
 
 #: rhodecode/templates/base/root.html:48
-#: rhodecode/templates/pullrequests/pullrequest.html:181
+#: rhodecode/templates/pullrequests/pullrequest.html:203
 msgid "Loading ..."
 msgstr ""
 
@@ -3213,7 +3511,7 b' msgid "No matching files"'
 msgstr ""
 
 #: rhodecode/templates/base/root.html:51
-#: rhodecode/templates/changelog/changelog.html:36
+#: rhodecode/templates/changelog/changelog.html:45
 msgid "Open new pull request"
 msgstr ""
 
@@ -3242,31 +3540,48 b' msgstr ""'
 msgid "Expand diff"
 msgstr ""
 
+#: rhodecode/templates/base/root.html:58
+msgid "Failed to remoke permission"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr ""
 
-#: rhodecode/templates/bookmarks/bookmarks.html:37
+#: rhodecode/templates/bookmarks/bookmarks.html:26
+msgid "Compare bookmarks"
+msgstr ""
+
+#: rhodecode/templates/bookmarks/bookmarks.html:51
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
 #: rhodecode/templates/branches/branches.html:50
 #: rhodecode/templates/branches/branches_data.html:8
-#: rhodecode/templates/shortlog/shortlog_data.html:8
+#: rhodecode/templates/changelog/changelog_summary_data.html:8
 #: rhodecode/templates/tags/tags.html:51
 #: rhodecode/templates/tags/tags_data.html:8
 msgid "Author"
 msgstr ""
 
-#: rhodecode/templates/bookmarks/bookmarks.html:38
+#: rhodecode/templates/bookmarks/bookmarks.html:52
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
 #: rhodecode/templates/branches/branches.html:51
 #: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/shortlog/shortlog_data.html:5
+#: rhodecode/templates/changelog/changelog_summary_data.html:5
 #: rhodecode/templates/tags/tags.html:52
 #: rhodecode/templates/tags/tags_data.html:9
 msgid "Revision"
 msgstr ""
 
+#: rhodecode/templates/bookmarks/bookmarks.html:54
+#: rhodecode/templates/bookmarks/bookmarks_data.html:10
+#: rhodecode/templates/branches/branches.html:53
+#: rhodecode/templates/branches/branches_data.html:10
+#: rhodecode/templates/tags/tags.html:54
+#: rhodecode/templates/tags/tags_data.html:10
+msgid "Compare"
+msgstr ""
+
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
@@ -3276,65 +3591,68 b' msgstr ""'
 msgid "Compare branches"
 msgstr ""
 
-#: rhodecode/templates/branches/branches.html:53
-#: rhodecode/templates/branches/branches_data.html:10
-#: rhodecode/templates/tags/tags.html:54
-#: rhodecode/templates/tags/tags_data.html:10
-msgid "Compare"
-msgstr ""
-
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:11
+#: rhodecode/templates/changelog/changelog.html:19
 #, python-format
 msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changelog/changelog.html:30
+#: rhodecode/templates/changelog/changelog.html:39
 msgid "Clear selection"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:33
+#: rhodecode/templates/changelog/changelog.html:42
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
 msgid "Compare fork with %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:33
+#: rhodecode/templates/changelog/changelog.html:42
 msgid "Compare fork with parent"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:76
-#: rhodecode/templates/summary/summary.html:404
+#: rhodecode/templates/changelog/changelog.html:78
+#: rhodecode/templates/changelog/changelog_summary_data.html:28
+#, python-format
+msgid "Click to open associated pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:102
+#: rhodecode/templates/summary/summary.html:403
 msgid "Show more"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:89
+#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changelog/changelog_summary_data.html:50
+#: rhodecode/templates/changeset/changeset.html:107
 #: rhodecode/templates/changeset/changeset_range.html:86
 #, python-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:95
-#: rhodecode/templates/changeset/changeset.html:111
+#: rhodecode/templates/changelog/changelog.html:121
+#: rhodecode/templates/changelog/changelog_summary_data.html:56
+#: rhodecode/templates/changeset/changeset.html:113
 #: rhodecode/templates/changeset/changeset_range.html:92
 #, python-format
 msgid "Tag %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:100
-#: rhodecode/templates/changeset/changeset.html:106
-#: rhodecode/templates/changeset/changeset_range.html:80
+#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog_summary_data.html:61
+#: rhodecode/templates/changeset/changeset.html:117
+#: rhodecode/templates/changeset/changeset_range.html:96
 #, python-format
 msgid "Branch %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:258
+#: rhodecode/templates/changelog/changelog.html:286
 msgid "There are no changes yet"
 msgstr ""
 
@@ -3364,6 +3682,38 b' msgstr ""'
 msgid "Affected %s files"
 msgstr ""
 
+#: rhodecode/templates/changelog/changelog_summary_data.html:6
+#: rhodecode/templates/files/files_add.html:75
+#: rhodecode/templates/files/files_edit.html:61
+msgid "Commit message"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:7
+msgid "Age"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:9
+msgid "Refs"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:86
+msgid "Add or upload files directly via RhodeCode"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:89
+#: rhodecode/templates/files/files_add.html:38
+#: rhodecode/templates/files/files_browser.html:31
+msgid "Add new file"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:95
+msgid "Push new repo"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:103
+msgid "Existing repository?"
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset.html:6
 #, python-format
 msgid "%s Changeset"
@@ -3384,7 +3734,7 b' msgid "Changeset status"'
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:67
-#: rhodecode/templates/changeset/diff_block.html:23
+#: rhodecode/templates/changeset/diff_block.html:22
 msgid "Raw diff"
 msgstr ""
 
@@ -3393,12 +3743,12 b' msgid "Patch diff"'
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:69
-#: rhodecode/templates/changeset/diff_block.html:24
+#: rhodecode/templates/changeset/diff_block.html:23
 msgid "Download diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:97
+#: rhodecode/templates/changeset/changeset_file_comment.html:103
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -3406,7 +3756,7 b' msgstr[0] ""'
 msgstr[1] ""
 
 #: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:97
+#: rhodecode/templates/changeset/changeset_file_comment.html:103
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
@@ -3414,11 +3764,11 b' msgstr[0] ""'
 msgstr[1] ""
 
 #: rhodecode/templates/changeset/changeset.html:103
-#: rhodecode/templates/changeset/changeset_range.html:77
+#: rhodecode/templates/changeset/changeset_range.html:82
 msgid "merge"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:119
+#: rhodecode/templates/changeset/changeset.html:126
 #: rhodecode/templates/compare/compare_diff.html:40
 #: rhodecode/templates/pullrequests/pullrequest_show.html:113
 #, python-format
@@ -3427,7 +3777,7 b' msgid_plural "%s files changed"'
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:121
+#: rhodecode/templates/changeset/changeset.html:128
 #: rhodecode/templates/compare/compare_diff.html:42
 #: rhodecode/templates/pullrequests/pullrequest_show.html:115
 #, python-format
@@ -3436,15 +3786,15 b' msgid_plural "%s files changed with %s i'
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:134
-#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/changeset/changeset.html:141
+#: rhodecode/templates/changeset/changeset.html:153
 #: rhodecode/templates/pullrequests/pullrequest_show.html:131
 #: rhodecode/templates/pullrequests/pullrequest_show.html:195
 msgid "Showing a huge diff might take some time and resources"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:134
-#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/changeset/changeset.html:141
+#: rhodecode/templates/changeset/changeset.html:153
 #: rhodecode/templates/compare/compare_diff.html:58
 #: rhodecode/templates/compare/compare_diff.html:69
 #: rhodecode/templates/pullrequests/pullrequest_show.html:131
@@ -3462,51 +3812,64 b' msgstr ""'
 msgid "Comment on pull request #%s"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:57
+#: rhodecode/templates/changeset/changeset_file_comment.html:55
 msgid "Submitting..."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:60
+#: rhodecode/templates/changeset/changeset_file_comment.html:58
 msgid "Commenting on line {1}."
 msgstr ""
 
+#: rhodecode/templates/changeset/changeset_file_comment.html:59
+#: rhodecode/templates/changeset/changeset_file_comment.html:145
+#, python-format
+msgid "Comments parsed using %s syntax with %s support."
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset_file_comment.html:61
-#: rhodecode/templates/changeset/changeset_file_comment.html:139
-#, python-format
-msgid "Comments parsed using %s syntax with %s support."
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:63
-#: rhodecode/templates/changeset/changeset_file_comment.html:141
+#: rhodecode/templates/changeset/changeset_file_comment.html:147
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:74
-#: rhodecode/templates/changeset/changeset_file_comment.html:161
+#: rhodecode/templates/changeset/changeset_file_comment.html:65
+#: rhodecode/templates/changeset/changeset_file_comment.html:152
+#, fuzzy
+msgid "Preview"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:72
+#: rhodecode/templates/changeset/changeset_file_comment.html:170
+msgid "Comment preview"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:80
+#: rhodecode/templates/changeset/changeset_file_comment.html:177
+#: rhodecode/templates/email_templates/changeset_comment.html:16
+#: rhodecode/templates/email_templates/pull_request_comment.html:16
 msgid "Comment"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:75
+#: rhodecode/templates/changeset/changeset_file_comment.html:81
 msgid "Cancel"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:88
 msgid "You need to be logged in to comment."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:88
 msgid "Login now"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:86
+#: rhodecode/templates/changeset/changeset_file_comment.html:92
 msgid "Hide"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:143
+#: rhodecode/templates/changeset/changeset_file_comment.html:149
 msgid "Change status"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:163
+#: rhodecode/templates/changeset/changeset_file_comment.html:179
 msgid "Comment and close"
 msgstr ""
 
@@ -3519,19 +3882,19 b' msgstr ""'
 msgid "Files affected"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:22
+#: rhodecode/templates/changeset/diff_block.html:21
 msgid "Show full diff for this file"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:30
+#: rhodecode/templates/changeset/diff_block.html:29
 msgid "Show inline comments"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:55
+#: rhodecode/templates/changeset/diff_block.html:53
 msgid "Show file at latest version in this repo"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:56
+#: rhodecode/templates/changeset/diff_block.html:54
 msgid "Show file at initial version in this repo"
 msgstr ""
 
@@ -3606,27 +3969,24 b' msgstr ""'
 msgid "Confirm to delete this repository: %s"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:131
+#: rhodecode/templates/data_table/_dt_elements.html:137
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
 
-#: rhodecode/templates/email_templates/changeset_comment.html:9
-#: rhodecode/templates/email_templates/pull_request_comment.html:15
-msgid "New status"
-msgstr ""
-
-#: rhodecode/templates/email_templates/changeset_comment.html:11
-#: rhodecode/templates/email_templates/pull_request_comment.html:9
-msgid "View this comment here"
+#: rhodecode/templates/email_templates/changeset_comment.html:4
+#: rhodecode/templates/email_templates/pull_request.html:4
+#: rhodecode/templates/email_templates/pull_request_comment.html:4
+msgid "URL"
+msgstr ""
+
+#: rhodecode/templates/email_templates/changeset_comment.html:6
+#, python-format
+msgid "%s commented on a %s changeset."
 msgstr ""
 
 #: rhodecode/templates/email_templates/changeset_comment.html:14
-msgid "Repo"
-msgstr ""
-
-#: rhodecode/templates/email_templates/changeset_comment.html:16
-msgid "desc"
+msgid "The changeset status was changed to"
 msgstr ""
 
 #: rhodecode/templates/email_templates/main.html:8
@@ -3646,47 +4006,38 b' msgstr ""'
 msgid "You can generate it by clicking following URL"
 msgstr ""
 
-#: rhodecode/templates/email_templates/password_reset.html:11
-msgid "If you did not request new password please ignore this email."
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request.html:4
-#, python-format
-msgid ""
-"User %s opened pull request for repository %s and wants you to review "
-"changes."
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request.html:5
-msgid "View this pull request here"
+#: rhodecode/templates/email_templates/password_reset.html:10
+msgid "Please ignore this email if you did not request a new password ."
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:6
-msgid "title"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request.html:7
-msgid "description"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request.html:12
-msgid "revisions for reviewing"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.html:3
 #, python-format
-msgid "Pull request #%s for repository %s"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.html:13
-msgid "Closing pull request with status"
-msgstr ""
-
-#: rhodecode/templates/email_templates/registration.html:4
-msgid "A new user have registered in RhodeCode"
-msgstr ""
-
-#: rhodecode/templates/email_templates/registration.html:9
+msgid ""
+"%s opened a pull request for repository %s and wants you to review "
+"changes."
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request.html:8
+#: rhodecode/templates/pullrequests/pullrequest.html:34
+#: rhodecode/templates/pullrequests/pullrequest_data.html:14
+#: rhodecode/templates/pullrequests/pullrequest_show.html:25
+msgid "Title"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.html:6
+#, python-format
+msgid "%s commented on pull request \"%s\""
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.html:10
+msgid "Pull request was closed with status"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.html:12
+msgid "Pull request changed status"
+msgstr ""
+
+#: rhodecode/templates/email_templates/registration.html:6
 msgid "View this user here"
 msgstr ""
 
@@ -3713,7 +4064,6 b' msgstr ""'
 #: rhodecode/templates/files/files.html:30
 #: rhodecode/templates/files/files_add.html:31
 #: rhodecode/templates/files/files_edit.html:31
-#: rhodecode/templates/shortlog/shortlog_data.html:9
 msgid "Branch"
 msgstr ""
 
@@ -3726,12 +4076,6 b' msgstr ""'
 msgid "Add file"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:38
-#: rhodecode/templates/files/files_browser.html:31
-#: rhodecode/templates/shortlog/shortlog_data.html:78
-msgid "Add new file"
-msgstr ""
-
 #: rhodecode/templates/files/files_add.html:43
 msgid "File Name"
 msgstr ""
@@ -3760,12 +4104,6 b' msgstr ""'
 msgid "use / to separate directories"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:75
-#: rhodecode/templates/files/files_edit.html:61
-#: rhodecode/templates/shortlog/shortlog_data.html:6
-msgid "Commit message"
-msgstr ""
-
 #: rhodecode/templates/files/files_add.html:79
 #: rhodecode/templates/files/files_edit.html:65
 msgid "Commit changes"
@@ -3829,12 +4167,6 b' msgstr ""'
 msgid "Show annotation"
 msgstr ""
 
-#: rhodecode/templates/files/files_edit.html:48
-#: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:55
-msgid "Show as raw"
-msgstr ""
-
 #: rhodecode/templates/files/files_edit.html:49
 #: rhodecode/templates/files/files_source.html:26
 msgid "Download as raw"
@@ -4024,36 +4356,47 b' msgstr ""'
 msgid "New pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:52
-msgid "Detailed compare view"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.html:56
+#: rhodecode/templates/pullrequests/pullrequest.html:25
+msgid "Create new pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:47
+msgid "Write a short description on this pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:53
+msgid "Changeset flow"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:60
+#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+msgid "Origin repository"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:85
+msgid "Send pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:94
 #: rhodecode/templates/pullrequests/pullrequest_show.html:137
 msgid "Pull request reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:65
+#: rhodecode/templates/pullrequests/pullrequest.html:103
 #: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "owner"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:77
+#: rhodecode/templates/pullrequests/pullrequest.html:115
 msgid "Add reviewer to this pull request."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:83
-msgid "Create new pull request"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.html:92
-#: rhodecode/templates/pullrequests/pullrequest_data.html:14
-#: rhodecode/templates/pullrequests/pullrequest_show.html:25
-msgid "Title"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.html:109
-msgid "Send pull request"
+#: rhodecode/templates/pullrequests/pullrequest.html:129
+msgid "Detailed compare view"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.html:150
+msgid "Destination repository"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
@@ -4084,10 +4427,6 b' msgstr[1] ""'
 msgid "Pull request was reviewed by all reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
-msgid "Origin repository"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequest_show.html:89
 msgid "Created on"
 msgstr ""
@@ -4150,37 +4489,6 b' msgstr ""'
 msgid "Permission denied"
 msgstr ""
 
-#: rhodecode/templates/shortlog/shortlog.html:5
-#, fuzzy, python-format
-msgid "%s Lightweight Changelog"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog.html:11
-#: rhodecode/templates/shortlog/shortlog.html:15
-msgid "Lightweight Changelog"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog_data.html:7
-msgid "Age"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog_data.html:20
-#, python-format
-msgid "Click to open associated pull request #%s"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog_data.html:75
-msgid "Add or upload files directly via RhodeCode"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog_data.html:84
-msgid "Push new repo"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog_data.html:92
-msgid "Existing repository?"
-msgstr ""
-
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
 msgid "%s Summary"
@@ -4219,7 +4527,7 b' msgstr ""'
 msgid "Fork of"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:96
+#: rhodecode/templates/summary/summary.html:97
 msgid "Remote clone"
 msgstr ""
 
@@ -4245,8 +4553,7 b' msgstr ""'
 
 #: rhodecode/templates/summary/summary.html:151
 #: rhodecode/templates/summary/summary.html:167
-#: rhodecode/templates/summary/summary.html:232
-msgid "enable"
+msgid "Enable"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:159
@@ -4261,7 +4568,7 b' msgstr ""'
 msgid "Downloads are disabled for this repository"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:171
+#: rhodecode/templates/summary/summary.html:170
 msgid "Download as zip"
 msgstr ""
 
@@ -4286,6 +4593,10 b' msgstr ""'
 msgid "Commit activity by day / author"
 msgstr ""
 
+#: rhodecode/templates/summary/summary.html:232
+msgid "enable"
+msgstr ""
+
 #: rhodecode/templates/summary/summary.html:235
 msgid "Stats gathered: "
 msgstr ""
@@ -4300,51 +4611,47 b' msgstr ""'
 
 #: rhodecode/templates/summary/summary.html:272
 #, python-format
-msgid "Readme file at revision '%s'"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:275
-msgid "Permalink to this readme"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:333
+msgid "Readme file from revision %s"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:332
 #, python-format
 msgid "Download %s as %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:380
+#: rhodecode/templates/summary/summary.html:379
 msgid "files"
 msgstr ""
 
+#: rhodecode/templates/summary/summary.html:689
+msgid "commits"
+msgstr ""
+
 #: rhodecode/templates/summary/summary.html:690
-msgid "commits"
+msgid "files added"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:691
-msgid "files added"
+msgid "files changed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:692
-msgid "files changed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:693
 msgid "files removed"
 msgstr ""
 
+#: rhodecode/templates/summary/summary.html:694
+msgid "commit"
+msgstr ""
+
 #: rhodecode/templates/summary/summary.html:695
-msgid "commit"
+msgid "file added"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:696
-msgid "file added"
+msgid "file changed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:697
-msgid "file changed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:698
 msgid "file removed"
 msgstr ""
 

rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: RhodeCode 1.1.5\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-04-05 10:19-0700\n"
+"POT-Creation-Date: 2013-06-01 18:38+0200\n"
 "PO-Revision-Date: 2012-10-02 11:32+0100\n"
 "Last-Translator: Vincent Duvert <[e-mail]>\n"
 "Language-Team: fr <[e-mail]>\n"
@@ -17,32 +17,30 b' msgstr ""'
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: rhodecode/controllers/changelog.py:95
+#: rhodecode/controllers/changelog.py:149
 msgid "All Branches"
 msgstr "Toutes les branches"
 
-#: rhodecode/controllers/changeset.py:83
-#, fuzzy
+#: rhodecode/controllers/changeset.py:84
 msgid "Show white space"
 msgstr "Afficher les espaces et tabulations"
 
-#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
-#, fuzzy
+#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98
 msgid "Ignore white space"
 msgstr "Ignorer les espaces et tabulations"
 
-#: rhodecode/controllers/changeset.py:163
+#: rhodecode/controllers/changeset.py:164
 #, python-format
 msgid "%s line context"
 msgstr "Afficher %s lignes de contexte"
 
-#: rhodecode/controllers/changeset.py:329
-#: rhodecode/controllers/pullrequests.py:438
+#: rhodecode/controllers/changeset.py:345
+#: rhodecode/controllers/pullrequests.py:481
 #, python-format
 msgid "Status change -> %s"
 msgstr "Changement de statut -> %s"
 
-#: rhodecode/controllers/changeset.py:360
+#: rhodecode/controllers/changeset.py:376
 #, fuzzy
 msgid ""
 "Changing status on a changeset associated with a closed pull request is "
@@ -52,8 +50,7 b' msgstr ""'
 "n’est pas autorisé."
 
 #: rhodecode/controllers/compare.py:74
-#: rhodecode/controllers/pullrequests.py:167
-#: rhodecode/controllers/shortlog.py:100
+#: rhodecode/controllers/pullrequests.py:259
 msgid "There are no changesets yet"
 msgstr "Il n’y a aucun changement pour le moment"
 
@@ -98,8 +95,8 b' msgid "%s %s feed"'
 msgstr "Flux %s de %s"
 
 #: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:134
-#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/changeset/changeset.html:141
+#: rhodecode/templates/changeset/changeset.html:153
 #: rhodecode/templates/compare/compare_diff.html:58
 #: rhodecode/templates/compare/compare_diff.html:69
 #: rhodecode/templates/pullrequests/pullrequest_show.html:131
@@ -107,124 +104,125 b' msgstr "Flux %s de %s"'
 msgid "Changeset was too big and was cut off..."
 msgstr "Cet ensemble de changements était trop important et a été découpé…"
 
-#: rhodecode/controllers/feed.py:91
-#, fuzzy, python-format
+#: rhodecode/controllers/feed.py:90
+#, python-format
 msgid "%s committed on %s"
 msgstr "%s a commité, le %s"
 
-#: rhodecode/controllers/files.py:88
-#, fuzzy
+#: rhodecode/controllers/files.py:89
+#
 msgid "Click here to add new file"
 msgstr "Ajouter un nouveau fichier"
 
-#: rhodecode/controllers/files.py:89
+#: rhodecode/controllers/files.py:90
 #, python-format
 msgid "There are no files yet %s"
 msgstr "Il n’y a pas encore de fichiers %s"
 
-#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335
+#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr "Ce dépôt a été verrouillé par %s sur %s."
 
-#: rhodecode/controllers/files.py:279
+#: rhodecode/controllers/files.py:283
 msgid "You can only edit files with revision being a valid branch "
 msgstr ""
 
-#: rhodecode/controllers/files.py:293
-#, fuzzy, python-format
+#: rhodecode/controllers/files.py:297
+#, python-format
 msgid "Edited file %s via RhodeCode"
 msgstr "%s édité via RhodeCode"
 
-#: rhodecode/controllers/files.py:309
+#: rhodecode/controllers/files.py:313
 msgid "No changes"
 msgstr "Aucun changement"
 
-#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388
+#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394
 #, python-format
 msgid "Successfully committed to %s"
 msgstr "Commit réalisé avec succès sur %s"
 
-#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394
+#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405
 msgid "Error occurred during commit"
 msgstr "Une erreur est survenue durant le commit"
 
-#: rhodecode/controllers/files.py:347
-#, fuzzy
+#: rhodecode/controllers/files.py:351
+#
 msgid "Added file via RhodeCode"
 msgstr "%s ajouté par RhodeCode"
 
-#: rhodecode/controllers/files.py:364
-msgid "No content"
-msgstr "Aucun contenu"
-
 #: rhodecode/controllers/files.py:368
+msgid "No content"
+msgstr "Aucun contenu"
+
+#: rhodecode/controllers/files.py:372
 msgid "No filename"
 msgstr "Aucun nom de fichier"
 
-#: rhodecode/controllers/files.py:372
+#: rhodecode/controllers/files.py:397
 msgid "Location must be relative path and must not contain .. in path"
 msgstr ""
 
-#: rhodecode/controllers/files.py:420
-#, fuzzy
+#: rhodecode/controllers/files.py:431
+#
 msgid "Downloads disabled"
 msgstr "Les téléchargements sont désactivés"
 
-#: rhodecode/controllers/files.py:431
+#: rhodecode/controllers/files.py:442
 #, python-format
 msgid "Unknown revision %s"
 msgstr "Révision %s inconnue."
 
-#: rhodecode/controllers/files.py:433
+#: rhodecode/controllers/files.py:444
 msgid "Empty repository"
 msgstr "Dépôt vide."
 
-#: rhodecode/controllers/files.py:435
+#: rhodecode/controllers/files.py:446
 msgid "Unknown archive type"
 msgstr "Type d’archive inconnu"
 
-#: rhodecode/controllers/files.py:617
+#: rhodecode/controllers/files.py:631
 #: rhodecode/templates/changeset/changeset_range.html:9
+#: rhodecode/templates/email_templates/pull_request.html:12
+#: rhodecode/templates/pullrequests/pullrequest.html:124
 msgid "Changesets"
 msgstr "Changesets"
 
-#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131
-#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606
+#: rhodecode/controllers/files.py:632 rhodecode/controllers/pullrequests.py:152
+#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682
 #: rhodecode/templates/switch_to_list.html:3
 #: rhodecode/templates/branches/branches.html:10
 msgid "Branches"
 msgstr "Branches"
 
-#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132
-#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617
+#: rhodecode/controllers/files.py:633 rhodecode/controllers/pullrequests.py:153
+#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693
 #: rhodecode/templates/switch_to_list.html:15
-#: rhodecode/templates/shortlog/shortlog_data.html:10
 #: rhodecode/templates/tags/tags.html:10
 msgid "Tags"
 msgstr "Tags"
 
-#: rhodecode/controllers/forks.py:175
-#, fuzzy, python-format
+#: rhodecode/controllers/forks.py:176
+#, python-format
 msgid "Forked repository %s as %s"
 msgstr "dépôt %s forké en tant que %s"
 
-#: rhodecode/controllers/forks.py:189
+#: rhodecode/controllers/forks.py:190
 #, 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:275 rhodecode/controllers/journal.py:318
+#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153
 msgid "public journal"
 msgstr "Journal public"
 
-#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322
+#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157
 #: rhodecode/templates/journal/journal.html:12
 msgid "journal"
 msgstr "Journal"
 
 #: rhodecode/controllers/login.py:138
-#, fuzzy
+#
 msgid "You have successfully registered into RhodeCode"
 msgstr "Vous vous êtes inscrits avec succès à RhodeCode"
 
@@ -240,75 +238,75 b' msgstr ""'
 "Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a "
 "été envoyé par e-mail."
 
-#: rhodecode/controllers/pullrequests.py:118
+#: rhodecode/controllers/pullrequests.py:139
 #: rhodecode/templates/changeset/changeset.html:10
-#: rhodecode/templates/email_templates/changeset_comment.html:15
+#: rhodecode/templates/email_templates/changeset_comment.html:8
 msgid "Changeset"
 msgstr "Changements"
 
-#: rhodecode/controllers/pullrequests.py:128
+#: rhodecode/controllers/pullrequests.py:149
 msgid "Special"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:129
-#, fuzzy
+#: rhodecode/controllers/pullrequests.py:150
+#
 msgid "Peer branches"
-msgstr "Branches"
-
-#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:151 rhodecode/model/scm.py:688
 #: rhodecode/templates/switch_to_list.html:28
 #: rhodecode/templates/bookmarks/bookmarks.html:10
 msgid "Bookmarks"
 msgstr "Signets"
 
-#: rhodecode/controllers/pullrequests.py:228
+#: rhodecode/controllers/pullrequests.py:324
 msgid "Pull request requires a title with min. 3 chars"
 msgstr "Les requêtes de pull nécessitent un titre d’au moins 3 caractères."
 
-#: rhodecode/controllers/pullrequests.py:230
-#, fuzzy
+#: rhodecode/controllers/pullrequests.py:326
+#
 msgid "Error creating pull request"
 msgstr "Une erreur est survenue lors de la création de la requête de pull."
 
-#: rhodecode/controllers/pullrequests.py:251
+#: rhodecode/controllers/pullrequests.py:346
 msgid "Successfully opened new pull request"
 msgstr "La requête de pull a été ouverte avec succès."
 
-#: rhodecode/controllers/pullrequests.py:254
+#: rhodecode/controllers/pullrequests.py:349
 msgid "Error occurred during sending pull request"
 msgstr "Une erreur est survenue durant l’envoi de la requête de pull."
 
-#: rhodecode/controllers/pullrequests.py:287
+#: rhodecode/controllers/pullrequests.py:388
 msgid "Successfully deleted pull request"
 msgstr "La requête de pull a été supprimée avec succès."
 
-#: rhodecode/controllers/pullrequests.py:441
+#: rhodecode/controllers/pullrequests.py:484
 msgid "Closing with"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:478
+#: rhodecode/controllers/pullrequests.py:521
 msgid "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr ""
 
-#: rhodecode/controllers/search.py:134
+#: rhodecode/controllers/search.py:132
 msgid "Invalid search query. Try quoting it."
 msgstr "Requête invalide. Essayer de la mettre entre guillemets."
 
-#: rhodecode/controllers/search.py:139
+#: rhodecode/controllers/search.py:137
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr ""
 "L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de "
 "code Whoosh."
 
-#: rhodecode/controllers/search.py:143
+#: rhodecode/controllers/search.py:141
 msgid "An error occurred during this search operation"
 msgstr "Une erreur est survenue durant l’opération de recherche."
 
-#: rhodecode/controllers/summary.py:141
+#: rhodecode/controllers/summary.py:182
 msgid "No data loaded yet"
 msgstr "Aucune donnée actuellement disponible."
 
-#: rhodecode/controllers/summary.py:147
+#: rhodecode/controllers/summary.py:188
 #: rhodecode/templates/summary/summary.html:149
 msgid "Statistics are disabled for this repository"
 msgstr "La mise à jour des statistiques est désactivée pour ce dépôt."
@@ -323,6 +321,45 b' msgstr "Mise \xc3\xa0 jour r\xc3\xa9ussie des r\xc3\xa9glages LDAP"'
 msgid "Error occurred during update of defaults"
 msgstr "Une erreur est survenue durant la mise à jour de l’utilisateur %s."
 
+#: rhodecode/controllers/admin/gists.py:56
+#
+msgid "forever"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:57
+#
+msgid "5 minutes"
+msgstr "5 minute"
+
+#: rhodecode/controllers/admin/gists.py:58
+#
+msgid "1 hour"
+msgstr "1 heure"
+
+#: rhodecode/controllers/admin/gists.py:59
+#
+msgid "1 day"
+msgstr "1 jour"
+
+#: rhodecode/controllers/admin/gists.py:60
+#
+msgid "1 month"
+msgstr "1 mois"
+
+#: rhodecode/controllers/admin/gists.py:62
+msgid "Lifetime"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:127
+#, fuzzy
+msgid "Error occurred during gist creation"
+msgstr "Une erreur est survenue durant la création du hook."
+
+#: rhodecode/controllers/admin/gists.py:165
+#, fuzzy, python-format
+msgid "Deleted gist %s"
+msgstr "Dépôt %s supprimé"
+
 #: rhodecode/controllers/admin/ldap_settings.py:50
 msgid "BASE"
 msgstr "Base"
@@ -367,36 +404,40 b' msgstr "Connection LDAPS"'
 msgid "START_TLS on LDAP connection"
 msgstr "START_TLS à la connexion"
 
-#: rhodecode/controllers/admin/ldap_settings.py:126
+#: rhodecode/controllers/admin/ldap_settings.py:124
 msgid "LDAP settings updated successfully"
 msgstr "Mise à jour réussie des réglages LDAP"
 
-#: rhodecode/controllers/admin/ldap_settings.py:130
+#: rhodecode/controllers/admin/ldap_settings.py:128
 msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
 msgstr "Impossible d’activer LDAP. La bibliothèque « python-ldap » est manquante."
 
-#: rhodecode/controllers/admin/ldap_settings.py:147
+#: rhodecode/controllers/admin/ldap_settings.py:145
 #, fuzzy
 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:58
+#: rhodecode/controllers/admin/permissions.py:62
+#: rhodecode/controllers/admin/permissions.py:66
+msgid "None"
+msgstr "Aucun"
+
+#: rhodecode/controllers/admin/permissions.py:59
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
+msgid "Read"
+msgstr "Lire"
+
 #: rhodecode/controllers/admin/permissions.py:60
 #: rhodecode/controllers/admin/permissions.py:64
-msgid "None"
-msgstr "Aucun"
+#: rhodecode/controllers/admin/permissions.py:68
+msgid "Write"
+msgstr "Écrire"
 
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
-msgid "Read"
-msgstr "Lire"
-
-#: rhodecode/controllers/admin/permissions.py:62
-#: rhodecode/controllers/admin/permissions.py:66
-msgid "Write"
-msgstr "Écrire"
-
-#: rhodecode/controllers/admin/permissions.py:63
-#: rhodecode/controllers/admin/permissions.py:67
+#: rhodecode/controllers/admin/permissions.py:69
 #: rhodecode/templates/admin/defaults/defaults.html:9
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
@@ -417,44 +458,58 b' msgstr "\xc3\x89crire"'
 #: rhodecode/templates/admin/users_groups/users_group_add.html:8
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:292
-#: rhodecode/templates/base/base.html:293
-#: rhodecode/templates/base/base.html:299
-#: rhodecode/templates/base/base.html:300
+#: rhodecode/templates/base/base.html:317
+#: rhodecode/templates/base/base.html:318
+#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:325
 msgid "Admin"
 msgstr "Administration"
 
-#: rhodecode/controllers/admin/permissions.py:70
-#: rhodecode/controllers/admin/permissions.py:76
-#: rhodecode/controllers/admin/permissions.py:79
+#: rhodecode/controllers/admin/permissions.py:72
+#: rhodecode/controllers/admin/permissions.py:83
+#: rhodecode/controllers/admin/permissions.py:86
+#: rhodecode/controllers/admin/permissions.py:89
+#: rhodecode/controllers/admin/permissions.py:92
 msgid "Disabled"
 msgstr "Interdite"
 
-#: rhodecode/controllers/admin/permissions.py:72
+#: rhodecode/controllers/admin/permissions.py:74
 #, fuzzy
 msgid "Allowed with manual account activation"
 msgstr "Autorisé avec activation manuelle du compte"
 
-#: rhodecode/controllers/admin/permissions.py:74
+#: rhodecode/controllers/admin/permissions.py:76
 #, fuzzy
 msgid "Allowed with automatic account activation"
 msgstr "Autorisé avec activation automatique du compte"
 
-#: rhodecode/controllers/admin/permissions.py:77
+#: rhodecode/controllers/admin/permissions.py:79
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444
+msgid "Manual activation of external account"
+msgstr ""
+
 #: rhodecode/controllers/admin/permissions.py:80
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445
+msgid "Automatic activation of external account"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:84
+#: rhodecode/controllers/admin/permissions.py:87
+#: rhodecode/controllers/admin/permissions.py:90
+#: rhodecode/controllers/admin/permissions.py:93
 msgid "Enabled"
 msgstr "Autorisée"
 
-#: rhodecode/controllers/admin/permissions.py:128
+#: rhodecode/controllers/admin/permissions.py:138
 msgid "Default permissions updated successfully"
 msgstr "Permissions par défaut mises à jour avec succès"
 
-#: rhodecode/controllers/admin/permissions.py:142
+#: rhodecode/controllers/admin/permissions.py:152
 #, fuzzy
 msgid "Error occurred during update of permissions"
 msgstr "erreur pendant la mise à jour des permissions"
 
-#: rhodecode/controllers/admin/repos.py:127
+#: rhodecode/controllers/admin/repos.py:128
 msgid "--REMOVE FORK--"
 msgstr "[Pas un fork]"
 
@@ -473,250 +528,237 b' msgstr "Le d\xc3\xa9p\xc3\xb4t %s a \xc3\xa9t\xc3\xa9 cr\xc3\xa9\xc3\xa9."'
 msgid "Error creating repository %s"
 msgstr "Le dépôt %s a été créé."
 
-#: rhodecode/controllers/admin/repos.py:266
+#: rhodecode/controllers/admin/repos.py:270
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "Dépôt %s mis à jour avec succès."
 
-#: rhodecode/controllers/admin/repos.py:284
+#: rhodecode/controllers/admin/repos.py:288
 #, fuzzy, 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/admin/repos.py:311
-#: rhodecode/controllers/api/api.py:877
+#: rhodecode/controllers/admin/repos.py:315
 #, python-format
 msgid "Detached %s forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:314
-#: rhodecode/controllers/api/api.py:879
+#: rhodecode/controllers/admin/repos.py:318
 #, fuzzy, python-format
 msgid "Deleted %s forks"
 msgstr "Dépôt %s supprimé"
 
-#: rhodecode/controllers/admin/repos.py:319
+#: rhodecode/controllers/admin/repos.py:323
 #, fuzzy, python-format
 msgid "Deleted repository %s"
 msgstr "Dépôt %s supprimé"
 
-#: rhodecode/controllers/admin/repos.py:322
+#: rhodecode/controllers/admin/repos.py:326
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr "Impossible de supprimer le dépôt %s : Des forks y sont attachés."
 
-#: rhodecode/controllers/admin/repos.py:327
+#: rhodecode/controllers/admin/repos.py:331
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr "Erreur pendant la suppression de %s"
 
-#: rhodecode/controllers/admin/repos.py:365
+#: rhodecode/controllers/admin/repos.py:345
 #, fuzzy
 msgid "Repository permissions updated"
 msgstr "Création de dépôt désactivée"
 
-#: rhodecode/controllers/admin/repos.py:384
-msgid "An error occurred during deletion of repository user"
-msgstr "Une erreur est survenue durant la suppression de l’utilisateur du dépôt."
-
-#: rhodecode/controllers/admin/repos.py:403
-#, fuzzy
-msgid "An error occurred during deletion of repository user groups"
-msgstr ""
-"Une erreur est survenue durant la suppression du groupe d’utilisateurs de"
-" ce dépôt."
-
-#: rhodecode/controllers/admin/repos.py:421
+#: rhodecode/controllers/admin/repos.py:375
+#: rhodecode/controllers/admin/repos_groups.py:332
+#: rhodecode/controllers/admin/users_groups.py:312
+#, fuzzy
+msgid "An error occurred during revoking of permission"
+msgstr "erreur pendant la mise à jour des permissions"
+
+#: rhodecode/controllers/admin/repos.py:392
 msgid "An error occurred during deletion of repository stats"
 msgstr "Une erreur est survenue durant la suppression des statistiques du dépôt."
 
-#: rhodecode/controllers/admin/repos.py:438
+#: rhodecode/controllers/admin/repos.py:409
 msgid "An error occurred during cache invalidation"
 msgstr "Une erreur est survenue durant l’invalidation du cache."
 
-#: rhodecode/controllers/admin/repos.py:458
-#: rhodecode/controllers/admin/repos.py:485
+#: rhodecode/controllers/admin/repos.py:429
+#: rhodecode/controllers/admin/repos.py:456
 msgid "An error occurred during unlocking"
 msgstr "Une erreur est survenue durant le déverrouillage."
 
-#: rhodecode/controllers/admin/repos.py:476
+#: rhodecode/controllers/admin/repos.py:447
 #, fuzzy
 msgid "Unlocked"
 msgstr "déverrouillé"
 
-#: rhodecode/controllers/admin/repos.py:479
+#: rhodecode/controllers/admin/repos.py:450
 #, fuzzy
 msgid "Locked"
 msgstr "verrouillé"
 
-#: rhodecode/controllers/admin/repos.py:481
+#: rhodecode/controllers/admin/repos.py:452
 #, python-format
 msgid "Repository has been %s"
 msgstr "Le dépôt a été %s."
 
-#: rhodecode/controllers/admin/repos.py:505
+#: rhodecode/controllers/admin/repos.py:476
 msgid "Updated repository visibility in public journal"
 msgstr "La visibilité du dépôt dans le journal public a été mise à jour."
 
-#: rhodecode/controllers/admin/repos.py:509
+#: rhodecode/controllers/admin/repos.py:480
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 "Une erreur est survenue durant la configuration du journal public pour ce"
 " dépôt."
 
-#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302
+#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302
 msgid "Token mismatch"
 msgstr "Jeton d’authentification incorrect."
 
-#: rhodecode/controllers/admin/repos.py:527
+#: rhodecode/controllers/admin/repos.py:498
 msgid "Pulled from remote location"
 msgstr "Les changements distants ont été récupérés."
 
-#: rhodecode/controllers/admin/repos.py:529
+#: rhodecode/controllers/admin/repos.py:501
 msgid "An error occurred during pull from remote location"
 msgstr "Une erreur est survenue durant le pull depuis la source distante."
 
-#: rhodecode/controllers/admin/repos.py:545
+#: rhodecode/controllers/admin/repos.py:517
 msgid "Nothing"
 msgstr "[Aucun dépôt]"
 
-#: rhodecode/controllers/admin/repos.py:547
+#: rhodecode/controllers/admin/repos.py:519
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr "Le dépôt %s a été marké comme fork de %s"
 
-#: rhodecode/controllers/admin/repos.py:551
+#: rhodecode/controllers/admin/repos.py:523
 msgid "An error occurred during this operation"
 msgstr "Une erreur est survenue durant cette opération."
 
-#: rhodecode/controllers/admin/repos.py:590
+#: rhodecode/controllers/admin/repos.py:562
 #, fuzzy
 msgid "An error occurred during creation of field"
 msgstr "Une erreur est survenue durant la création de l’utilisateur %s."
 
-#: rhodecode/controllers/admin/repos.py:604
+#: rhodecode/controllers/admin/repos.py:576
 #, fuzzy
 msgid "An error occurred during removal of field"
 msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail."
 
-#: rhodecode/controllers/admin/repos_groups.py:145
+#: rhodecode/controllers/admin/repos_groups.py:147
 #, fuzzy, python-format
 msgid "Created repository group %s"
 msgstr "Le groupe de dépôts %s a été créé."
 
-#: rhodecode/controllers/admin/repos_groups.py:157
+#: rhodecode/controllers/admin/repos_groups.py:159
 #, fuzzy, python-format
 msgid "Error occurred during creation of repository group %s"
 msgstr "Une erreur est survenue durant la création du groupe de dépôts %s."
 
-#: rhodecode/controllers/admin/repos_groups.py:214
-#: rhodecode/controllers/admin/repos_groups.py:286
-msgid "Cannot revoke permission for yourself as admin"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:220
+#: rhodecode/controllers/admin/repos_groups.py:217
 #, fuzzy, python-format
 msgid "Updated repository group %s"
 msgstr "Le groupe de dépôts %s a été mis à jour."
 
-#: rhodecode/controllers/admin/repos_groups.py:235
+#: rhodecode/controllers/admin/repos_groups.py:232
 #, fuzzy, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr "Une erreur est survenue durant la mise à jour du groupe de dépôts %s."
 
-#: rhodecode/controllers/admin/repos_groups.py:253
+#: rhodecode/controllers/admin/repos_groups.py:250
 #, 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:260
+#: rhodecode/controllers/admin/repos_groups.py:257
 #, fuzzy, python-format
 msgid "This group contains %s subgroups and cannot be deleted"
 msgstr "Ce groupe contient %s dépôts et ne peut être supprimé."
 
-#: rhodecode/controllers/admin/repos_groups.py:266
+#: rhodecode/controllers/admin/repos_groups.py:263
 #, fuzzy, python-format
 msgid "Removed repository group %s"
 msgstr "Le groupe de dépôts %s a été supprimé."
 
-#: rhodecode/controllers/admin/repos_groups.py:271
+#: rhodecode/controllers/admin/repos_groups.py:268
 #, fuzzy, 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:297
-msgid "An error occurred during deletion of group user"
+#: rhodecode/controllers/admin/repos_groups.py:279
+#: rhodecode/controllers/admin/repos_groups.py:314
+#: rhodecode/controllers/admin/users_groups.py:300
+msgid "Cannot revoke permission for yourself as admin"
 msgstr ""
-"Une erreur est survenue durant la suppression de l’utilisateur du groupe "
-"de dépôts."
-
-#: rhodecode/controllers/admin/repos_groups.py:318
-#, fuzzy
-msgid "An error occurred during deletion of group user groups"
-msgstr ""
-"Une erreur est survenue durant la suppression du groupe d’utilisateurs du"
-" groupe de dépôts."
-
-#: rhodecode/controllers/admin/settings.py:126
+
+#: rhodecode/controllers/admin/repos_groups.py:294
+#, fuzzy
+msgid "Repository Group permissions updated"
+msgstr "Création de dépôt désactivée"
+
+#: rhodecode/controllers/admin/settings.py:123
 #, fuzzy, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr "Après re-scan : %s ajouté(s), %s enlevé(s)"
 
-#: rhodecode/controllers/admin/settings.py:135
+#: rhodecode/controllers/admin/settings.py:132
 msgid "Whoosh reindex task scheduled"
 msgstr "La tâche de réindexation Whoosh a été planifiée."
 
-#: rhodecode/controllers/admin/settings.py:166
+#: rhodecode/controllers/admin/settings.py:163
 msgid "Updated application settings"
 msgstr "Réglages mis à jour"
 
-#: rhodecode/controllers/admin/settings.py:170
-#: rhodecode/controllers/admin/settings.py:301
+#: rhodecode/controllers/admin/settings.py:167
+#: rhodecode/controllers/admin/settings.py:304
 #, fuzzy
 msgid "Error occurred during updating application settings"
 msgstr "Une erreur est survenue durant la mise à jour des options."
 
-#: rhodecode/controllers/admin/settings.py:216
+#: rhodecode/controllers/admin/settings.py:219
 msgid "Updated visualisation settings"
 msgstr "Réglages d’affichage mis à jour."
 
-#: rhodecode/controllers/admin/settings.py:221
+#: rhodecode/controllers/admin/settings.py:224
 #, fuzzy
 msgid "Error occurred during updating visualisation settings"
 msgstr "Une erreur est survenue durant la mise à jour des réglages d’affichages."
 
-#: rhodecode/controllers/admin/settings.py:297
+#: rhodecode/controllers/admin/settings.py:300
 msgid "Updated VCS settings"
 msgstr "Réglages des gestionnaires de versions mis à jour."
 
-#: rhodecode/controllers/admin/settings.py:311
+#: rhodecode/controllers/admin/settings.py:314
 msgid "Added new hook"
 msgstr "Le nouveau hook a été ajouté."
 
-#: rhodecode/controllers/admin/settings.py:323
+#: rhodecode/controllers/admin/settings.py:326
 msgid "Updated hooks"
 msgstr "Hooks mis à jour"
 
-#: rhodecode/controllers/admin/settings.py:327
+#: rhodecode/controllers/admin/settings.py:330
 #, fuzzy
 msgid "Error occurred during hook creation"
 msgstr "Une erreur est survenue durant la création du hook."
 
-#: rhodecode/controllers/admin/settings.py:346
+#: rhodecode/controllers/admin/settings.py:349
 msgid "Email task created"
 msgstr "La tâche d’e-mail a été créée."
 
-#: rhodecode/controllers/admin/settings.py:410
+#: rhodecode/controllers/admin/settings.py:413
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon"
 " fonctionnement de l’application."
 
-#: rhodecode/controllers/admin/settings.py:452
+#: rhodecode/controllers/admin/settings.py:455
 msgid "Your account was updated successfully"
 msgstr "Votre compte a été mis à jour avec succès"
 
-#: rhodecode/controllers/admin/settings.py:467
+#: rhodecode/controllers/admin/settings.py:470
 #: rhodecode/controllers/admin/users.py:198
 #, fuzzy, python-format
 msgid "Error occurred during update of user %s"
@@ -745,123 +787,98 b' msgstr "L\xe2\x80\x99utilisateur a \xc3\xa9t\xc3\xa9 supprim\xc3\xa9 avec succ\xc3\xa8s."'
 msgid "An error occurred during deletion of user"
 msgstr "Une erreur est survenue durant la suppression de l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:233
+#: rhodecode/controllers/admin/users.py:234
 msgid "You can't edit this user"
 msgstr "Vous ne pouvez pas éditer cet utilisateur"
 
-#: rhodecode/controllers/admin/users.py:276
-msgid "Granted 'repository create' permission to user"
-msgstr "La permission de création de dépôts a été accordée à l’utilisateur."
-
-#: rhodecode/controllers/admin/users.py:281
-msgid "Revoked 'repository create' permission to user"
-msgstr "La permission de création de dépôts a été révoquée à l’utilisateur."
-
-#: rhodecode/controllers/admin/users.py:287
-msgid "Granted 'repository fork' permission to user"
-msgstr "La permission de fork de dépôts a été accordée à l’utilisateur."
-
-#: rhodecode/controllers/admin/users.py:292
-msgid "Revoked 'repository fork' permission to user"
-msgstr "La permission de fork de dépôts a été révoquée à l’utilisateur."
-
-#: rhodecode/controllers/admin/users.py:298
-#: rhodecode/controllers/admin/users_groups.py:281
+#: rhodecode/controllers/admin/users.py:293
+#: rhodecode/controllers/admin/users_groups.py:372
+#, fuzzy
+msgid "Updated permissions"
+msgstr "Copier les permissions"
+
+#: rhodecode/controllers/admin/users.py:297
+#: rhodecode/controllers/admin/users_groups.py:376
 msgid "An error occurred during permissions saving"
 msgstr "Une erreur est survenue durant l’enregistrement des permissions."
 
-#: rhodecode/controllers/admin/users.py:312
+#: rhodecode/controllers/admin/users.py:311
 #, python-format
 msgid "Added email %s to user"
 msgstr "L’e-mail « %s » a été ajouté à l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:318
+#: rhodecode/controllers/admin/users.py:317
 msgid "An error occurred during email saving"
 msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail."
 
-#: rhodecode/controllers/admin/users.py:328
+#: rhodecode/controllers/admin/users.py:327
 msgid "Removed email from user"
 msgstr "L’e-mail a été enlevé de l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:341
+#: rhodecode/controllers/admin/users.py:340
 #, fuzzy, python-format
 msgid "Added ip %s to user"
 msgstr "L’e-mail « %s » a été ajouté à l’utilisateur."
 
-#: rhodecode/controllers/admin/users.py:347
+#: rhodecode/controllers/admin/users.py:346
 #, fuzzy
 msgid "An error occurred during ip saving"
 msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail."
 
-#: rhodecode/controllers/admin/users.py:359
+#: rhodecode/controllers/admin/users.py:358
 #, fuzzy
 msgid "Removed ip from user"
 msgstr "L’e-mail a été enlevé de l’utilisateur."
 
-#: rhodecode/controllers/admin/users_groups.py:86
+#: rhodecode/controllers/admin/users_groups.py:162
 #, fuzzy, python-format
 msgid "Created user group %s"
 msgstr "Le groupe d’utilisateurs %s a été créé."
 
-#: rhodecode/controllers/admin/users_groups.py:97
+#: rhodecode/controllers/admin/users_groups.py:173
 #, fuzzy, python-format
 msgid "Error occurred during creation of user group %s"
 msgstr "Une erreur est survenue durant la création du groupe d’utilisateurs %s."
 
-#: rhodecode/controllers/admin/users_groups.py:166
+#: rhodecode/controllers/admin/users_groups.py:210
 #, fuzzy, python-format
 msgid "Updated user group %s"
 msgstr "Le groupe d’utilisateurs %s a été mis à jour."
 
-#: rhodecode/controllers/admin/users_groups.py:188
+#: rhodecode/controllers/admin/users_groups.py:232
 #, fuzzy, python-format
 msgid "Error occurred during update of user group %s"
 msgstr "Une erreur est survenue durant la mise à jour du groupe d’utilisateurs %s."
 
-#: rhodecode/controllers/admin/users_groups.py:205
+#: rhodecode/controllers/admin/users_groups.py:250
 #, fuzzy
 msgid "Successfully deleted user group"
 msgstr "Le groupe d’utilisateurs a été supprimé avec succès."
 
-#: rhodecode/controllers/admin/users_groups.py:210
+#: rhodecode/controllers/admin/users_groups.py:255
 #, fuzzy
 msgid "An error occurred during deletion of user group"
 msgstr "Une erreur est survenue lors de la suppression du groupe d’utilisateurs."
 
-#: rhodecode/controllers/admin/users_groups.py:259
-#, fuzzy
-msgid "Granted 'repository create' permission to user group"
-msgstr ""
-"La permission de création de dépôts a été accordée au groupe "
-"d’utilisateurs."
-
-#: rhodecode/controllers/admin/users_groups.py:264
-#, fuzzy
-msgid "Revoked 'repository create' permission to user group"
+#: rhodecode/controllers/admin/users_groups.py:274
+msgid "Target group cannot be the same"
 msgstr ""
-"La permission de création de dépôts a été révoquée au groupe "
-"d’utilisateurs."
-
-#: rhodecode/controllers/admin/users_groups.py:270
-#, fuzzy
-msgid "Granted 'repository fork' permission to user group"
-msgstr "La permission de fork de dépôts a été accordée au groupe d’utilisateur."
-
-#: rhodecode/controllers/admin/users_groups.py:275
-#, fuzzy
-msgid "Revoked 'repository fork' permission to user group"
-msgstr "La permission de fork de dépôts a été révoquée au groupe d’utilisateurs."
-
-#: rhodecode/lib/auth.py:530
+
+#: rhodecode/controllers/admin/users_groups.py:280
+#, fuzzy
+msgid "User Group permissions updated"
+msgstr "Création de dépôt désactivée"
+
+#: rhodecode/lib/auth.py:544
 #, fuzzy, python-format
 msgid "IP %s not allowed"
 msgstr "Followers de %s"
 
-#: rhodecode/lib/auth.py:579
+#: rhodecode/lib/auth.py:593
 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:620
+#: rhodecode/lib/auth.py:634
 msgid "You need to be a signed in to view this page"
 msgstr "Vous devez être connecté pour visualiser cette page."
 
@@ -880,154 +897,183 b' msgstr ""'
 msgid "No changes detected"
 msgstr "Aucun changement détecté."
 
-#: rhodecode/lib/helpers.py:394
+#: rhodecode/lib/helpers.py:428
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr "%d/%m/%Y à %H:%M:%S"
 
-#: rhodecode/lib/helpers.py:506
+#: rhodecode/lib/helpers.py:539
 msgid "True"
 msgstr "Vrai"
 
-#: rhodecode/lib/helpers.py:509
+#: rhodecode/lib/helpers.py:542
 msgid "False"
 msgstr "Faux"
 
-#: rhodecode/lib/helpers.py:547
+#: rhodecode/lib/helpers.py:580
 #, fuzzy, python-format
 msgid "Deleted branch: %s"
 msgstr "Dépôt %s supprimé"
 
-#: rhodecode/lib/helpers.py:550
+#: rhodecode/lib/helpers.py:583
 #, fuzzy, python-format
 msgid "Created tag: %s"
 msgstr "utilisateur %s créé"
 
-#: rhodecode/lib/helpers.py:563
+#: rhodecode/lib/helpers.py:596
 msgid "Changeset not found"
 msgstr "Ensemble de changements non trouvé"
 
-#: rhodecode/lib/helpers.py:615
+#: rhodecode/lib/helpers.py:646
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "Afficher les changements combinés %s->%s"
 
-#: rhodecode/lib/helpers.py:621
+#: rhodecode/lib/helpers.py:652
 msgid "compare view"
 msgstr "vue de comparaison"
 
-#: rhodecode/lib/helpers.py:641
+#: rhodecode/lib/helpers.py:672
 msgid "and"
 msgstr "et"
 
-#: rhodecode/lib/helpers.py:642
+#: rhodecode/lib/helpers.py:673
 #, python-format
 msgid "%s more"
 msgstr "%s de plus"
 
-#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44
+#: rhodecode/lib/helpers.py:674 rhodecode/templates/changelog/changelog.html:53
 msgid "revisions"
 msgstr "révisions"
 
-#: rhodecode/lib/helpers.py:667
+#: rhodecode/lib/helpers.py:698
 #, fuzzy, python-format
 msgid "fork name %s"
 msgstr "Nom du fork %s"
 
-#: rhodecode/lib/helpers.py:684
+#: rhodecode/lib/helpers.py:715
 #: rhodecode/templates/pullrequests/pullrequest_show.html:8
 #, python-format
 msgid "Pull request #%s"
 msgstr "Requête de pull #%s"
 
-#: rhodecode/lib/helpers.py:690
+#: rhodecode/lib/helpers.py:725
 msgid "[deleted] repository"
 msgstr "[a supprimé] le dépôt"
 
-#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702
+#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739
 msgid "[created] repository"
 msgstr "[a créé] le dépôt"
 
-#: rhodecode/lib/helpers.py:694
+#: rhodecode/lib/helpers.py:729
 msgid "[created] repository as fork"
 msgstr "[a créé] le dépôt en tant que fork"
 
-#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704
+#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741
 msgid "[forked] repository"
 msgstr "[a forké] le dépôt"
 
-#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706
+#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743
 msgid "[updated] repository"
 msgstr "[a mis à jour] le dépôt"
 
-#: rhodecode/lib/helpers.py:700
+#: rhodecode/lib/helpers.py:735
+#, fuzzy
+msgid "[downloaded] archive from repository"
+msgstr "Les téléchargements sont désactivés pour ce dépôt."
+
+#: rhodecode/lib/helpers.py:737
 msgid "[delete] repository"
 msgstr "[a supprimé] le dépôt"
 
-#: rhodecode/lib/helpers.py:708
+#: rhodecode/lib/helpers.py:745
 msgid "[created] user"
 msgstr "[a créé] l’utilisateur"
 
-#: rhodecode/lib/helpers.py:710
+#: rhodecode/lib/helpers.py:747
 msgid "[updated] user"
 msgstr "[a mis à jour] l’utilisateur"
 
-#: rhodecode/lib/helpers.py:712
+#: rhodecode/lib/helpers.py:749
 #, fuzzy
 msgid "[created] user group"
 msgstr "[a créé] le groupe d’utilisateurs"
 
-#: rhodecode/lib/helpers.py:714
+#: rhodecode/lib/helpers.py:751
 #, fuzzy
 msgid "[updated] user group"
 msgstr "[a mis à jour] le groupe d’utilisateurs"
 
-#: rhodecode/lib/helpers.py:716
+#: rhodecode/lib/helpers.py:753
 msgid "[commented] on revision in repository"
 msgstr "[a commenté] une révision du dépôt"
 
-#: rhodecode/lib/helpers.py:718
+#: rhodecode/lib/helpers.py:755
 msgid "[commented] on pull request for"
 msgstr "[a commenté] la requête de pull pour"
 
-#: rhodecode/lib/helpers.py:720
+#: rhodecode/lib/helpers.py:757
 msgid "[closed] pull request for"
 msgstr "[a fermé] la requête de pull de"
 
-#: rhodecode/lib/helpers.py:722
+#: rhodecode/lib/helpers.py:759
 msgid "[pushed] into"
 msgstr "[a pushé] dans"
 
-#: rhodecode/lib/helpers.py:724
+#: rhodecode/lib/helpers.py:761
 msgid "[committed via RhodeCode] into repository"
 msgstr "[a commité via RhodeCode] dans le dépôt"
 
-#: rhodecode/lib/helpers.py:726
+#: rhodecode/lib/helpers.py:763
 msgid "[pulled from remote] into repository"
 msgstr "[a pullé depuis un site distant] dans le dépôt"
 
-#: rhodecode/lib/helpers.py:728
+#: rhodecode/lib/helpers.py:765
 msgid "[pulled] from"
 msgstr "[a pullé] depuis"
 
-#: rhodecode/lib/helpers.py:730
+#: rhodecode/lib/helpers.py:767
 msgid "[started following] repository"
 msgstr "[suit maintenant] le dépôt"
 
-#: rhodecode/lib/helpers.py:732
+#: rhodecode/lib/helpers.py:769
 msgid "[stopped following] repository"
 msgstr "[ne suit plus] le dépôt"
 
-#: rhodecode/lib/helpers.py:910
+#: rhodecode/lib/helpers.py:1088
 #, python-format
 msgid " and %s more"
 msgstr "et %s de plus"
 
-#: rhodecode/lib/helpers.py:914
+#: rhodecode/lib/helpers.py:1092
 msgid "No Files"
 msgstr "Aucun fichier"
 
-#: rhodecode/lib/helpers.py:1198
+#: rhodecode/lib/helpers.py:1158
+#, fuzzy
+msgid "new file"
+msgstr "Ajouter un nouveau fichier"
+
+#: rhodecode/lib/helpers.py:1161
+#, fuzzy
+msgid "mod"
+msgstr "Supprimés"
+
+#: rhodecode/lib/helpers.py:1164
+#, fuzzy
+msgid "del"
+msgstr "Supprimer"
+
+#: rhodecode/lib/helpers.py:1167
+#, fuzzy
+msgid "rename"
+msgstr "Nom d’utilisateur"
+
+#: rhodecode/lib/helpers.py:1172
+msgid "chmod"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1404
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -1043,225 +1089,314 b' msgstr ""'
 msgid "cannot create new union repository"
 msgstr "[a créé] le dépôt"
 
-#: rhodecode/lib/utils2.py:411
+#: rhodecode/lib/utils2.py:410
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d an"
 msgstr[1] "%d ans"
 
-#: rhodecode/lib/utils2.py:412
+#: rhodecode/lib/utils2.py:411
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mois"
 msgstr[1] "%d mois"
 
-#: rhodecode/lib/utils2.py:413
+#: rhodecode/lib/utils2.py:412
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: rhodecode/lib/utils2.py:414
+#: rhodecode/lib/utils2.py:413
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: rhodecode/lib/utils2.py:415
+#: rhodecode/lib/utils2.py:414
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: rhodecode/lib/utils2.py:416
+#: rhodecode/lib/utils2.py:415
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d secondes"
 
-#: rhodecode/lib/utils2.py:432
+#: rhodecode/lib/utils2.py:431
 #, fuzzy, python-format
 msgid "in %s"
 msgstr "à la ligne %s"
 
-#: rhodecode/lib/utils2.py:434
+#: rhodecode/lib/utils2.py:433
 #, python-format
 msgid "%s ago"
 msgstr "Il y a %s"
 
-#: rhodecode/lib/utils2.py:436
+#: rhodecode/lib/utils2.py:435
 #, fuzzy, python-format
 msgid "in %s and %s"
 msgstr "Il y a %s et %s"
 
-#: rhodecode/lib/utils2.py:439
+#: rhodecode/lib/utils2.py:438
 #, python-format
 msgid "%s and %s ago"
 msgstr "Il y a %s et %s"
 
-#: rhodecode/lib/utils2.py:442
+#: rhodecode/lib/utils2.py:441
 msgid "just now"
 msgstr "à l’instant"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1289 rhodecode/model/db.py:1388
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413
 msgid "Repository no access"
 msgstr "Aucun accès au dépôt"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414
 msgid "Repository read access"
 msgstr "Accès en lecture au dépôt"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415
 msgid "Repository write access"
 msgstr "Accès en écriture au dépôt"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416
 msgid "Repository admin access"
 msgstr "Accès administrateur au dépôt"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308
 msgid "Repositories Group no access"
 msgstr "Aucun accès au groupe de dépôts"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309
 msgid "Repositories Group read access"
 msgstr "Accès en lecture au groupe de dépôts"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310
 msgid "Repositories Group write access"
 msgstr "Accès en écriture au groupe de dépôts"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311
 msgid "Repositories Group admin access"
 msgstr "Accès administrateur au groupe de dépôts"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411
 msgid "RhodeCode Administrator"
 msgstr "Administrateur RhodeCode"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434
 msgid "Repository creation disabled"
 msgstr "Création de dépôt désactivée"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435
 msgid "Repository creation enabled"
 msgstr "Création de dépôt activée"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437
 msgid "Repository forking disabled"
 msgstr "Fork de dépôt désactivé"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438
 msgid "Repository forking enabled"
 msgstr "Fork de dépôt activé"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1403
 msgid "Register disabled"
 msgstr "Enregistrement désactivé"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1404
 msgid "Register new user with RhodeCode with manual activation"
 msgstr "Enregistrer un nouvel utilisateur Rhodecode manuellement activé"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1407
 msgid "Register new user with RhodeCode with auto activation"
 msgstr "Enregistrer un nouvel utilisateur Rhodecode auto-activé"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939
 msgid "Not Reviewed"
 msgstr "Pas encore relue"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940
 msgid "Approved"
 msgstr "Approuvée "
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941
 msgid "Rejected"
 msgstr "Rejetée"
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646
-#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942
 msgid "Under Review"
 msgstr "En cours de relecture"
 
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275
+msgid "top level"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418
+#, fuzzy
+msgid "Repository group no access"
+msgstr "Aucun accès au groupe de dépôts"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419
+#, fuzzy
+msgid "Repository group read access"
+msgstr "Accès en lecture au groupe de dépôts"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420
+#, fuzzy
+msgid "Repository group write access"
+msgstr "Accès en écriture au groupe de dépôts"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421
+#, fuzzy
+msgid "Repository group admin access"
+msgstr "Accès administrateur au groupe de dépôts"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423
+#, fuzzy
+msgid "User group no access"
+msgstr "Aucun accès au groupe de dépôts"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424
+#, fuzzy
+msgid "User group read access"
+msgstr "Accès en lecture au groupe de dépôts"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425
+#, fuzzy
+msgid "User group write access"
+msgstr "Accès en écriture au groupe de dépôts"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426
+#, fuzzy
+msgid "User group admin access"
+msgstr "Accès administrateur au groupe de dépôts"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428
+#, fuzzy
+msgid "Repository Group creation disabled"
+msgstr "Création de dépôt désactivée"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429
+#, fuzzy
+msgid "Repository Group creation enabled"
+msgstr "Création de dépôt activée"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431
+#, fuzzy
+msgid "User Group creation disabled"
+msgstr "Création de dépôt désactivée"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432
+#, fuzzy
+msgid "User Group creation enabled"
+msgstr "Création de dépôt activée"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Enregistrement désactivé"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441
+#, fuzzy
+msgid "User Registration with manual account activation"
+msgstr "Autorisé avec activation manuelle du compte"
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442
+#, fuzzy
+msgid "User Registration with automatic account activation"
+msgstr "Autorisé avec activation automatique du compte"
+
 #: rhodecode/model/comment.py:75
 #, python-format
 msgid "on line %s"
 msgstr "à la ligne %s"
 
-#: rhodecode/model/comment.py:219
+#: rhodecode/model/comment.py:220
 msgid "[Mention]"
 msgstr "[Mention]"
 
-#: rhodecode/model/db.py:1252
-msgid "top level"
-msgstr ""
-
-#: rhodecode/model/db.py:1393
-#, fuzzy
-msgid "Repository group no access"
-msgstr "Aucun accès au groupe de dépôts"
-
-#: rhodecode/model/db.py:1394
-#, fuzzy
-msgid "Repository group read access"
-msgstr "Accès en lecture au groupe de dépôts"
-
-#: rhodecode/model/db.py:1395
-#, fuzzy
-msgid "Repository group write access"
-msgstr "Accès en écriture au groupe de dépôts"
-
-#: rhodecode/model/db.py:1396
-#, fuzzy
-msgid "Repository group admin access"
-msgstr "Accès administrateur au groupe de dépôts"
-
 #: rhodecode/model/forms.py:43
 msgid "Please enter a login"
 msgstr "Veuillez entrer un identifiant"
@@ -1280,44 +1415,44 b' msgstr "Veuillez entrer un mot de passe"'
 msgid "Enter %(min)i characters or more"
 msgstr "Entrez au moins %(min)i caractères"
 
-#: rhodecode/model/notification.py:224
+#: rhodecode/model/notification.py:228
 #, fuzzy, python-format
 msgid "%(user)s commented on changeset at %(when)s"
 msgstr "%(user)s a posté un commentaire sur le commit %(when)s"
 
-#: rhodecode/model/notification.py:225
+#: rhodecode/model/notification.py:229
 #, fuzzy, python-format
 msgid "%(user)s sent message at %(when)s"
 msgstr "%(user)s a envoyé un message  %(when)s"
 
-#: rhodecode/model/notification.py:226
+#: rhodecode/model/notification.py:230
 #, fuzzy, python-format
 msgid "%(user)s mentioned you at %(when)s"
 msgstr "%(user)s vous a mentioné %(when)s"
 
-#: rhodecode/model/notification.py:227
+#: rhodecode/model/notification.py:231
 #, fuzzy, python-format
 msgid "%(user)s registered in RhodeCode at %(when)s"
 msgstr "%(user)s s’est enregistré sur RhodeCode %(when)s"
 
-#: rhodecode/model/notification.py:228
+#: rhodecode/model/notification.py:232
 #, fuzzy, python-format
 msgid "%(user)s opened new pull request at %(when)s"
 msgstr "%(user)s a ouvert une nouvelle requête de pull %(when)s"
 
-#: rhodecode/model/notification.py:229
+#: rhodecode/model/notification.py:233
 #, fuzzy, python-format
 msgid "%(user)s commented on pull request at %(when)s"
 msgstr "%(user)s a commenté sur la requête de pull %(when)s"
 
-#: rhodecode/model/pull_request.py:104
+#: rhodecode/model/pull_request.py:98
 #, fuzzy, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
 msgstr ""
 "%(user)s voudrait que vous examiniez sa requête de pull nº%(pr_id)s: "
 "%(pr_title)s"
 
-#: rhodecode/model/scm.py:598
+#: rhodecode/model/scm.py:674
 msgid "latest tip"
 msgstr "Dernier sommet"
 
@@ -1377,9 +1512,10 b' msgid "Username \\"%(username)s\\" is forb'
 msgstr "Le nom d’utilisateur « %(username)s » n’est pas autorisé"
 
 #: rhodecode/model/validators.py:89
+#, fuzzy
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
-" dashes and must begin with alphanumeric character"
+" dashes and must begin with alphanumeric character or underscore"
 msgstr ""
 "Le nom d’utilisateur peut contenir uniquement des caractères alpha-"
 "numériques ainsi que les caractères suivants : « _ . - ». Il doit "
@@ -1492,25 +1628,25 b' msgstr "Vous n\xe2\x80\x99avez pas la permission de cr\xc3\xa9er un d\xc3\xa9p\xc3\xb4t dans ce groupe."'
 msgid "You don't have permissions to create a group in this location"
 msgstr "Vous n’avez pas la permission de créer un dépôt dans ce groupe."
 
-#: rhodecode/model/validators.py:557
+#: rhodecode/model/validators.py:559
 #, fuzzy
 msgid "This username or user group name is not valid"
 msgstr "Ce nom d’utilisateur ou de groupe n’est pas valide."
 
-#: rhodecode/model/validators.py:650
+#: rhodecode/model/validators.py:652
 msgid "This is not a valid path"
 msgstr "Ceci n’est pas un chemin valide"
 
-#: rhodecode/model/validators.py:665
+#: rhodecode/model/validators.py:667
 msgid "This e-mail address is already taken"
 msgstr "Cette adresse e-mail est déjà enregistrée"
 
-#: rhodecode/model/validators.py:685
+#: rhodecode/model/validators.py:687
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "L’adresse e-mail « %(email)s » n’existe pas"
 
-#: rhodecode/model/validators.py:722
+#: rhodecode/model/validators.py:724
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
@@ -1518,26 +1654,30 b' msgstr ""'
 "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom"
 " d’utilisateur."
 
-#: rhodecode/model/validators.py:735
+#: rhodecode/model/validators.py:737
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 "Les révisions %(revs)s font déjà partie de la requête de pull ou on des "
 "statuts définis."
 
-#: rhodecode/model/validators.py:767
+#: rhodecode/model/validators.py:769
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
-#: rhodecode/model/validators.py:768
+#: rhodecode/model/validators.py:770
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
 
-#: rhodecode/model/validators.py:800
+#: rhodecode/model/validators.py:803
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 
+#: rhodecode/model/validators.py:817
+msgid "Filename cannot be inside a directory"
+msgstr ""
+
 #: rhodecode/templates/index.html:5
 msgid "Dashboard"
 msgstr "Tableau de bord"
@@ -1585,29 +1725,28 b' msgid "You have admin right to this grou'
 msgstr ""
 
 #: rhodecode/templates/index_base.html:40
-#: rhodecode/templates/index_base.html:140
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43
 #: rhodecode/templates/admin/users_groups/users_group_add.html:32
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33
-#: rhodecode/templates/admin/users_groups/users_groups.html:34
+#: rhodecode/templates/admin/users_groups/users_groups.html:37
 msgid "Group name"
 msgstr "Nom de groupe"
 
 #: rhodecode/templates/index_base.html:41
-#: rhodecode/templates/index_base.html:83
-#: rhodecode/templates/index_base.html:142
-#: rhodecode/templates/index_base.html:180
-#: rhodecode/templates/index_base.html:270
+#: rhodecode/templates/index_base.html:123
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
-#: rhodecode/templates/admin/repos/repo_edit.html:75
+#: rhodecode/templates/admin/repos/repo_edit.html:68
 #: rhodecode/templates/admin/repos/repos.html:73
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44
+#: rhodecode/templates/email_templates/changeset_comment.html:9
+#: rhodecode/templates/email_templates/pull_request.html:9
 #: rhodecode/templates/forks/fork.html:56
-#: rhodecode/templates/pullrequests/pullrequest.html:101
+#: rhodecode/templates/pullrequests/pullrequest.html:43
+#: rhodecode/templates/pullrequests/pullrequest_show.html:81
 #: rhodecode/templates/summary/summary.html:106
 msgid "Description"
 msgstr "Description"
@@ -1615,27 +1754,25 b' msgstr "Description"'
 #: rhodecode/templates/index_base.html:51
 #: rhodecode/templates/admin/permissions/permissions.html:55
 #: rhodecode/templates/admin/repos/repo_add_base.html:29
-#: rhodecode/templates/admin/repos/repo_edit.html:49
+#: rhodecode/templates/admin/repos/repo_edit.html:50
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57
 #: rhodecode/templates/forks/fork.html:47
 msgid "Repository group"
 msgstr "Groupe de dépôt"
 
-#: rhodecode/templates/index_base.html:82
-#: rhodecode/templates/index_base.html:178
-#: rhodecode/templates/index_base.html:268
+#: rhodecode/templates/index_base.html:121
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
 #: rhodecode/templates/admin/repos/repos.html:71
 #: rhodecode/templates/admin/users/user_edit_my_account.html:172
-#: rhodecode/templates/base/perms_summary.html:14
-#: rhodecode/templates/bookmarks/bookmarks.html:34
+#: rhodecode/templates/base/perms_summary.html:37
+#: rhodecode/templates/bookmarks/bookmarks.html:48
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
 #: rhodecode/templates/branches/branches.html:47
 #: rhodecode/templates/branches/branches_data.html:6
 #: rhodecode/templates/files/files_browser.html:47
 #: rhodecode/templates/journal/journal.html:193
-#: rhodecode/templates/journal/journal.html:296
+#: rhodecode/templates/journal/journal.html:283
 #: rhodecode/templates/summary/summary.html:55
 #: rhodecode/templates/summary/summary.html:124
 #: rhodecode/templates/tags/tags.html:48
@@ -1643,110 +1780,79 b' msgstr "Groupe de d\xc3\xa9p\xc3\xb4t"'
 msgid "Name"
 msgstr "Nom"
 
-#: rhodecode/templates/index_base.html:84
-msgid "Last change"
+#: rhodecode/templates/index_base.html:124
+msgid "Last Change"
 msgstr "Dernière modification"
 
-#: rhodecode/templates/index_base.html:85
-#: rhodecode/templates/index_base.html:183
-#: rhodecode/templates/index_base.html:273
+#: rhodecode/templates/index_base.html:126
 #: rhodecode/templates/admin/repos/repos.html:74
 #: rhodecode/templates/admin/users/user_edit_my_account.html:174
 #: rhodecode/templates/journal/journal.html:195
-#: rhodecode/templates/journal/journal.html:298
+#: rhodecode/templates/journal/journal.html:285
 msgid "Tip"
 msgstr "Sommet"
 
-#: rhodecode/templates/index_base.html:86
-#: rhodecode/templates/index_base.html:185
-#: rhodecode/templates/index_base.html:275
-#: rhodecode/templates/admin/repos/repo_edit.html:121
+#: rhodecode/templates/index_base.html:128
+#: rhodecode/templates/admin/repos/repo_edit.html:114
 #: rhodecode/templates/admin/repos/repos.html:76
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: rhodecode/templates/index_base.html:87
-msgid "Atom"
-msgstr "Atom"
-
-#: rhodecode/templates/index_base.html:171
-#: rhodecode/templates/index_base.html:209
-#: rhodecode/templates/index_base.html:296
-#: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:196
+#: rhodecode/templates/index_base.html:136
+#: rhodecode/templates/admin/repos/repos.html:84
+#: rhodecode/templates/admin/users/user_edit_my_account.html:183
 #: rhodecode/templates/admin/users/users.html:107
-#: rhodecode/templates/bookmarks/bookmarks.html:58
+#: rhodecode/templates/bookmarks/bookmarks.html:74
 #: rhodecode/templates/branches/branches.html:73
-#: rhodecode/templates/journal/journal.html:217
-#: rhodecode/templates/journal/journal.html:320
+#: rhodecode/templates/journal/journal.html:204
+#: rhodecode/templates/journal/journal.html:294
 #: rhodecode/templates/tags/tags.html:74
 msgid "Click to sort ascending"
 msgstr "Tri ascendant"
 
-#: rhodecode/templates/index_base.html:172
-#: rhodecode/templates/index_base.html:210
-#: rhodecode/templates/index_base.html:297
-#: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:197
+#: rhodecode/templates/index_base.html:137
+#: rhodecode/templates/admin/repos/repos.html:85
+#: rhodecode/templates/admin/users/user_edit_my_account.html:184
 #: rhodecode/templates/admin/users/users.html:108
-#: rhodecode/templates/bookmarks/bookmarks.html:59
+#: rhodecode/templates/bookmarks/bookmarks.html:75
 #: rhodecode/templates/branches/branches.html:74
-#: rhodecode/templates/journal/journal.html:218
-#: rhodecode/templates/journal/journal.html:321
+#: rhodecode/templates/journal/journal.html:205
+#: rhodecode/templates/journal/journal.html:295
 #: rhodecode/templates/tags/tags.html:75
 msgid "Click to sort descending"
 msgstr "Tri descendant"
 
-#: rhodecode/templates/index_base.html:181
-#: rhodecode/templates/index_base.html:271
-msgid "Last Change"
-msgstr "Dernière modification"
-
-#: rhodecode/templates/index_base.html:211
-#: rhodecode/templates/admin/repos/repos.html:99
-#: rhodecode/templates/admin/users/user_edit_my_account.html:198
-#: rhodecode/templates/admin/users/users.html:109
-#: rhodecode/templates/bookmarks/bookmarks.html:60
-#: rhodecode/templates/branches/branches.html:75
-#: rhodecode/templates/journal/journal.html:219
-#: rhodecode/templates/journal/journal.html:322
-#: rhodecode/templates/tags/tags.html:76
-msgid "No records found."
-msgstr "Aucun élément n’a été trouvé."
-
-#: rhodecode/templates/index_base.html:212
-#: rhodecode/templates/index_base.html:299
-#: rhodecode/templates/admin/repos/repos.html:100
-#: rhodecode/templates/admin/users/user_edit_my_account.html:199
+#: rhodecode/templates/index_base.html:138
+#, fuzzy
+msgid "No repositories found."
+msgstr "Groupes de dépôts"
+
+#: rhodecode/templates/index_base.html:139
+#: rhodecode/templates/admin/repos/repos.html:87
+#: rhodecode/templates/admin/users/user_edit_my_account.html:186
 #: rhodecode/templates/admin/users/users.html:110
-#: rhodecode/templates/bookmarks/bookmarks.html:61
+#: rhodecode/templates/bookmarks/bookmarks.html:77
 #: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:220
-#: rhodecode/templates/journal/journal.html:323
+#: rhodecode/templates/journal/journal.html:207
+#: rhodecode/templates/journal/journal.html:297
 #: rhodecode/templates/tags/tags.html:77
 msgid "Data error."
 msgstr "Erreur d’intégrité des données."
 
-#: rhodecode/templates/index_base.html:213
-#: rhodecode/templates/index_base.html:300
-#: rhodecode/templates/admin/repos/repos.html:101
+#: rhodecode/templates/index_base.html:140
+#: rhodecode/templates/admin/repos/repos.html:88
 #: rhodecode/templates/admin/users/user_edit_my_account.html:58
-#: rhodecode/templates/admin/users/user_edit_my_account.html:200
+#: rhodecode/templates/admin/users/user_edit_my_account.html:187
 #: rhodecode/templates/admin/users/users.html:111
-#: rhodecode/templates/bookmarks/bookmarks.html:62
+#: rhodecode/templates/bookmarks/bookmarks.html:78
 #: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:221
-#: rhodecode/templates/journal/journal.html:324
+#: rhodecode/templates/journal/journal.html:208
+#: rhodecode/templates/journal/journal.html:298
 #: rhodecode/templates/tags/tags.html:78
 msgid "Loading..."
 msgstr "Chargement…"
 
-#: rhodecode/templates/index_base.html:298
-#, fuzzy
-msgid "No repositories found."
-msgstr "Groupes de dépôts"
-
-#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227
+#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239
 msgid "Log In"
 msgstr "Connexion"
 
@@ -1761,7 +1867,7 b' msgstr ""'
 #: rhodecode/templates/admin/users/user_edit.html:57
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:31
 #: rhodecode/templates/admin/users/users.html:77
-#: rhodecode/templates/base/base.html:203
+#: rhodecode/templates/base/base.html:215
 #: rhodecode/templates/summary/summary.html:123
 msgid "Username"
 msgstr "Nom d’utilisateur"
@@ -1769,7 +1875,7 b' msgstr "Nom d\xe2\x80\x99utilisateur"'
 #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
 #: rhodecode/templates/admin/ldap/ldap.html:46
 #: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:212
+#: rhodecode/templates/base/base.html:224
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -1785,7 +1891,7 b' msgstr "Connexion"'
 msgid "Forgot your password ?"
 msgstr "Mot de passe oublié ?"
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235
 msgid "Don't have an account ?"
 msgstr "Vous n’avez pas de compte ?"
 
@@ -1855,7 +1961,7 b' msgstr "Votre compte utilisateur devra \xc3\xaatre activ\xc3\xa9 par un administrateur."'
 #: rhodecode/templates/repo_switcher_list.html:10
 #: rhodecode/templates/admin/defaults/defaults.html:44
 #: rhodecode/templates/admin/repos/repo_add_base.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:85
+#: rhodecode/templates/admin/repos/repo_edit.html:78
 #: rhodecode/templates/data_table/_dt_elements.html:61
 #: rhodecode/templates/summary/summary.html:77
 msgid "Private repository"
@@ -1878,13 +1984,13 b' msgid "There are no tags yet"'
 msgstr "Aucun tag n’a été créé pour le moment."
 
 #: rhodecode/templates/switch_to_list.html:35
-#: rhodecode/templates/bookmarks/bookmarks_data.html:32
+#: rhodecode/templates/bookmarks/bookmarks_data.html:37
 msgid "There are no bookmarks yet"
 msgstr "Aucun signet n’a été créé."
 
 #: rhodecode/templates/admin/admin.html:5
 #: rhodecode/templates/admin/admin.html:13
-#: rhodecode/templates/base/base.html:68
+#: rhodecode/templates/base/base.html:73
 msgid "Admin journal"
 msgstr "Historique d’administration"
 
@@ -1912,9 +2018,9 b' msgstr[1] ""'
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
 #: rhodecode/templates/admin/users/user_edit_my_account.html:176
 #: rhodecode/templates/admin/users/users.html:87
-#: rhodecode/templates/admin/users_groups/users_groups.html:37
+#: rhodecode/templates/admin/users_groups/users_groups.html:40
 #: rhodecode/templates/journal/journal.html:197
-#: rhodecode/templates/journal/journal.html:300
+#: rhodecode/templates/journal/journal.html:287
 msgid "Action"
 msgstr "Action"
 
@@ -1924,7 +2030,7 b' msgid "Repository"'
 msgstr "Dépôt"
 
 #: rhodecode/templates/admin/admin_log.html:8
-#: rhodecode/templates/bookmarks/bookmarks.html:35
+#: rhodecode/templates/bookmarks/bookmarks.html:49
 #: rhodecode/templates/bookmarks/bookmarks_data.html:7
 #: rhodecode/templates/branches/branches.html:48
 #: rhodecode/templates/branches/branches_data.html:7
@@ -1948,20 +2054,19 b' msgid "Repositories defaults"'
 msgstr "Groupes de dépôts"
 
 #: rhodecode/templates/admin/defaults/defaults.html:11
-#: rhodecode/templates/base/base.html:75
+#: rhodecode/templates/base/base.html:80
 #, fuzzy
 msgid "Defaults"
 msgstr "[Par défaut]"
 
 #: rhodecode/templates/admin/defaults/defaults.html:35
 #: rhodecode/templates/admin/repos/repo_add_base.html:38
-#: rhodecode/templates/admin/repos/repo_edit.html:58
 msgid "Type"
 msgstr "Type"
 
 #: rhodecode/templates/admin/defaults/defaults.html:48
 #: rhodecode/templates/admin/repos/repo_add_base.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:89
+#: rhodecode/templates/admin/repos/repo_edit.html:82
 #: rhodecode/templates/forks/fork.html:69
 msgid ""
 "Private repositories are only visible to people explicitly added as "
@@ -1971,60 +2076,194 b' msgstr ""'
 "comme collaborateurs."
 
 #: rhodecode/templates/admin/defaults/defaults.html:55
-#: rhodecode/templates/admin/repos/repo_edit.html:94
+#: rhodecode/templates/admin/repos/repo_edit.html:87
 msgid "Enable statistics"
 msgstr "Activer les statistiques"
 
 #: rhodecode/templates/admin/defaults/defaults.html:59
-#: rhodecode/templates/admin/repos/repo_edit.html:98
+#: rhodecode/templates/admin/repos/repo_edit.html:91
 msgid "Enable statistics window on summary page."
 msgstr "Afficher les statistiques sur la page du dépôt."
 
 #: rhodecode/templates/admin/defaults/defaults.html:65
-#: rhodecode/templates/admin/repos/repo_edit.html:103
+#: rhodecode/templates/admin/repos/repo_edit.html:96
 msgid "Enable downloads"
 msgstr "Activer les téléchargements"
 
 #: rhodecode/templates/admin/defaults/defaults.html:69
-#: rhodecode/templates/admin/repos/repo_edit.html:107
+#: rhodecode/templates/admin/repos/repo_edit.html:100
 msgid "Enable download menu on summary page."
 msgstr "Afficher le menu de téléchargements sur la page du dépôt."
 
 #: rhodecode/templates/admin/defaults/defaults.html:75
-#: rhodecode/templates/admin/repos/repo_edit.html:112
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
+#: rhodecode/templates/admin/repos/repo_edit.html:105
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64
 msgid "Enable locking"
 msgstr "Activer le verrouillage"
 
 #: rhodecode/templates/admin/defaults/defaults.html:79
-#: rhodecode/templates/admin/repos/repo_edit.html:116
+#: rhodecode/templates/admin/repos/repo_edit.html:109
 msgid "Enable lock-by-pulling on repository."
 msgstr "Activer le verrouillage lors d’un pull sur le dépôt."
 
 #: rhodecode/templates/admin/defaults/defaults.html:84
 #: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/permissions/permissions.html:92
-#: rhodecode/templates/admin/repos/repo_edit.html:148
-#: rhodecode/templates/admin/repos/repo_edit.html:173
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80
+#: rhodecode/templates/admin/permissions/permissions.html:122
+#: rhodecode/templates/admin/repos/repo_edit.html:141
+#: rhodecode/templates/admin/repos/repo_edit.html:166
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96
 #: rhodecode/templates/admin/settings/hooks.html:73
 #: rhodecode/templates/admin/users/user_add.html:94
 #: rhodecode/templates/admin/users/user_edit.html:140
-#: rhodecode/templates/admin/users/user_edit.html:185
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:88
 #: rhodecode/templates/admin/users_groups/users_group_add.html:49
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:135
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:143
+#: rhodecode/templates/base/default_perms_box.html:53
 msgid "Save"
 msgstr "Enregistrer"
 
+#: rhodecode/templates/admin/gists/index.html:5
+#: rhodecode/templates/base/base.html:299
+msgid "Gists"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:10
+#, fuzzy, python-format
+msgid "Private Gists for user %s"
+msgstr "utilisateur %s créé"
+
+#: rhodecode/templates/admin/gists/index.html:12
+#, python-format
+msgid "Public Gists for user %s"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:14
+msgid "Public Gists"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/index.html:31
+#: rhodecode/templates/admin/gists/show.html:24
+#: rhodecode/templates/base/base.html:302
+#, fuzzy
+msgid "Create new gist"
+msgstr "Créer un nouveau fichier"
+
+#: rhodecode/templates/admin/gists/index.html:48
+#, fuzzy
+msgid "Created"
+msgstr "Lecture"
+
+#: rhodecode/templates/admin/gists/index.html:51
+#: rhodecode/templates/admin/gists/index.html:53
+#: rhodecode/templates/admin/gists/show.html:43
+#: rhodecode/templates/admin/gists/show.html:45
+#, fuzzy
+msgid "Expires"
+msgstr "Dépôts"
+
+#: rhodecode/templates/admin/gists/index.html:51
+#: rhodecode/templates/admin/gists/show.html:43
+#, fuzzy
+msgid "never"
+msgstr "%d relecteur"
+
+#: rhodecode/templates/admin/gists/index.html:68
+#, fuzzy
+msgid "There are no gists yet"
+msgstr "Aucun tag n’a été créé pour le moment."
+
+#: rhodecode/templates/admin/gists/new.html:5
+#: rhodecode/templates/admin/gists/new.html:16
+msgid "New gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:37
+#, fuzzy
+msgid "Gist description ..."
+msgstr "Description"
+
+#: rhodecode/templates/admin/gists/new.html:52
+msgid "Create private gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:53
+msgid "Create public gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/new.html:54
+#: rhodecode/templates/admin/permissions/permissions.html:123
+#: rhodecode/templates/admin/permissions/permissions.html:185
+#: rhodecode/templates/admin/repos/repo_edit.html:142
+#: rhodecode/templates/admin/repos/repo_edit.html:167
+#: rhodecode/templates/admin/repos/repo_edit.html:381
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97
+#: rhodecode/templates/admin/settings/settings.html:115
+#: rhodecode/templates/admin/settings/settings.html:196
+#: rhodecode/templates/admin/settings/settings.html:288
+#: rhodecode/templates/admin/users/user_edit.html:141
+#: rhodecode/templates/admin/users/user_edit.html:198
+#: rhodecode/templates/admin/users/user_edit.html:246
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:144
+#: rhodecode/templates/base/default_perms_box.html:54
+#: rhodecode/templates/files/files_add.html:80
+#: rhodecode/templates/files/files_edit.html:66
+#: rhodecode/templates/pullrequests/pullrequest.html:86
+msgid "Reset"
+msgstr "Réinitialiser"
+
+#: rhodecode/templates/admin/gists/show.html:5
+msgid "gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:9
+msgid "Gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:36
+msgid "Public gist"
+msgstr ""
+
+#: rhodecode/templates/admin/gists/show.html:38
+#, fuzzy
+msgid "Private gist"
+msgstr "Dépôt privé"
+
+#: rhodecode/templates/admin/gists/show.html:54
+#: rhodecode/templates/admin/repos/repo_edit.html:299
+#: rhodecode/templates/changeset/changeset_file_comment.html:40
+msgid "Delete"
+msgstr "Supprimer"
+
+#: rhodecode/templates/admin/gists/show.html:54
+#, fuzzy
+msgid "Confirm to delete this gist"
+msgstr "Veuillez confirmer la suppression de l’e-mail : %s"
+
+#: rhodecode/templates/admin/gists/show.html:63
+#: rhodecode/templates/admin/gists/show.html:84
+#: rhodecode/templates/files/files_edit.html:48
+#: rhodecode/templates/files/files_source.html:25
+#: rhodecode/templates/files/files_source.html:55
+#, fuzzy
+msgid "Show as raw"
+msgstr "montrer le fichier brut"
+
+#: rhodecode/templates/admin/gists/show.html:71
+#, fuzzy
+msgid "created"
+msgstr "Lecture"
+
 #: rhodecode/templates/admin/ldap/ldap.html:5
 msgid "LDAP administration"
 msgstr "Administration LDAP"
 
 #: rhodecode/templates/admin/ldap/ldap.html:11
 #: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:74
+#: rhodecode/templates/base/base.html:79
 #, fuzzy
 msgid "LDAP"
 msgstr "LDAP"
@@ -2125,7 +2364,7 b' msgid "Show notification"'
 msgstr "Notification"
 
 #: rhodecode/templates/admin/notifications/show_notification.html:9
-#: rhodecode/templates/base/base.html:241
+#: rhodecode/templates/base/base.html:253
 msgid "Notifications"
 msgstr "Notifications"
 
@@ -2134,12 +2373,14 b' msgid "Permissions administration"'
 msgstr "Gestion des permissions"
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
+#: rhodecode/templates/admin/repos/repo_edit.html:151
 #: rhodecode/templates/admin/repos/repo_edit.html:158
-#: rhodecode/templates/admin/repos/repo_edit.html:165
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88
 #: rhodecode/templates/admin/users/user_edit.html:150
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:100
-#: rhodecode/templates/base/base.html:73
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:129
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
+#: rhodecode/templates/base/base.html:78
 msgid "Permissions"
 msgstr "Permissions"
 
@@ -2164,6 +2405,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/permissions/permissions.html:50
 #: rhodecode/templates/admin/permissions/permissions.html:63
+#: rhodecode/templates/admin/permissions/permissions.html:77
 #, fuzzy
 msgid "Overwrite existing settings"
 msgstr "Écraser les permissions existantes"
@@ -2180,89 +2422,95 b' msgstr ""'
 "perdues."
 
 #: rhodecode/templates/admin/permissions/permissions.html:69
-msgid "Registration"
-msgstr "Enregistrement"
-
-#: rhodecode/templates/admin/permissions/permissions.html:77
+#, fuzzy
+msgid "User group"
+msgstr "Groupes d’utilisateurs"
+
+#: rhodecode/templates/admin/permissions/permissions.html:76
+#, fuzzy
+msgid ""
+"All default permissions on each user group will be reset to chosen "
+"permission, note that all custom default permission on repository groups "
+"will be lost"
+msgstr ""
+"Les permissions par défaut de chaque dépôt vont être remplacées par la "
+"permission choisie. Toutes les permissions par défaut des dépôts seront "
+"perdues."
+
+#: rhodecode/templates/admin/permissions/permissions.html:83
 msgid "Repository creation"
 msgstr "Création de dépôt"
 
-#: rhodecode/templates/admin/permissions/permissions.html:85
+#: rhodecode/templates/admin/permissions/permissions.html:91
+#, fuzzy
+msgid "User group creation"
+msgstr "Gestion des groupes d’utilisateurs"
+
+#: rhodecode/templates/admin/permissions/permissions.html:99
 msgid "Repository forking"
 msgstr "Fork de dépôt"
 
-#: rhodecode/templates/admin/permissions/permissions.html:93
-#: rhodecode/templates/admin/permissions/permissions.html:154
-#: rhodecode/templates/admin/repos/repo_edit.html:149
-#: rhodecode/templates/admin/repos/repo_edit.html:174
-#: rhodecode/templates/admin/repos/repo_edit.html:388
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81
-#: rhodecode/templates/admin/settings/settings.html:115
-#: rhodecode/templates/admin/settings/settings.html:187
-#: rhodecode/templates/admin/settings/settings.html:278
-#: rhodecode/templates/admin/users/user_edit.html:141
-#: rhodecode/templates/admin/users/user_edit.html:186
-#: rhodecode/templates/admin/users/user_edit.html:235
-#: rhodecode/templates/admin/users/user_edit.html:283
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/files/files_add.html:80
-#: rhodecode/templates/files/files_edit.html:66
-#: rhodecode/templates/pullrequests/pullrequest.html:110
-msgid "Reset"
-msgstr "Réinitialiser"
-
-#: rhodecode/templates/admin/permissions/permissions.html:103
+#: rhodecode/templates/admin/permissions/permissions.html:107
+msgid "Registration"
+msgstr "Enregistrement"
+
+#: rhodecode/templates/admin/permissions/permissions.html:115
+#, fuzzy
+msgid "External auth account activation"
+msgstr "Autorisé avec activation automatique du compte"
+
+#: rhodecode/templates/admin/permissions/permissions.html:133
 #, fuzzy
 msgid "Default User Permissions"
 msgstr "Permissions par défaut"
 
-#: rhodecode/templates/admin/permissions/permissions.html:113
-#: rhodecode/templates/admin/users/user_edit.html:244
+#: rhodecode/templates/admin/permissions/permissions.html:144
+#: rhodecode/templates/admin/users/user_edit.html:207
 #, fuzzy
 msgid "Allowed IP addresses"
 msgstr "Adresses e-mail"
 
-#: rhodecode/templates/admin/permissions/permissions.html:127
-#: rhodecode/templates/admin/repos/repo_edit.html:347
+#: rhodecode/templates/admin/permissions/permissions.html:158
+#: rhodecode/templates/admin/repos/repo_edit.html:340
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
-#: rhodecode/templates/admin/users/user_edit.html:212
-#: rhodecode/templates/admin/users/user_edit.html:257
-#: rhodecode/templates/admin/users_groups/users_groups.html:46
+#: rhodecode/templates/admin/users/user_edit.html:175
+#: rhodecode/templates/admin/users/user_edit.html:220
+#: rhodecode/templates/admin/users_groups/users_groups.html:54
 #: rhodecode/templates/data_table/_dt_elements.html:122
-#: rhodecode/templates/data_table/_dt_elements.html:130
+#: rhodecode/templates/data_table/_dt_elements.html:136
 msgid "delete"
 msgstr "Supprimer"
 
-#: rhodecode/templates/admin/permissions/permissions.html:128
-#: rhodecode/templates/admin/users/user_edit.html:258
+#: rhodecode/templates/admin/permissions/permissions.html:159
+#: rhodecode/templates/admin/users/user_edit.html:221
 #, fuzzy, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr "Veuillez confirmer la suppression de l’e-mail : %s"
 
-#: rhodecode/templates/admin/permissions/permissions.html:134
-#: rhodecode/templates/admin/users/user_edit.html:264
+#: rhodecode/templates/admin/permissions/permissions.html:165
+#: rhodecode/templates/admin/users/user_edit.html:227
 msgid "All IP addresses are allowed"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:145
-#: rhodecode/templates/admin/users/user_edit.html:275
+#: rhodecode/templates/admin/permissions/permissions.html:176
+#: rhodecode/templates/admin/users/user_edit.html:238
 #, fuzzy
 msgid "New ip address"
 msgstr "Nouvelle adrese"
 
-#: rhodecode/templates/admin/permissions/permissions.html:153
+#: rhodecode/templates/admin/permissions/permissions.html:184
 #: rhodecode/templates/admin/repos/repo_add_base.html:73
-#: rhodecode/templates/admin/repos/repo_edit.html:387
-#: rhodecode/templates/admin/users/user_edit.html:234
-#: rhodecode/templates/admin/users/user_edit.html:282
+#: rhodecode/templates/admin/repos/repo_edit.html:380
+#: rhodecode/templates/admin/users/user_edit.html:197
+#: rhodecode/templates/admin/users/user_edit.html:245
 msgid "Add"
 msgstr "Ajouter"
 
 #: rhodecode/templates/admin/repos/repo_add.html:12
 #: rhodecode/templates/admin/repos/repo_add.html:16
-#: rhodecode/templates/base/base.html:69 rhodecode/templates/base/base.html:103
-#: rhodecode/templates/base/base.html:263
+#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88
+#: rhodecode/templates/base/base.html:116
+#: rhodecode/templates/base/base.html:275
 msgid "Repositories"
 msgstr "Dépôts"
 
@@ -2278,7 +2526,7 b' msgid "Clone from"'
 msgstr "Cloner depuis"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:24
-#: rhodecode/templates/admin/repos/repo_edit.html:44
+#: rhodecode/templates/admin/repos/repo_edit.html:45
 msgid "Optional http[s] url from which repository should be cloned."
 msgstr "URL http(s) depuis laquelle le dépôt doit être cloné."
 
@@ -2292,13 +2540,13 b' msgid "Type of repository to create."'
 msgstr "Type de dépôt à créer."
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:47
-#: rhodecode/templates/admin/repos/repo_edit.html:66
+#: rhodecode/templates/admin/repos/repo_edit.html:59
 #: rhodecode/templates/forks/fork.html:38
 msgid "Landing revision"
 msgstr "Révision d’arrivée"
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:51
-#: rhodecode/templates/admin/repos/repo_edit.html:70
+#: rhodecode/templates/admin/repos/repo_edit.html:63
 #: rhodecode/templates/forks/fork.html:42
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
@@ -2306,7 +2554,7 b' msgstr ""'
 "recherche et de documentation."
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:60
-#: rhodecode/templates/admin/repos/repo_edit.html:79
+#: rhodecode/templates/admin/repos/repo_edit.html:72
 #: rhodecode/templates/forks/fork.html:60
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
@@ -2320,73 +2568,78 b' msgstr "\xc3\x89diter le d\xc3\xa9p\xc3\xb4t"'
 #: rhodecode/templates/admin/repos/repo_edit.html:12
 #: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:11
-#: rhodecode/templates/base/base.html:76 rhodecode/templates/base/base.html:121
+#: rhodecode/templates/base/base.html:81 rhodecode/templates/base/base.html:134
 #: rhodecode/templates/summary/summary.html:212
 msgid "Settings"
 msgstr "Options"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:40
+#: rhodecode/templates/admin/repos/repo_edit.html:36
+#, fuzzy
+msgid "Non-changeable id"
+msgstr "Identifiant permanent : %s"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:41
 msgid "Clone uri"
 msgstr "URL de clone"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:53
+#: rhodecode/templates/admin/repos/repo_edit.html:54
 msgid "Optional select a group to put this repository into."
 msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:126
+#: rhodecode/templates/admin/repos/repo_edit.html:119
 msgid "Change owner of this repository."
 msgstr "Changer le propriétaire de ce dépôt."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:184
+#: rhodecode/templates/admin/repos/repo_edit.html:177
 #, fuzzy
 msgid "Advanced settings"
 msgstr "Enregister les options"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:187
+#: rhodecode/templates/admin/repos/repo_edit.html:180
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:191
+#: rhodecode/templates/admin/repos/repo_edit.html:184
 msgid "Reset current statistics"
 msgstr "Réinitialiser les statistiques"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:191
+#: rhodecode/templates/admin/repos/repo_edit.html:184
 msgid "Confirm to remove current statistics"
 msgstr "Souhaitez-vous vraiment réinitialiser les statistiques de ce dépôt ?"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:194
+#: rhodecode/templates/admin/repos/repo_edit.html:187
 msgid "Fetched to rev"
 msgstr "Parcouru jusqu’à la révision"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:195
+#: rhodecode/templates/admin/repos/repo_edit.html:188
 msgid "Stats gathered"
 msgstr "Statistiques obtenues"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:203
+#: rhodecode/templates/admin/repos/repo_edit.html:196
 msgid "Remote"
 msgstr "Dépôt distant"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:207
+#: rhodecode/templates/admin/repos/repo_edit.html:200
 msgid "Pull changes from remote location"
 msgstr "Récupérer les changements depuis le site distant"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:207
+#: rhodecode/templates/admin/repos/repo_edit.html:200
 msgid "Confirm to pull changes from remote side"
 msgstr "Voulez-vous vraiment récupérer les changements depuis le site distant ?"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:218
+#: rhodecode/templates/admin/repos/repo_edit.html:211
 msgid "Cache"
 msgstr "Cache"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:222
+#: rhodecode/templates/admin/repos/repo_edit.html:215
 msgid "Invalidate repository cache"
 msgstr "Invalider le cache du dépôt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:222
+#: rhodecode/templates/admin/repos/repo_edit.html:215
 msgid "Confirm to invalidate repository cache"
 msgstr "Voulez-vous vraiment invalider le cache du dépôt ?"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:225
+#: rhodecode/templates/admin/repos/repo_edit.html:218
 msgid ""
 "Manually invalidate cache for this repository. On first access repository"
 " will be cached again"
@@ -2394,44 +2647,44 b' msgstr ""'
 "Invalide manuellement le cache de ce dépôt. Au prochain accès sur ce "
 "dépôt, il sera à nouveau mis en cache."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:230
+#: rhodecode/templates/admin/repos/repo_edit.html:223
 msgid "List of cached values"
 msgstr "Liste des valeurs en cache"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:233
+#: rhodecode/templates/admin/repos/repo_edit.html:226
 msgid "Prefix"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:234
+#: rhodecode/templates/admin/repos/repo_edit.html:227
 #, fuzzy
 msgid "Key"
 msgstr "Clé d’API"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:235
+#: rhodecode/templates/admin/repos/repo_edit.html:228
 #: rhodecode/templates/admin/users/user_add.html:86
 #: rhodecode/templates/admin/users/user_edit.html:124
 #: rhodecode/templates/admin/users/users.html:84
 #: rhodecode/templates/admin/users_groups/users_group_add.html:41
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-#: rhodecode/templates/admin/users_groups/users_groups.html:36
+#: rhodecode/templates/admin/users_groups/users_groups.html:39
 msgid "Active"
 msgstr "Actif"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:250
-#: rhodecode/templates/base/base.html:280
-#: rhodecode/templates/base/base.html:281
+#: rhodecode/templates/admin/repos/repo_edit.html:243
+#: rhodecode/templates/base/base.html:292
+#: rhodecode/templates/base/base.html:293
 msgid "Public journal"
 msgstr "Journal public"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:256
+#: rhodecode/templates/admin/repos/repo_edit.html:249
 msgid "Remove from public journal"
 msgstr "Supprimer du journal public"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:258
+#: rhodecode/templates/admin/repos/repo_edit.html:251
 msgid "Add to public journal"
 msgstr "Ajouter le dépôt au journal public"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:263
+#: rhodecode/templates/admin/repos/repo_edit.html:256
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
@@ -2439,79 +2692,76 b' 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:270
+#: rhodecode/templates/admin/repos/repo_edit.html:263
 msgid "Locking"
 msgstr "Verrouillage"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:275
+#: rhodecode/templates/admin/repos/repo_edit.html:268
 msgid "Unlock locked repo"
 msgstr "Déverrouiller le dépôt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:275
+#: rhodecode/templates/admin/repos/repo_edit.html:268
 msgid "Confirm to unlock repository"
 msgstr "Veuillez confirmer le déverrouillage de ce dépôt."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:278
-msgid "lock repo"
+#: rhodecode/templates/admin/repos/repo_edit.html:271
+#, fuzzy
+msgid "Lock repo"
 msgstr "Verrouiller le dépôt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:278
+#: rhodecode/templates/admin/repos/repo_edit.html:271
 msgid "Confirm to lock repository"
 msgstr "Veuillez confirmer le verrouillage de ce dépôt."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:279
+#: rhodecode/templates/admin/repos/repo_edit.html:272
 msgid "Repository is not locked"
 msgstr "Ce dépôt n’est pas verrouillé."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:284
+#: rhodecode/templates/admin/repos/repo_edit.html:277
 msgid "Force locking on repository. Works only when anonymous access is disabled"
 msgstr ""
 "Forcer le verrouillage du dépôt. Ce réglage fonctionne uniquement quand "
 "l‘accès anonyme est désactivé."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:291
+#: rhodecode/templates/admin/repos/repo_edit.html:284
 msgid "Set as fork of"
 msgstr "Indiquer comme fork"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:296
-msgid "set"
+#: rhodecode/templates/admin/repos/repo_edit.html:289
+#, fuzzy
+msgid "Set"
 msgstr "Définir"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:300
+#: rhodecode/templates/admin/repos/repo_edit.html:293
 msgid "Manually set this repository as a fork of another from the list"
 msgstr "Marquer ce dépôt comme fork d’un autre dépôt de la liste."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:306
-#: rhodecode/templates/changeset/changeset_file_comment.html:41
-msgid "Delete"
-msgstr "Supprimer"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:315
+#: rhodecode/templates/admin/repos/repo_edit.html:308
 msgid "Remove this repository"
 msgstr "Supprimer ce dépôt"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:315
+#: rhodecode/templates/admin/repos/repo_edit.html:308
 msgid "Confirm to delete this repository"
 msgstr "Voulez-vous vraiment supprimer ce dépôt ?"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:317
+#: rhodecode/templates/admin/repos/repo_edit.html:310
 #, fuzzy, python-format
 msgid "this repository has %s fork"
 msgid_plural "this repository has %s forks"
 msgstr[0] "[a créé] le dépôt en tant que %s fork"
 msgstr[1] "[a créé] le dépôt en tant que %s fork"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:318
+#: rhodecode/templates/admin/repos/repo_edit.html:311
 #, fuzzy
 msgid "Detach forks"
 msgstr "Indiquer comme fork"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:319
+#: rhodecode/templates/admin/repos/repo_edit.html:312
 #, fuzzy
 msgid "Delete forks"
 msgstr "Supprimer"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:322
+#: rhodecode/templates/admin/repos/repo_edit.html:315
 #, fuzzy
 msgid ""
 "This repository will be renamed in a special way in order to be "
@@ -2526,59 +2776,64 b' msgstr ""'
 "Si vous voulez le supprimer complètement, effectuez la suppression "
 "manuellement."
 
-#: rhodecode/templates/admin/repos/repo_edit.html:336
+#: rhodecode/templates/admin/repos/repo_edit.html:329
 msgid "Extra fields"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:348
+#: rhodecode/templates/admin/repos/repo_edit.html:341
 #, fuzzy, python-format
 msgid "Confirm to delete this field: %s"
 msgstr "Veuillez confirmer la suppression de l’e-mail : %s"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:362
+#: rhodecode/templates/admin/repos/repo_edit.html:355
 #, fuzzy
 msgid "New field key"
 msgstr "Ajouter un fichier"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:370
+#: rhodecode/templates/admin/repos/repo_edit.html:363
 msgid "New field label"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:373
+#: rhodecode/templates/admin/repos/repo_edit.html:366
 msgid "Enter short label"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:379
+#: rhodecode/templates/admin/repos/repo_edit.html:372
 #, fuzzy
 msgid "New field description"
 msgstr "Description"
 
-#: rhodecode/templates/admin/repos/repo_edit.html:382
+#: rhodecode/templates/admin/repos/repo_edit.html:375
 msgid "Enter description of a field"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3
 msgid "none"
 msgstr "Aucune"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:4
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4
 msgid "read"
 msgstr "Lecture"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:5
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5
 msgid "write"
 msgstr "Écriture"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:6
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6
 msgid "admin"
 msgstr "Administration"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:7
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7
 msgid "member"
 msgstr "Membre"
 
@@ -2590,6 +2845,8 b' msgstr "D\xc3\xa9p\xc3\xb4t priv\xc3\xa9"'
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:28
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35
 msgid "default"
 msgstr "[Par défaut]"
 
@@ -2597,34 +2854,37 b' msgstr "[Par d\xc3\xa9faut]"'
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:55
 msgid "revoke"
 msgstr "Révoquer"
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:83
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81
+#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81
 msgid "Add another member"
 msgstr "Ajouter un utilisateur"
 
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:97
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:100
-msgid "Failed to remove user"
-msgstr "Échec de suppression de l’utilisateur"
-
-#: rhodecode/templates/admin/repos/repo_edit_perms.html:112
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:116
-#, fuzzy
-msgid "Failed to remove user group"
-msgstr "Erreur lors de la suppression du groupe d’utilisateurs."
-
 #: rhodecode/templates/admin/repos/repos.html:5
 msgid "Repositories administration"
 msgstr "Administration des dépôts"
 
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86
+#: rhodecode/templates/admin/repos/repos.html:86
+#: rhodecode/templates/admin/users/user_edit_my_account.html:185
+#: rhodecode/templates/admin/users/users.html:109
+#: rhodecode/templates/bookmarks/bookmarks.html:76
+#: rhodecode/templates/branches/branches.html:75
+#: rhodecode/templates/journal/journal.html:206
+#: rhodecode/templates/journal/journal.html:296
+#: rhodecode/templates/tags/tags.html:76
+msgid "No records found."
+msgstr "Aucun élément n’a été trouvé."
+
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
 msgid "apply to children"
 msgstr "Appliquer aux enfants"
 
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88
 #, fuzzy
 msgid ""
 "Set or revoke permission to all children of that group, including non-"
@@ -2654,7 +2914,7 b' msgstr "Groupe de d\xc3\xa9p\xc3\xb4t"'
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16
-#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:82
+#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91
 #, fuzzy
 msgid "Repository groups"
 msgstr "Groupe de dépôt"
@@ -2688,7 +2948,7 b' msgstr "\xc3\x89dition du groupe de d\xc3\xa9p\xc3\xb4t %s"'
 msgid "Add child group"
 msgstr "Ajouter un nouveau groupe"
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68
 msgid ""
 "Enable lock-by-pulling on group. This option will be applied to all other"
 " groups and repositories inside"
@@ -2706,16 +2966,22 b' msgid "Number of toplevel repositories"'
 msgstr "Nombre de sous-dépôts"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64
+#: rhodecode/templates/admin/users_groups/users_groups.html:48
+#: rhodecode/templates/changeset/changeset_file_comment.html:73
+#: rhodecode/templates/changeset/changeset_file_comment.html:171
 #, fuzzy
 msgid "Edit"
 msgstr "éditer"
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65
+#: rhodecode/templates/admin/users_groups/users_groups.html:49
 #: rhodecode/templates/base/perms_summary.html:29
-#: rhodecode/templates/base/perms_summary.html:48
-#: rhodecode/templates/base/perms_summary.html:50
+#: rhodecode/templates/base/perms_summary.html:60
+#: rhodecode/templates/base/perms_summary.html:62
 #: rhodecode/templates/data_table/_dt_elements.html:116
 #: rhodecode/templates/data_table/_dt_elements.html:117
+#: rhodecode/templates/data_table/_dt_elements.html:130
+#: rhodecode/templates/data_table/_dt_elements.html:131
 msgid "edit"
 msgstr "éditer"
 
@@ -2823,8 +3089,8 b' msgid "Google Analytics code"'
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:114
-#: rhodecode/templates/admin/settings/settings.html:186
-#: rhodecode/templates/admin/settings/settings.html:277
+#: rhodecode/templates/admin/settings/settings.html:195
+#: rhodecode/templates/admin/settings/settings.html:287
 msgid "Save settings"
 msgstr "Enregister les options"
 
@@ -2838,48 +3104,72 b' msgid "General"'
 msgstr "Activer"
 
 #: rhodecode/templates/admin/settings/settings.html:134
-msgid "Use lightweight dashboard"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:140
 #, fuzzy
 msgid "Use repository extra fields"
 msgstr "Dépôts"
 
-#: rhodecode/templates/admin/settings/settings.html:147
+#: rhodecode/templates/admin/settings/settings.html:136
+msgid "Allows storing additional customized fields per repository."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:139
+msgid "Show RhodeCode version"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:141
+msgid "Shows or hides displayed version of RhodeCode in the footer"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:146
+#, fuzzy
+msgid "Dashboard items"
+msgstr "Tableau de bord"
+
+#: rhodecode/templates/admin/settings/settings.html:150
+msgid ""
+"Number of items displayed in lightweight dashboard before pagination is "
+"shown."
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:155
 msgid "Icons"
 msgstr "Icônes"
 
-#: rhodecode/templates/admin/settings/settings.html:152
+#: rhodecode/templates/admin/settings/settings.html:160
 msgid "Show public repo icon on repositories"
 msgstr "Afficher l’icône de dépôt public sur les dépôts"
 
-#: rhodecode/templates/admin/settings/settings.html:156
+#: rhodecode/templates/admin/settings/settings.html:164
 msgid "Show private repo icon on repositories"
 msgstr "Afficher l’icône de dépôt privé sur les dépôts"
 
-#: rhodecode/templates/admin/settings/settings.html:163
+#: rhodecode/templates/admin/settings/settings.html:166
+#, fuzzy
+msgid "Show public/private icons next to repositories names"
+msgstr "Afficher l’icône de dépôt public sur les dépôts"
+
+#: rhodecode/templates/admin/settings/settings.html:172
 msgid "Meta-Tagging"
 msgstr "Meta-Tagging"
 
-#: rhodecode/templates/admin/settings/settings.html:168
+#: rhodecode/templates/admin/settings/settings.html:177
 msgid "Stylify recognised metatags:"
 msgstr "Styliser les méta-tags reconnus :"
 
-#: rhodecode/templates/admin/settings/settings.html:195
+#: rhodecode/templates/admin/settings/settings.html:204
 msgid "VCS settings"
 msgstr "Réglages de gestionnaire de version"
 
-#: rhodecode/templates/admin/settings/settings.html:204
+#: rhodecode/templates/admin/settings/settings.html:213
 msgid "Web"
 msgstr "Web"
 
-#: rhodecode/templates/admin/settings/settings.html:209
+#: rhodecode/templates/admin/settings/settings.html:218
 #, fuzzy
 msgid "Require SSL for vcs operations"
 msgstr "SSL requis pour les opérations de push/pull"
 
-#: rhodecode/templates/admin/settings/settings.html:211
+#: rhodecode/templates/admin/settings/settings.html:220
 msgid ""
 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it "
 "will return HTTP Error 406: Not Acceptable"
@@ -2887,46 +3177,46 b' msgstr ""'
 "RhodeCode requièrera SSL pour les pushs et pulls. Si le SSL n’est pas "
 "utilisé l’erreur HTTP 406 (Non Acceptable) sera renvoyée."
 
-#: rhodecode/templates/admin/settings/settings.html:217
+#: rhodecode/templates/admin/settings/settings.html:226
 msgid "Hooks"
 msgstr "Hooks"
 
-#: rhodecode/templates/admin/settings/settings.html:222
+#: rhodecode/templates/admin/settings/settings.html:231
 msgid "Update repository after push (hg update)"
 msgstr "Mettre à jour les dépôts après un push (hg update)"
 
-#: rhodecode/templates/admin/settings/settings.html:226
+#: rhodecode/templates/admin/settings/settings.html:235
 msgid "Show repository size after push"
 msgstr "Afficher la taille du dépôt après un push"
 
-#: rhodecode/templates/admin/settings/settings.html:230
+#: rhodecode/templates/admin/settings/settings.html:239
 msgid "Log user push commands"
 msgstr "Journaliser les commandes de push"
 
-#: rhodecode/templates/admin/settings/settings.html:234
+#: rhodecode/templates/admin/settings/settings.html:243
 msgid "Log user pull commands"
 msgstr "Journaliser les commandes de pull"
 
-#: rhodecode/templates/admin/settings/settings.html:238
+#: rhodecode/templates/admin/settings/settings.html:247
 #, fuzzy
 msgid "Advanced setup"
 msgstr "Avancé"
 
-#: rhodecode/templates/admin/settings/settings.html:243
+#: rhodecode/templates/admin/settings/settings.html:252
 msgid "Mercurial Extensions"
 msgstr "Extensions Mercurial"
 
-#: rhodecode/templates/admin/settings/settings.html:248
+#: rhodecode/templates/admin/settings/settings.html:257
 #, fuzzy
 msgid "Enable largefiles extension"
 msgstr "Extensions largefiles"
 
-#: rhodecode/templates/admin/settings/settings.html:252
+#: rhodecode/templates/admin/settings/settings.html:261
 #, fuzzy
 msgid "Enable hgsubversion extension"
 msgstr "Extensions hgsubversion"
 
-#: rhodecode/templates/admin/settings/settings.html:254
+#: rhodecode/templates/admin/settings/settings.html:263
 #, fuzzy
 msgid ""
 "Requires hgsubversion library installed. Allows cloning from svn remote "
@@ -2935,27 +3225,23 b' msgstr ""'
 "Ceci nécessite l’installation de la bibliothèque hgsubversion. Permet de "
 "clôner à partir de dépôts Suversion."
 
-#: rhodecode/templates/admin/settings/settings.html:264
+#: rhodecode/templates/admin/settings/settings.html:274
 msgid "Repositories location"
 msgstr "Emplacement des dépôts"
 
-#: rhodecode/templates/admin/settings/settings.html:269
+#: rhodecode/templates/admin/settings/settings.html:279
 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."
+"Click to unlock. You must restart RhodeCode in order to make this setting"
+" take effect."
 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:270
-#: rhodecode/templates/base/base.html:131
+
+#: rhodecode/templates/admin/settings/settings.html:280
+#: rhodecode/templates/base/base.html:143
 #, fuzzy
 msgid "Unlock"
 msgstr "Déverrouiller"
 
-#: rhodecode/templates/admin/settings/settings.html:272
+#: rhodecode/templates/admin/settings/settings.html:282
 msgid ""
 "Location where repositories are stored. After changing this value a "
 "restart, and rescan is required"
@@ -2963,24 +3249,24 b' msgstr ""'
 "Emplacement de stockage des dépôts. Si cette valeur est changée, "
 "Rhodecode devra être redémarré les les dépôts rescannés."
 
-#: rhodecode/templates/admin/settings/settings.html:292
+#: rhodecode/templates/admin/settings/settings.html:303
 msgid "Test Email"
 msgstr "E-mail de test"
 
-#: rhodecode/templates/admin/settings/settings.html:300
+#: rhodecode/templates/admin/settings/settings.html:311
 msgid "Email to"
 msgstr "Envoyer l’e-mail à"
 
-#: rhodecode/templates/admin/settings/settings.html:308
+#: rhodecode/templates/admin/settings/settings.html:319
 msgid "Send"
 msgstr "Envoyer"
 
-#: rhodecode/templates/admin/settings/settings.html:314
+#: rhodecode/templates/admin/settings/settings.html:325
 msgid "System Info and Packages"
 msgstr "Information système et paquets"
 
-#: rhodecode/templates/admin/settings/settings.html:317
-#: rhodecode/templates/changelog/changelog.html:42
+#: rhodecode/templates/admin/settings/settings.html:328
+#: rhodecode/templates/changelog/changelog.html:51
 msgid "Show"
 msgstr "Afficher"
 
@@ -2990,7 +3276,7 b' msgstr "Ajouter un utilisateur"'
 
 #: rhodecode/templates/admin/users/user_add.html:10
 #: rhodecode/templates/admin/users/user_edit.html:11
-#: rhodecode/templates/base/base.html:71
+#: rhodecode/templates/base/base.html:76
 msgid "Users"
 msgstr "Utilisateurs"
 
@@ -3048,46 +3334,21 b' msgstr "Nouveau mot de passe"'
 msgid "New password confirmation"
 msgstr "Confirmation du nouveau mot de passe"
 
-#: rhodecode/templates/admin/users/user_edit.html:158
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:108
-msgid "Inherit default permissions"
-msgstr "Utiliser les permissions par défaut"
-
 #: rhodecode/templates/admin/users/user_edit.html:163
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:113
-#, python-format
-msgid ""
-"Select to inherit permissions from %s settings. With this selected below "
-"options does not have any action"
-msgstr ""
-"Cochez pour utiliser les permissions des les réglages %s. Si cette option"
-" est activée, les réglages ci-dessous n’auront pas d’effet."
-
-#: rhodecode/templates/admin/users/user_edit.html:169
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:119
-msgid "Create repositories"
-msgstr "Création de dépôts"
-
-#: rhodecode/templates/admin/users/user_edit.html:177
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:127
-msgid "Fork repositories"
-msgstr "Forker les dépôts"
-
-#: rhodecode/templates/admin/users/user_edit.html:200
 msgid "Email addresses"
 msgstr "Adresses e-mail"
 
-#: rhodecode/templates/admin/users/user_edit.html:213
+#: rhodecode/templates/admin/users/user_edit.html:176
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr "Veuillez confirmer la suppression de l’e-mail : %s"
 
-#: rhodecode/templates/admin/users/user_edit.html:227
+#: rhodecode/templates/admin/users/user_edit.html:190
 msgid "New email address"
 msgstr "Nouvelle adrese"
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:242
+#: rhodecode/templates/base/base.html:254
 msgid "My account"
 msgstr "Mon compte"
 
@@ -3125,7 +3386,7 b' msgstr "Requ\xc3\xaate de pull n\xc2\xba%s ouverte le %s"'
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45
-#: rhodecode/templates/pullrequests/pullrequest_data.html:7
+#: rhodecode/templates/pullrequests/pullrequest_data.html:11
 #: rhodecode/templates/pullrequests/pullrequest_show.html:27
 #: rhodecode/templates/pullrequests/pullrequest_show.html:42
 msgid "Closed"
@@ -3145,7 +3406,7 b' msgid "I participate in"'
 msgstr "Je participe à"
 
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42
-#: rhodecode/templates/pullrequests/pullrequest_data.html:11
+#: rhodecode/templates/pullrequests/pullrequest_data.html:8
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
 msgstr "Requête de pull nº%s ouverte par %s le %s"
@@ -3180,13 +3441,13 b' msgstr "Ajouter un groupe d\xe2\x80\x99utilisateur"'
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:10
 #: rhodecode/templates/admin/users_groups/users_groups.html:11
-#: rhodecode/templates/base/base.html:72
+#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94
 #, fuzzy
 msgid "User groups"
 msgstr "Groupes d’utilisateurs"
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:12
-#: rhodecode/templates/admin/users_groups/users_groups.html:25
+#: rhodecode/templates/admin/users_groups/users_groups.html:26
 #, fuzzy
 msgid "Add new user group"
 msgstr "Ajouter un nouveau groupe"
@@ -3202,7 +3463,7 b' msgid "UserGroups"'
 msgstr "Groupes d’utilisateurs"
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:50
-#: rhodecode/templates/admin/users_groups/users_groups.html:35
+#: rhodecode/templates/admin/users_groups/users_groups.html:38
 msgid "Members"
 msgstr "Membres"
 
@@ -3223,47 +3484,57 b' msgstr "Membres disponibles"'
 msgid "Add all elements"
 msgstr "Tout ajouter"
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:150
-msgid "Group members"
-msgstr "Membres du groupe"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:167
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:109
 #, fuzzy
 msgid "No members yet"
 msgstr "Membres"
 
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:117
+#, fuzzy
+msgid "Global Permissions"
+msgstr "Copier les permissions"
+
 #: rhodecode/templates/admin/users_groups/users_groups.html:5
 #, fuzzy
 msgid "User groups administration"
 msgstr "Gestion des groupes d’utilisateurs"
 
-#: rhodecode/templates/admin/users_groups/users_groups.html:47
+#: rhodecode/templates/admin/users_groups/users_groups.html:55
 #, fuzzy, python-format
 msgid "Confirm to delete this user group: %s"
 msgstr "Voulez-vous vraiment supprimer le groupe d‘utilisateurs « %s » ?"
 
+#: rhodecode/templates/admin/users_groups/users_groups.html:62
+#, fuzzy
+msgid "There are no user groups yet"
+msgstr "Aucun groupe de dépôts n’a été créé pour le moment."
+
 #: rhodecode/templates/base/base.html:42
-msgid "Submit a bug"
-msgstr "Signaler un bogue"
-
-#: rhodecode/templates/base/base.html:108
+#, python-format
+msgid "Server instance: %s"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:52
+msgid "Report a bug"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:121
 #: rhodecode/templates/data_table/_dt_elements.html:9
 #: rhodecode/templates/data_table/_dt_elements.html:11
 #: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/pullrequests/pullrequest_show.html:81
 #: rhodecode/templates/summary/summary.html:8
 msgid "Summary"
 msgstr "Résumé"
 
-#: rhodecode/templates/base/base.html:109
-#: rhodecode/templates/changelog/changelog.html:11
+#: rhodecode/templates/base/base.html:122
+#: 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:110
+#: rhodecode/templates/base/base.html:123
 #: rhodecode/templates/data_table/_dt_elements.html:25
 #: rhodecode/templates/data_table/_dt_elements.html:27
 #: rhodecode/templates/data_table/_dt_elements.html:29
@@ -3271,52 +3542,48 b' msgstr "Historique"'
 msgid "Files"
 msgstr "Fichiers"
 
-#: rhodecode/templates/base/base.html:112
+#: rhodecode/templates/base/base.html:125
 #, fuzzy
 msgid "Switch To"
 msgstr "Aller"
 
-#: rhodecode/templates/base/base.html:114
-#: rhodecode/templates/base/base.html:267
+#: rhodecode/templates/base/base.html:127
+#: rhodecode/templates/base/base.html:279
 msgid "loading..."
 msgstr "Chargement…"
 
-#: rhodecode/templates/base/base.html:118
+#: rhodecode/templates/base/base.html:131
 msgid "Options"
 msgstr "Options"
 
-#: rhodecode/templates/base/base.html:124
+#: rhodecode/templates/base/base.html:137
 #: rhodecode/templates/forks/forks_data.html:21
 msgid "Compare fork"
 msgstr "Comparer le fork"
 
-#: rhodecode/templates/base/base.html:126
-msgid "Lightweight changelog"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:127
-#: rhodecode/templates/base/base.html:287
+#: rhodecode/templates/base/base.html:139
+#: rhodecode/templates/base/base.html:312
 #: rhodecode/templates/search/search.html:14
 #: rhodecode/templates/search/search.html:54
 msgid "Search"
 msgstr "Rechercher"
 
-#: rhodecode/templates/base/base.html:133
+#: rhodecode/templates/base/base.html:145
 #, fuzzy
 msgid "Lock"
 msgstr "Verrouiller"
 
-#: rhodecode/templates/base/base.html:141
+#: rhodecode/templates/base/base.html:153
 #, fuzzy
 msgid "Follow"
 msgstr "followers"
 
-#: rhodecode/templates/base/base.html:142
+#: rhodecode/templates/base/base.html:154
 #, fuzzy
 msgid "Unfollow"
 msgstr "followers"
 
-#: rhodecode/templates/base/base.html:145
+#: rhodecode/templates/base/base.html:157
 #: rhodecode/templates/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
 #: rhodecode/templates/data_table/_dt_elements.html:37
@@ -3325,66 +3592,122 b' msgstr "followers"'
 msgid "Fork"
 msgstr "Fork"
 
-#: rhodecode/templates/base/base.html:147
+#: rhodecode/templates/base/base.html:159
 #, fuzzy
 msgid "Create Pull Request"
 msgstr "Nouvelle requête de pull"
 
-#: rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:165
 #, fuzzy
 msgid "Show Pull Requests"
 msgstr "Nouvelle requête de pull"
 
-#: rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:165
 #, fuzzy
 msgid "Pull Requests"
 msgstr "Requêtes de pull"
 
-#: rhodecode/templates/base/base.html:190
+#: rhodecode/templates/base/base.html:202
 #, fuzzy
 msgid "Not logged in"
 msgstr "Dernière connexion"
 
-#: rhodecode/templates/base/base.html:197
+#: rhodecode/templates/base/base.html:209
 msgid "Login to your account"
 msgstr "Connexion à votre compte"
 
-#: rhodecode/templates/base/base.html:220
+#: rhodecode/templates/base/base.html:232
 msgid "Forgot password ?"
 msgstr "Mot de passe oublié ?"
 
-#: rhodecode/templates/base/base.html:243
+#: rhodecode/templates/base/base.html:255
 msgid "Log Out"
 msgstr "Se déconnecter"
 
-#: rhodecode/templates/base/base.html:262
+#: rhodecode/templates/base/base.html:274
 msgid "Switch repository"
 msgstr "Aller au dépôt"
 
-#: rhodecode/templates/base/base.html:274
+#: rhodecode/templates/base/base.html:286
 msgid "Show recent activity"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:275
+#: rhodecode/templates/base/base.html:287
 #: rhodecode/templates/journal/journal.html:4
 msgid "Journal"
 msgstr "Historique"
 
-#: rhodecode/templates/base/base.html:286
+#: rhodecode/templates/base/base.html:298
+msgid "Show public gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:303
+msgid "All public gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:305
+msgid "My public gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:306
+msgid "My private gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:311
 #, fuzzy
 msgid "Search in repositories"
 msgstr "Rechercher dans tous les dépôts"
 
-#: rhodecode/templates/base/perms_summary.html:8
+#: rhodecode/templates/base/default_perms_box.html:14
+msgid "Inherit default permissions"
+msgstr "Utiliser les permissions par défaut"
+
+#: rhodecode/templates/base/default_perms_box.html:18
+#, fuzzy, python-format
+msgid ""
+"Select to inherit permissions from %s settings. With this selected below "
+"options does not apply."
+msgstr ""
+"Cochez pour utiliser les permissions des les réglages %s. Si cette option"
+" est activée, les réglages ci-dessous n’auront pas d’effet."
+
+#: rhodecode/templates/base/default_perms_box.html:26
+msgid "Create repositories"
+msgstr "Création de dépôts"
+
+#: rhodecode/templates/base/default_perms_box.html:30
+msgid "Select this option to allow repository creation for this user"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:35
+#, fuzzy
+msgid "Create user groups"
+msgstr "[a créé] le groupe d’utilisateurs"
+
+#: rhodecode/templates/base/default_perms_box.html:39
+msgid "Select this option to allow user group creation for this user"
+msgstr ""
+
+#: rhodecode/templates/base/default_perms_box.html:44
+msgid "Fork repositories"
+msgstr "Forker les dépôts"
+
+#: rhodecode/templates/base/default_perms_box.html:48
+msgid "Select this option to allow repository forking for this user"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:11
 #, fuzzy
 msgid "No permissions defined yet"
 msgstr "Copier les permissions"
 
-#: rhodecode/templates/base/perms_summary.html:15
+#: rhodecode/templates/base/perms_summary.html:19
+#: rhodecode/templates/base/perms_summary.html:38
 msgid "Permission"
 msgstr "Permission"
 
-#: rhodecode/templates/base/perms_summary.html:16
+#: rhodecode/templates/base/perms_summary.html:20
+#: rhodecode/templates/base/perms_summary.html:39
 msgid "Edit Permission"
 msgstr "Éditer"
 
@@ -3394,7 +3717,7 b' msgid "Add another comment"'
 msgstr "Nouveau commentaire"
 
 #: rhodecode/templates/base/root.html:44
-#: rhodecode/templates/data_table/_dt_elements.html:140
+#: rhodecode/templates/data_table/_dt_elements.html:147
 msgid "Stop following this repository"
 msgstr "Arrêter de suivre ce dépôt"
 
@@ -3411,7 +3734,7 b' msgid "members"'
 msgstr "Membres"
 
 #: rhodecode/templates/base/root.html:48
-#: rhodecode/templates/pullrequests/pullrequest.html:181
+#: rhodecode/templates/pullrequests/pullrequest.html:203
 #, fuzzy
 msgid "Loading ..."
 msgstr "Chargement…"
@@ -3427,7 +3750,7 b' msgid "No matching files"'
 msgstr "Aucun fichier ne correspond"
 
 #: rhodecode/templates/base/root.html:51
-#: rhodecode/templates/changelog/changelog.html:36
+#: rhodecode/templates/changelog/changelog.html:45
 msgid "Open new pull request"
 msgstr "Nouvelle requête de pull"
 
@@ -3461,31 +3784,50 b' msgstr "Diff de fichier"'
 msgid "Expand diff"
 msgstr "Diff brut"
 
+#: rhodecode/templates/base/root.html:58
+#, fuzzy
+msgid "Failed to remoke permission"
+msgstr "Échec de suppression de l’utilisateur"
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr "Signets de %s"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:37
+#: rhodecode/templates/bookmarks/bookmarks.html:26
+#, fuzzy
+msgid "Compare bookmarks"
+msgstr "Comparer le fork"
+
+#: rhodecode/templates/bookmarks/bookmarks.html:51
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
 #: rhodecode/templates/branches/branches.html:50
 #: rhodecode/templates/branches/branches_data.html:8
-#: rhodecode/templates/shortlog/shortlog_data.html:8
+#: rhodecode/templates/changelog/changelog_summary_data.html:8
 #: rhodecode/templates/tags/tags.html:51
 #: rhodecode/templates/tags/tags_data.html:8
 msgid "Author"
 msgstr "Auteur"
 
-#: rhodecode/templates/bookmarks/bookmarks.html:38
+#: rhodecode/templates/bookmarks/bookmarks.html:52
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
 #: rhodecode/templates/branches/branches.html:51
 #: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/shortlog/shortlog_data.html:5
+#: rhodecode/templates/changelog/changelog_summary_data.html:5
 #: rhodecode/templates/tags/tags.html:52
 #: rhodecode/templates/tags/tags_data.html:9
 msgid "Revision"
 msgstr "Révision"
 
+#: rhodecode/templates/bookmarks/bookmarks.html:54
+#: rhodecode/templates/bookmarks/bookmarks_data.html:10
+#: rhodecode/templates/branches/branches.html:53
+#: rhodecode/templates/branches/branches_data.html:10
+#: rhodecode/templates/tags/tags.html:54
+#: rhodecode/templates/tags/tags_data.html:10
+msgid "Compare"
+msgstr "Comparer"
+
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
@@ -3495,68 +3837,71 b' msgstr "Branches de %s"'
 msgid "Compare branches"
 msgstr "Comparer les branches"
 
-#: rhodecode/templates/branches/branches.html:53
-#: rhodecode/templates/branches/branches_data.html:10
-#: rhodecode/templates/tags/tags.html:54
-#: rhodecode/templates/tags/tags_data.html:10
-msgid "Compare"
-msgstr "Comparer"
-
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr "Historique de %s"
 
-#: rhodecode/templates/changelog/changelog.html:11
+#: rhodecode/templates/changelog/changelog.html:19
 #, 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:30
+#: rhodecode/templates/changelog/changelog.html:39
 #, fuzzy
 msgid "Clear selection"
 msgstr "Réglages de recherche"
 
-#: rhodecode/templates/changelog/changelog.html:33
+#: rhodecode/templates/changelog/changelog.html:42
 #: rhodecode/templates/forks/forks_data.html:19
 #, fuzzy, python-format
 msgid "Compare fork with %s"
 msgstr "Comparer le fork avec %s"
 
-#: rhodecode/templates/changelog/changelog.html:33
+#: rhodecode/templates/changelog/changelog.html:42
 #, fuzzy
 msgid "Compare fork with parent"
 msgstr "Comparer le fork avec %s"
 
-#: rhodecode/templates/changelog/changelog.html:76
-#: rhodecode/templates/summary/summary.html:404
+#: rhodecode/templates/changelog/changelog.html:78
+#: rhodecode/templates/changelog/changelog_summary_data.html:28
+#, python-format
+msgid "Click to open associated pull request #%s"
+msgstr "Cliquez ici pour ouvrir la requête de pull associée #%s."
+
+#: rhodecode/templates/changelog/changelog.html:102
+#: rhodecode/templates/summary/summary.html:403
 #, fuzzy
 msgid "Show more"
 msgstr "montrer plus"
 
-#: rhodecode/templates/changelog/changelog.html:89
+#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changelog/changelog_summary_data.html:50
+#: rhodecode/templates/changeset/changeset.html:107
 #: rhodecode/templates/changeset/changeset_range.html:86
 #, fuzzy, python-format
 msgid "Bookmark %s"
 msgstr "Signets %s"
 
-#: rhodecode/templates/changelog/changelog.html:95
-#: rhodecode/templates/changeset/changeset.html:111
+#: rhodecode/templates/changelog/changelog.html:121
+#: rhodecode/templates/changelog/changelog_summary_data.html:56
+#: rhodecode/templates/changeset/changeset.html:113
 #: rhodecode/templates/changeset/changeset_range.html:92
 #, fuzzy, python-format
 msgid "Tag %s"
 msgstr "Tags %s"
 
-#: rhodecode/templates/changelog/changelog.html:100
-#: rhodecode/templates/changeset/changeset.html:106
-#: rhodecode/templates/changeset/changeset_range.html:80
+#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog_summary_data.html:61
+#: rhodecode/templates/changeset/changeset.html:117
+#: rhodecode/templates/changeset/changeset_range.html:96
 #, fuzzy, python-format
 msgid "Branch %s"
 msgstr "Branches %s"
 
-#: rhodecode/templates/changelog/changelog.html:258
+#: rhodecode/templates/changelog/changelog.html:286
 msgid "There are no changes yet"
 msgstr "Il n’y a aucun changement pour le moment"
 
@@ -3588,6 +3933,40 b' msgstr "Ajout\xc3\xa9s"'
 msgid "Affected %s files"
 msgstr "%s fichiers affectés"
 
+#: rhodecode/templates/changelog/changelog_summary_data.html:6
+#: rhodecode/templates/files/files_add.html:75
+#: rhodecode/templates/files/files_edit.html:61
+#, fuzzy
+msgid "Commit message"
+msgstr "Message de commit"
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:7
+#, fuzzy
+msgid "Age"
+msgstr "Âge"
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:9
+msgid "Refs"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:86
+msgid "Add or upload files directly via RhodeCode"
+msgstr "Ajouter ou téléverser des fichiers directement via RhodeCode…"
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:89
+#: rhodecode/templates/files/files_add.html:38
+#: rhodecode/templates/files/files_browser.html:31
+msgid "Add new file"
+msgstr "Ajouter un nouveau fichier"
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:95
+msgid "Push new repo"
+msgstr "Pusher le nouveau dépôt"
+
+#: rhodecode/templates/changelog/changelog_summary_data.html:103
+msgid "Existing repository?"
+msgstr "Le dépôt existe déjà ?"
+
 #: rhodecode/templates/changeset/changeset.html:6
 #, python-format
 msgid "%s Changeset"
@@ -3609,7 +3988,7 b' msgid "Changeset status"'
 msgstr "Statut du changeset"
 
 #: rhodecode/templates/changeset/changeset.html:67
-#: rhodecode/templates/changeset/diff_block.html:23
+#: rhodecode/templates/changeset/diff_block.html:22
 #, fuzzy
 msgid "Raw diff"
 msgstr "Diff brut"
@@ -3620,13 +3999,13 b' msgid "Patch diff"'
 msgstr "Diff brut"
 
 #: rhodecode/templates/changeset/changeset.html:69
-#: rhodecode/templates/changeset/diff_block.html:24
+#: rhodecode/templates/changeset/diff_block.html:23
 #, fuzzy
 msgid "Download diff"
 msgstr "Télécharger le diff"
 
 #: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:97
+#: rhodecode/templates/changeset/changeset_file_comment.html:103
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -3634,7 +4013,7 b' msgstr[0] "%d commentaire"'
 msgstr[1] "%d commentaires"
 
 #: rhodecode/templates/changeset/changeset.html:73
-#: rhodecode/templates/changeset/changeset_file_comment.html:97
+#: rhodecode/templates/changeset/changeset_file_comment.html:103
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
@@ -3642,11 +4021,11 b' msgstr[0] "(et %d en ligne)"'
 msgstr[1] "(et %d en ligne)"
 
 #: rhodecode/templates/changeset/changeset.html:103
-#: rhodecode/templates/changeset/changeset_range.html:77
+#: rhodecode/templates/changeset/changeset_range.html:82
 msgid "merge"
 msgstr "Fusion"
 
-#: rhodecode/templates/changeset/changeset.html:119
+#: rhodecode/templates/changeset/changeset.html:126
 #: rhodecode/templates/compare/compare_diff.html:40
 #: rhodecode/templates/pullrequests/pullrequest_show.html:113
 #, fuzzy, python-format
@@ -3655,7 +4034,7 b' msgid_plural "%s files changed"'
 msgstr[0] "%s fichié modifié"
 msgstr[1] "%s fichié modifié"
 
-#: rhodecode/templates/changeset/changeset.html:121
+#: rhodecode/templates/changeset/changeset.html:128
 #: rhodecode/templates/compare/compare_diff.html:42
 #: rhodecode/templates/pullrequests/pullrequest_show.html:115
 #, fuzzy, python-format
@@ -3664,15 +4043,15 b' msgid_plural "%s files changed with %s i'
 msgstr[0] "%s fichiers affectés avec %s insertions et %s suppressions"
 msgstr[1] "%s fichiers affectés avec %s insertions et %s suppressions"
 
-#: rhodecode/templates/changeset/changeset.html:134
-#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/changeset/changeset.html:141
+#: rhodecode/templates/changeset/changeset.html:153
 #: rhodecode/templates/pullrequests/pullrequest_show.html:131
 #: rhodecode/templates/pullrequests/pullrequest_show.html:195
 msgid "Showing a huge diff might take some time and resources"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:134
-#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/changeset/changeset.html:141
+#: rhodecode/templates/changeset/changeset.html:153
 #: rhodecode/templates/compare/compare_diff.html:58
 #: rhodecode/templates/compare/compare_diff.html:69
 #: rhodecode/templates/pullrequests/pullrequest_show.html:131
@@ -3691,57 +4070,71 b' msgstr "Requ\xc3\xaates de pull %s"'
 msgid "Comment on pull request #%s"
 msgstr "[a commenté] la requête de pull pour %s"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:57
+#: rhodecode/templates/changeset/changeset_file_comment.html:55
 msgid "Submitting..."
 msgstr "Envoi…"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:60
+#: rhodecode/templates/changeset/changeset_file_comment.html:58
 msgid "Commenting on line {1}."
 msgstr "Commentaire sur la ligne {1}."
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:61
-#: rhodecode/templates/changeset/changeset_file_comment.html:139
+#: rhodecode/templates/changeset/changeset_file_comment.html:59
+#: rhodecode/templates/changeset/changeset_file_comment.html:145
 #, 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:63
-#: rhodecode/templates/changeset/changeset_file_comment.html:141
+#: rhodecode/templates/changeset/changeset_file_comment.html:61
+#: rhodecode/templates/changeset/changeset_file_comment.html:147
 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:74
-#: rhodecode/templates/changeset/changeset_file_comment.html:161
+#: rhodecode/templates/changeset/changeset_file_comment.html:65
+#: rhodecode/templates/changeset/changeset_file_comment.html:152
+#, fuzzy
+msgid "Preview"
+msgstr "%d relecteur"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:72
+#: rhodecode/templates/changeset/changeset_file_comment.html:170
+#, fuzzy
+msgid "Comment preview"
+msgstr "vue de comparaison"
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:80
+#: rhodecode/templates/changeset/changeset_file_comment.html:177
+#: rhodecode/templates/email_templates/changeset_comment.html:16
+#: rhodecode/templates/email_templates/pull_request_comment.html:16
 msgid "Comment"
 msgstr "Commentaire"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:75
+#: rhodecode/templates/changeset/changeset_file_comment.html:81
 #, fuzzy
 msgid "Cancel"
 msgstr "Modifiés"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:88
 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:82
+#: rhodecode/templates/changeset/changeset_file_comment.html:88
 msgid "Login now"
 msgstr "Se connecter maintenant"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:86
+#: rhodecode/templates/changeset/changeset_file_comment.html:92
 msgid "Hide"
 msgstr "Masquer"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:143
+#: rhodecode/templates/changeset/changeset_file_comment.html:149
 #, fuzzy
 msgid "Change status"
 msgstr "Modifier le statut"
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:163
+#: rhodecode/templates/changeset/changeset_file_comment.html:179
 msgid "Comment and close"
 msgstr "Commenter et fermer"
 
@@ -3754,20 +4147,20 b' msgstr "Changesets de %s"'
 msgid "Files affected"
 msgstr "Fichiers affectés"
 
-#: rhodecode/templates/changeset/diff_block.html:22
+#: rhodecode/templates/changeset/diff_block.html:21
 msgid "Show full diff for this file"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:30
+#: rhodecode/templates/changeset/diff_block.html:29
 #, fuzzy
 msgid "Show inline comments"
 msgstr "Afficher les commentaires"
 
-#: rhodecode/templates/changeset/diff_block.html:55
+#: rhodecode/templates/changeset/diff_block.html:53
 msgid "Show file at latest version in this repo"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:56
+#: rhodecode/templates/changeset/diff_block.html:54
 msgid "Show file at initial version in this repo"
 msgstr ""
 
@@ -3845,29 +4238,25 b' msgstr "S\xe2\x80\x99abonner au flux ATOM de %s"'
 msgid "Confirm to delete this repository: %s"
 msgstr "Voulez-vous vraiment supprimer le dépôt %s ?"
 
-#: rhodecode/templates/data_table/_dt_elements.html:131
+#: rhodecode/templates/data_table/_dt_elements.html:137
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?"
 
-#: rhodecode/templates/email_templates/changeset_comment.html:9
-#: rhodecode/templates/email_templates/pull_request_comment.html:15
-#, fuzzy
-msgid "New status"
-msgstr "Modifier le statut"
-
-#: rhodecode/templates/email_templates/changeset_comment.html:11
-#: rhodecode/templates/email_templates/pull_request_comment.html:9
-msgid "View this comment here"
-msgstr ""
+#: rhodecode/templates/email_templates/changeset_comment.html:4
+#: rhodecode/templates/email_templates/pull_request.html:4
+#: rhodecode/templates/email_templates/pull_request_comment.html:4
+#, fuzzy
+msgid "URL"
+msgstr "Journal"
+
+#: rhodecode/templates/email_templates/changeset_comment.html:6
+#, fuzzy, python-format
+msgid "%s commented on a %s changeset."
+msgstr "%s a posté un commentaire sur le commit %s"
 
 #: rhodecode/templates/email_templates/changeset_comment.html:14
-#, fuzzy
-msgid "Repo"
-msgstr "Mes dépôts"
-
-#: rhodecode/templates/email_templates/changeset_comment.html:16
-msgid "desc"
+msgid "The changeset status was changed to"
 msgstr ""
 
 #: rhodecode/templates/email_templates/main.html:8
@@ -3888,51 +4277,40 b' msgstr ""'
 msgid "You can generate it by clicking following URL"
 msgstr ""
 
-#: rhodecode/templates/email_templates/password_reset.html:11
-msgid "If you did not request new password please ignore this email."
+#: rhodecode/templates/email_templates/password_reset.html:10
+msgid "Please ignore this email if you did not request a new password ."
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request.html:4
-#, python-format
-msgid ""
-"User %s opened pull request for repository %s and wants you to review "
-"changes."
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request.html:5
-#, fuzzy
-msgid "View this pull request here"
-msgstr "Ajouter un relecteur à cette requête de pull."
-
 #: rhodecode/templates/email_templates/pull_request.html:6
-#, fuzzy
-msgid "title"
+#, python-format
+msgid ""
+"%s opened a pull request for repository %s and wants you to review "
+"changes."
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request.html:8
+#: rhodecode/templates/pullrequests/pullrequest.html:34
+#: rhodecode/templates/pullrequests/pullrequest_data.html:14
+#: rhodecode/templates/pullrequests/pullrequest_show.html:25
+msgid "Title"
 msgstr "Titre"
 
-#: rhodecode/templates/email_templates/pull_request.html:7
-msgid "description"
-msgstr "Description"
-
-#: rhodecode/templates/email_templates/pull_request.html:12
-msgid "revisions for reviewing"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.html:3
+#: rhodecode/templates/email_templates/pull_request_comment.html:6
 #, fuzzy, python-format
-msgid "Pull request #%s for repository %s"
-msgstr "Requête de pull nº%s ouverte le %s"
-
-#: rhodecode/templates/email_templates/pull_request_comment.html:13
-#, fuzzy
-msgid "Closing pull request with status"
+msgid "%s commented on pull request \"%s\""
+msgstr "%s [a commenté] la requête de pull pour %s"
+
+#: rhodecode/templates/email_templates/pull_request_comment.html:10
+#, fuzzy
+msgid "Pull request was closed with status"
 msgstr "Statut de la requête de pull"
 
-#: rhodecode/templates/email_templates/registration.html:4
-#, fuzzy
-msgid "A new user have registered in RhodeCode"
-msgstr "Vous vous êtes inscrits avec succès à RhodeCode"
-
-#: rhodecode/templates/email_templates/registration.html:9
+#: rhodecode/templates/email_templates/pull_request_comment.html:12
+#, fuzzy
+msgid "Pull request changed status"
+msgstr "Statut de la requête de pull"
+
+#: rhodecode/templates/email_templates/registration.html:6
 msgid "View this user here"
 msgstr ""
 
@@ -3959,7 +4337,6 b' msgstr "Fichiers de %s"'
 #: rhodecode/templates/files/files.html:30
 #: rhodecode/templates/files/files_add.html:31
 #: rhodecode/templates/files/files_edit.html:31
-#: rhodecode/templates/shortlog/shortlog_data.html:9
 #, fuzzy
 msgid "Branch"
 msgstr "Branche"
@@ -3974,12 +4351,6 b' msgstr "Fichiers de %s"'
 msgid "Add file"
 msgstr "Ajouter un fichier"
 
-#: rhodecode/templates/files/files_add.html:38
-#: rhodecode/templates/files/files_browser.html:31
-#: rhodecode/templates/shortlog/shortlog_data.html:78
-msgid "Add new file"
-msgstr "Ajouter un nouveau fichier"
-
 #: rhodecode/templates/files/files_add.html:43
 msgid "File Name"
 msgstr "Nom de fichier"
@@ -4008,13 +4379,6 b' msgstr "Emplacement"'
 msgid "use / to separate directories"
 msgstr "Utilisez / pour séparer les répertoires"
 
-#: rhodecode/templates/files/files_add.html:75
-#: rhodecode/templates/files/files_edit.html:61
-#: rhodecode/templates/shortlog/shortlog_data.html:6
-#, fuzzy
-msgid "Commit message"
-msgstr "Message de commit"
-
 #: rhodecode/templates/files/files_add.html:79
 #: rhodecode/templates/files/files_edit.html:65
 msgid "Commit changes"
@@ -4085,13 +4449,6 b' msgstr "\xc3\x89diter le fichier"'
 msgid "Show annotation"
 msgstr "Afficher les annotations"
 
-#: rhodecode/templates/files/files_edit.html:48
-#: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:55
-#, fuzzy
-msgid "Show as raw"
-msgstr "montrer le fichier brut"
-
 #: rhodecode/templates/files/files_edit.html:49
 #: rhodecode/templates/files/files_source.html:26
 #, fuzzy
@@ -4290,37 +4647,52 b' msgstr "Flux RSS du journal public"'
 msgid "New pull request"
 msgstr "Nouvelle requête de pull"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:52
-msgid "Detailed compare view"
-msgstr "Comparaison détaillée"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:56
+#: rhodecode/templates/pullrequests/pullrequest.html:25
+msgid "Create new pull request"
+msgstr "Nouvelle requête de pull"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:47
+#, fuzzy
+msgid "Write a short description on this pull request"
+msgstr "Veuillez confirmer la suppression de cette requête de pull."
+
+#: rhodecode/templates/pullrequests/pullrequest.html:53
+#, fuzzy
+msgid "Changeset flow"
+msgstr "Changements"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:60
+#: rhodecode/templates/pullrequests/pullrequest_show.html:65
+#, fuzzy
+msgid "Origin repository"
+msgstr "Dépôt Git"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:85
+msgid "Send pull request"
+msgstr "Envoyer la requête de pull"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:94
 #: rhodecode/templates/pullrequests/pullrequest_show.html:137
 msgid "Pull request reviewers"
 msgstr "Relecteurs de la requête de pull"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:65
+#: rhodecode/templates/pullrequests/pullrequest.html:103
 #: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "owner"
 msgstr "Propriétaire"
 
-#: rhodecode/templates/pullrequests/pullrequest.html:77
+#: rhodecode/templates/pullrequests/pullrequest.html:115
 msgid "Add reviewer to this pull request."
 msgstr "Ajouter un relecteur à cette requête de pull."
 
-#: rhodecode/templates/pullrequests/pullrequest.html:83
-msgid "Create new pull request"
-msgstr "Nouvelle requête de pull"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:92
-#: rhodecode/templates/pullrequests/pullrequest_data.html:14
-#: rhodecode/templates/pullrequests/pullrequest_show.html:25
-msgid "Title"
-msgstr "Titre"
-
-#: rhodecode/templates/pullrequests/pullrequest.html:109
-msgid "Send pull request"
-msgstr "Envoyer la requête de pull"
+#: rhodecode/templates/pullrequests/pullrequest.html:129
+msgid "Detailed compare view"
+msgstr "Comparaison détaillée"
+
+#: rhodecode/templates/pullrequests/pullrequest.html:150
+#, fuzzy
+msgid "Destination repository"
+msgstr "Éditer le dépôt"
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
 #, fuzzy, python-format
@@ -4352,11 +4724,6 b' msgstr[1] "%d relecteurs"'
 msgid "Pull request was reviewed by all reviewers"
 msgstr "La requête de pull a été relue par tous les relecteurs."
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:65
-#, fuzzy
-msgid "Origin repository"
-msgstr "Dépôt Git"
-
 #: rhodecode/templates/pullrequests/pullrequest_show.html:89
 msgid "Created on"
 msgstr "Créé le"
@@ -4421,38 +4788,6 b' msgstr "Les noms de fichiers"'
 msgid "Permission denied"
 msgstr "Permission refusée"
 
-#: rhodecode/templates/shortlog/shortlog.html:5
-#, fuzzy, python-format
-msgid "%s Lightweight Changelog"
-msgstr "%s fichié modifié"
-
-#: rhodecode/templates/shortlog/shortlog.html:11
-#: rhodecode/templates/shortlog/shortlog.html:15
-msgid "Lightweight Changelog"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog_data.html:7
-#, fuzzy
-msgid "Age"
-msgstr "Âge"
-
-#: rhodecode/templates/shortlog/shortlog_data.html:20
-#, python-format
-msgid "Click to open associated pull request #%s"
-msgstr "Cliquez ici pour ouvrir la requête de pull associée #%s."
-
-#: rhodecode/templates/shortlog/shortlog_data.html:75
-msgid "Add or upload files directly via RhodeCode"
-msgstr "Ajouter ou téléverser des fichiers directement via RhodeCode…"
-
-#: rhodecode/templates/shortlog/shortlog_data.html:84
-msgid "Push new repo"
-msgstr "Pusher le nouveau dépôt"
-
-#: rhodecode/templates/shortlog/shortlog_data.html:92
-msgid "Existing repository?"
-msgstr "Le dépôt existe déjà ?"
-
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
 msgid "%s Summary"
@@ -4493,7 +4828,7 b' msgstr "publique"'
 msgid "Fork of"
 msgstr "Fork de"
 
-#: rhodecode/templates/summary/summary.html:96
+#: rhodecode/templates/summary/summary.html:97
 #, fuzzy
 msgid "Remote clone"
 msgstr "Clone distant"
@@ -4520,8 +4855,8 b' msgstr "Populaires"'
 
 #: rhodecode/templates/summary/summary.html:151
 #: rhodecode/templates/summary/summary.html:167
-#: rhodecode/templates/summary/summary.html:232
-msgid "enable"
+#, fuzzy
+msgid "Enable"
 msgstr "Activer"
 
 #: rhodecode/templates/summary/summary.html:159
@@ -4536,7 +4871,7 b' msgstr "Il n\xe2\x80\x99y a pas encore de t\xc3\xa9l\xc3\xa9chargements propos\xc3\xa9s."'
 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:171
+#: rhodecode/templates/summary/summary.html:170
 msgid "Download as zip"
 msgstr "Télécharger en ZIP"
 
@@ -4563,6 +4898,10 b' msgstr "Flux RSS"'
 msgid "Commit activity by day / author"
 msgstr "Activité de commit par jour et par auteur"
 
+#: rhodecode/templates/summary/summary.html:232
+msgid "enable"
+msgstr "Activer"
+
 #: rhodecode/templates/summary/summary.html:235
 msgid "Stats gathered: "
 msgstr "Statistiques obtenues :"
@@ -4577,52 +4916,48 b' msgid "Quick start"'
 msgstr "Démarrage rapide"
 
 #: rhodecode/templates/summary/summary.html:272
-#, python-format
-msgid "Readme file at revision '%s'"
+#, fuzzy, python-format
+msgid "Readme file from revision %s"
 msgstr "Fichier « Lisez-moi » à la révision « %s »"
 
-#: rhodecode/templates/summary/summary.html:275
-msgid "Permalink to this readme"
-msgstr "Lien permanent vers ce fichier « Lisez-moi »"
-
-#: rhodecode/templates/summary/summary.html:333
+#: rhodecode/templates/summary/summary.html:332
 #, python-format
 msgid "Download %s as %s"
 msgstr "Télécharger %s comme archive %s"
 
-#: rhodecode/templates/summary/summary.html:380
+#: rhodecode/templates/summary/summary.html:379
 msgid "files"
 msgstr "Fichiers"
 
-#: rhodecode/templates/summary/summary.html:690
+#: rhodecode/templates/summary/summary.html:689
 msgid "commits"
 msgstr "commits"
 
-#: rhodecode/templates/summary/summary.html:691
+#: rhodecode/templates/summary/summary.html:690
 msgid "files added"
 msgstr "fichiers ajoutés"
 
-#: rhodecode/templates/summary/summary.html:692
+#: rhodecode/templates/summary/summary.html:691
 msgid "files changed"
 msgstr "fichiers modifiés"
 
-#: rhodecode/templates/summary/summary.html:693
+#: rhodecode/templates/summary/summary.html:692
 msgid "files removed"
 msgstr "fichiers supprimés"
 
-#: rhodecode/templates/summary/summary.html:695
+#: rhodecode/templates/summary/summary.html:694
 msgid "commit"
 msgstr "commit"
 
+#: rhodecode/templates/summary/summary.html:695
+msgid "file added"
+msgstr "fichier ajouté"
+
 #: rhodecode/templates/summary/summary.html:696
-msgid "file added"
-msgstr "fichier ajouté"
+msgid "file changed"
+msgstr "fichié modifié"
 
 #: rhodecode/templates/summary/summary.html:697
-msgid "file changed"
-msgstr "fichié modifié"
-
-#: rhodecode/templates/summary/summary.html:698
 msgid "file removed"
 msgstr "fichier supprimé"
 

rhodecode/i18n/how_to

@@ -2,29 +2,66 b''
 # to create new language #
 ##########################
 
-#this needs to be done on source codes, preferable default/stable branches
- 
-python setup.py extract_messages <- get messages from project
-python setup.py init_catalog -l pl <- create a language directory for <pl> lang
-#edit the new po file with poedit or any other editor
-msgfmt -f -c <updated_file.po> <- check format and errors
-python setup.py compile_catalog -l pl <- create translation files
+Translations are available on transifex under::
+
+    https://www.transifex.com/projects/p/RhodeCode/
+
+Preferred method is to register on transifex and request new language translation.
 
-############# 
-# to update #
-#############
+manual creation of new language
++++++++++++++++++++++++++++++++
+ 
+Dowload sources of RhodeCode. Run::
 
-python setup.py extract_messages <- get messages from project
-python setup.py update_catalog -l pl<- to update the translations
-#edit the new updated po file with poedit
-msgfmt -f -c <updated_file.po> <- check format and errors
-python setup.py compile_catalog -l pl <- create translation files
+    python setup.py develop
+
+To prepare the enviroment
 
 
-###################
-# change language #
-###################
+Make sure all translation strings are extracted by running::
+
+    python setup.py extract_messages
+
+Create new language by executing following command::
+    python setup.py init_catalog -l <new_language_code>
+
+This creates a new language under directory rhodecode/i18n/<new_language_code>
+Be sure to update transifex mapping under .tx/config for new language
+
+Edit the new PO file located in LC_MESSAGES directory with poedit or your
+favorite PO files editor. Do translations and at the end verify the translation
+file for any errors. This can be done by executing::
+
+    msgfmt -f -c rhodecode/i18n/<new_language_code>/LC_MESSAGES/<updated_file.po>
+
+finally compile the translations::
+
+    python setup.py compile_catalog -l <new_language_code>
+
+##########################
+# to update translations #
+##########################
 
-`lang=pl`
+Fetch latest version of strings for translation by running::
+
+    python setup.py extract_messages
+
+Update PO file by doing::
+
+    python setup.py update_catalog -l <new_language_code><- to update the translations
+
+Edit the new updated po file. Repeat all steps after `init_catalog` step from
+new translation instructions
+
 
-in the .ini file
  No newline at end of file
+########################
+# testing translations #
+########################
+
+Edit test.ini file and set lang attribute to::
+
+    lang=<new_language_code>
+
+Run RhodeCode tests by executing::
+
+    nosetests