Changeset - 24c0d584ba86
[Not reviewed]
Bradley M. Kuhn - 12 years ago 2014-07-03 01:06:01
bkuhn@sfconservancy.org
General renaming to Kallithea
147 files changed with 779 insertions and 779 deletions:
README.rst
12
12
0 comments (0 inline, 0 general)
.hgignore
Show inline comments
 
@@ -17,10 +17,10 @@ syntax: regexp
 
^\.settings$
 
^\.project$
 
^\.pydevproject$
 
^\.coverage$
 
^kallithea\.db$
 
^test\.db$
 
^RhodeCode\.egg-info$
 
^Kallithea\.egg-info$
 
^rc.*\.ini$
 
^fabfile.py
 
^\.idea$
CONTRIBUTORS
Show inline comments
 
List of contributors to RhodeCode project:
 
List of contributors to Kallithea project:
 
    Marcin Kuźmiński <marcin@python-works.com>
 
    Lukasz Balcerzak <lukaszbalcerzak@gmail.com>
 
    Jason Harris <jason@jasonfharris.com>
 
    Thayne Harbaugh  <thayne@fusionio.com>
 
    cejones <>
 
    Thomas Waldmann <tw-public@gmx.de>
 
@@ -39,9 +39,9 @@ List of contributors to RhodeCode projec
 
    Grzegorz Rożniecki <xaerxess@gmail.com>
 
    Andrew Kesterson <andrew@aklabs.net>
 
    David A. Sjøen <david.sjoen@westcon.no>
 
    Jelmer Vernooij <jelmer@samba.org>
 
    larikale
 
    SteveCohen
 
    RhodeCode GmbH
 
    Kallithea GmbH
 
    Sebastian Kreutzberger <sebastian@rhodecode.com>
 
    thomas <thomas@rhodecode.com>
README.rst
Show inline comments
 
=========
 
RhodeCode
 
Kallithea
 
=========
 

	
 
About
 
-----
 

	
 
``RhodeCode`` is a fast and powerful management tool for Mercurial_ and GIT_
 
``Kallithea`` is a fast and powerful management tool for Mercurial_ and GIT_
 
with a built in push/pull server, full text search and code-review.
 
It works on http/https and has a built in permission/authentication system with
 
the ability to authenticate via LDAP or ActiveDirectory. RhodeCode also provides
 
the ability to authenticate via LDAP or ActiveDirectory. Kallithea also provides
 
simple API so it's easy integrable with existing external systems.
 

	
 
RhodeCode is similar in some respects to github_ or bitbucket_,
 
however RhodeCode can be run as standalone hosted application on your own server.
 
Kallithea is similar in some respects to github_ or bitbucket_,
 
however Kallithea can be run as standalone hosted application on your own server.
 
It is open source and donation ware and focuses more on providing a customized,
 
self administered interface for Mercurial_ and GIT_  repositories.
 
RhodeCode works on \*nix systems and Windows it is powered by a vcs_ library
 
Kallithea works on \*nix systems and Windows it is powered by a vcs_ library
 
that Lukasz Balcerzak and Marcin Kuzminski created to handle multiple
 
different version control systems.
 

	
 
RhodeCode uses `PEP386 versioning <http://www.python.org/dev/peps/pep-0386/>`_
 
Kallithea uses `PEP386 versioning <http://www.python.org/dev/peps/pep-0386/>`_
 

	
 
Installation
 
------------
 
Stable releases of RhodeCode are best installed via::
 
Stable releases of Kallithea are best installed via::
 

	
 
    easy_install kallithea
 

	
 
Or::
 

	
 
    pip install kallithea
 
@@ -48,13 +48,13 @@ MIRRORS:
 
Issue tracker and sources at bitbucket_
 

	
 
https://bitbucket.org/conservancy/kallithea
 

	
 

	
 

	
 
RhodeCode Features
 
Kallithea Features
 
------------------
 

	
 
- Has its own middleware to handle mercurial_ and git_ protocol requests.
 
  Each request is authenticated and logged together with IP address.
 
- Build for speed and performance. You can make multiple pulls/pushes simultaneous.
 
  Proven to work with 1000s of repositories and users
 
@@ -65,13 +65,13 @@ RhodeCode Features
 
- 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
 
- Build in commit-api let's you add, edit and commit files right from Kallithea
 
  web interface using simple editor or upload binary files using simple form.
 
- Powerfull pull-request driven review system with inline commenting,
 
  changeset statuses, and notification system.
 
- Importing and syncing repositories from remote locations for GIT_, Mercurial_ and  SVN.
 
- Mako templates let's you customize the look and feel of the application.
 
- Beautiful diffs, annotations and source code browsing all colored by pygments.
 
@@ -110,13 +110,13 @@ Incoming / Plans
 
- Other advancements as development continues (or you can of course make
 
  additions and or requests)
 

	
 
License
 
-------
 

	
 
``RhodeCode`` is released under the GPLv3 license.
 
``Kallithea`` is released under the GPLv3 license.
 

	
 

	
 
Getting help
 
------------
 

	
 
Listed bellow are various support resources that should help.
 
@@ -134,13 +134,13 @@ Listed bellow are various support resour
 
You can follow this project on Twitter, **@KallitheaSCM**.
 

	
 

	
 
Online documentation
 
--------------------
 

	
 
Online documentation for the current version of RhodeCode is available at
 
Online documentation for the current version of Kallithea is available at
 
 - http://packages.python.org/Kallithea/
 
 - http://kallithea.readthedocs.org/
 

	
 
You may also build the documentation for yourself - go into ``docs/`` and run::
 

	
 
   make html
development.ini
Show inline comments
 
################################################################################
 
################################################################################
 
# RhodeCode - Pylons environment configuration                                 #
 
# Kallithea - Pylons environment configuration                                 #
 
#                                                                              #
 
# The %(here)s variable will be replaced with the parent directory of this file#
 
################################################################################
 

	
 
[DEFAULT]
 
debug = true
 
pdebug = false
 
################################################################################
 
## Uncomment and replace with the address which should receive                ##
 
## any error reports after application crash                                  ##
 
## Additionally those settings will be used by RhodeCode mailing system       ##
 
## Additionally those settings will be used by Kallithea mailing system       ##
 
################################################################################
 
#email_to = admin@localhost
 
#error_email_from = paste_error@localhost
 
#app_email_from = kallithea-noreply@localhost
 
#error_message =
 
#email_prefix = [RhodeCode]
 
#email_prefix = [Kallithea]
 

	
 
#smtp_server = mail.server.com
 
#smtp_username =
 
#smtp_password =
 
#smtp_port =
 
#smtp_use_tls = false
 
@@ -158,13 +158,13 @@ app_instance_uuid = rc-production
 
## cut off limit for large diffs (size in bytes)
 
cut_off_limit = 256000
 

	
 
## use cache version of scm repo everywhere
 
vcs_full_cache = true
 

	
 
## force https in RhodeCode, fixes https redirects, assumes it's always https
 
## force https in Kallithea, fixes https redirects, assumes it's always https
 
force_https = false
 

	
 
## use Strict-Transport-Security headers
 
use_htsts = false
 

	
 
## number of commits stats will parse on each iteration
 
@@ -189,13 +189,13 @@ 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.kallithea.server/{gistid}. Empty means use the internal
 
## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid>
 
## Kallithea url, ie. http[s]://your.kallithea.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
 
@@ -209,14 +209,14 @@ 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
 
## {email}        user email
 
## {md5email}     md5 hash of the user email (like at gravatar.com)
 
## {size}         size of the image that is expected from the server application
 
## {scheme}       http/https from RhodeCode server
 
## {netloc}       network location from RhodeCode server
 
## {scheme}       http/https from Kallithea server
 
## {netloc}       network location from Kallithea server
 
#alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
 
#alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
 

	
 

	
 
## container auth options
 
container_auth_enabled = false
 
@@ -233,13 +233,13 @@ default_encoding = utf8
 
## pass - password
 
## netloc - network location
 
## path - usually repo_name
 

	
 
#clone_uri = {scheme}://{user}{pass}{netloc}{path}
 

	
 
## issue tracker for RhodeCode (leave blank to disable, absent for default)
 
## issue tracker for Kallithea (leave blank to disable, absent for default)
 
#bugtracker = https://bitbucket.org/conservancy/kallithea/issues
 

	
 
## issue tracking mapping for commits messages
 
## comment out issue_pat, issue_server, issue_prefix to enable
 

	
 
## pattern to get the issues from commit messages
 
@@ -397,13 +397,13 @@ beaker.session.auto = False
 
############################
 

	
 
####################
 
### [errormator] ###
 
####################
 

	
 
## Errormator is tailored to work with RhodeCode, see
 
## Errormator is tailored to work with Kallithea, see
 
## http://errormator.com for details how to obtain an account
 
## you must install python package `errormator_client` to make it work
 

	
 
## errormator enabled
 
errormator = false
 

	
init.d/celeryd-upstart.conf
Show inline comments
 
# celeryd - run the celeryd daemon as an upstart job for kallithea
 
# Change variables/paths as necessary and place file /etc/init/celeryd.conf
 
# start/stop/restart as normal upstart job (ie: $ start celeryd)
 

	
 
description	"Celery for RhodeCode Mercurial Server"
 
description	"Celery for Kallithea Mercurial Server"
 
author		"Matt Zuba <matt.zuba@goodwillaz.org"
 

	
 
start on starting kallithea
 
stop on stopped kallithea
 

	
 
respawn
init.d/kallithea-daemon-redhat
Show inline comments
 
@@ -2,13 +2,13 @@
 
########################################
 
#### THIS IS A REDHAT INIT.D SCRIPT ####
 
########################################
 

	
 
##################################################
 
#
 
# RhodeCode server startup script
 
# Kallithea server startup script
 
# Recommended default-startup: 2 3 4 5
 
# Recommended default-stop: 0 1 6
 
#
 
##################################################
 

	
 

	
 
@@ -23,13 +23,13 @@ CONF_NAME="production.ini"
 
# that the user you run paster as has the appropriate permissions
 
# same goes for the log file
 
PID_PATH="/var/run/kallithea/pid"
 
LOG_PATH="/var/log/kallithea/kallithea.log"
 

	
 
# replace this with the path to the virtual environment you
 
# made for RhodeCode
 
# made for Kallithea
 
PYTHON_PATH="/opt/python_virtualenvironments/kallithea-venv"
 

	
 
RUN_AS="kallithea"
 

	
 
DAEMON="$PYTHON_PATH/bin/paster"
 

	
 
@@ -110,15 +110,15 @@ case "$1" in
 
    echo
 
    ;;
 
  status)
 
    status_kallithea
 
    RETVAL=$?
 
    if [ ! $RETVAL -eq 0 ]; then
 
      echo "RhodeCode server is running..."
 
      echo "Kallithea server is running..."
 
    else
 
      echo "RhodeCode server is stopped."
 
      echo "Kallithea server is stopped."
 
    fi
 
    ;;
 
  restart)
 
    echo -n $"Restarting $DESC: "
 
    restart_kallithea
 
    echo
init.d/kallithea-upstart.conf
Show inline comments
 
# kallithea - run the kallithea daemon as an upstart job
 
# Change variables/paths as necessary and place file /etc/init/kallithea.conf
 
# start/stop/restart as normal upstart job (ie: $ start kallithea)
 

	
 
description	"RhodeCode Mercurial Server"
 
description	"Kallithea Mercurial Server"
 
author		"Matt Zuba <matt.zuba@goodwillaz.org"
 

	
 
start on (local-filesystems and runlevel [2345])
 
stop on runlevel [!2345]
 

	
 
respawn
init.d/supervisord.conf
Show inline comments
 
; RhodeCode Supervisord
 
; Kallithea Supervisord
 
; ##########################
 
; for help see http://supervisord.org/configuration.html
 
; ##########################
 

	
 
[inet_http_server]         ; inet (TCP) server disabled by default
 
port=127.0.0.1:9001        ; (ip_address:port specifier, *:port for all iface)
kallithea/__init__.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.__init__
 
~~~~~~~~~~~~~~~~~~
 

	
 
RhodeCode, a web based repository management based on pylons
 
Kallithea, a web based repository management based on pylons
 
versioning implementation: http://www.python.org/dev/peps/pep-0386/
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 9, 2010
 
:author: marcink
kallithea/bin/__init__.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.bin.__init__
 
~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Binary scripts for RhodeCode
 
Binary scripts for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Jun 03, 2012
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/bin/base.py
Show inline comments
 
@@ -43,13 +43,13 @@ CONFIG_NAME = '.config/kallithea'
 
FORMAT_PRETTY = 'pretty'
 
FORMAT_JSON = 'json'
 

	
 

	
 
def api_call(apikey, apihost, method=None, **kw):
 
    """
 
    Api_call wrapper for RhodeCode.
 
    Api_call wrapper for Kallithea.
 

	
 
    :param apikey:
 
    :param apihost:
 
    :param format: formatting, pretty means prints and pprint of json
 
     json returns unparsed json
 
    :param method:
 
@@ -88,13 +88,13 @@ def api_call(apikey, apihost, method=Non
 
                        'ID mismatch got %s, expected %s | %s' % (
 
                                            id_ret, id_, _formatted_json))
 

	
 

	
 
class RcConf(object):
 
    """
 
    RhodeCode config for API
 
    Kallithea config for API
 

	
 
    conf = RcConf()
 
    conf['key']
 

	
 
    """
 

	
kallithea/bin/kallithea_api.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.bin.api
 
~~~~~~~~~~~~~~~~~
 

	
 
Api CLI client for RhodeCode
 
Api CLI client for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Jun 3, 2012
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -37,13 +37,13 @@ def argparser(argv):
 
      "kallithea-api [-h] [--format=FORMAT] [--apikey=APIKEY] [--apihost=APIHOST] "
 
      "[--config=CONFIG] [--save-config] "
 
      "METHOD <key:val> <key2:val> ...\n"
 
      "Create config file: kallithea-api --apikey=<key> --apihost=http://your.kallithea.server --save-config"
 
    )
 

	
 
    parser = argparse.ArgumentParser(description='RhodeCode API cli',
 
    parser = argparse.ArgumentParser(description='Kallithea API 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')
kallithea/bin/kallithea_config.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.bin.kallithea_config
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
configuration generator for RhodeCode
 
configuration generator for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Jun 18, 2013
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -41,13 +41,13 @@ def argparser(argv):
 
      "VARS optional specify extra template variable that will be available in "
 
      "template. Use comma separated key=val format eg.\n"
 
      "key1=val1,port=5000,host=127.0.0.1,elements='a\,b\,c'\n"
 
    )
 

	
 
    parser = argparse.ArgumentParser(
 
        description='RhodeCode CONFIG generator with variable replacement',
 
        description='Kallithea CONFIG generator with variable replacement',
 
        usage=usage
 
    )
 

	
 
    ## config
 
    group = parser.add_argument_group('CONFIG')
 
    group.add_argument('--filename', help='Output ini filename.')
kallithea/bin/kallithea_gist.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.bin.kallithea_gist
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Gist CLI client for RhodeCode
 
Gist CLI client for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: May 9, 2013
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -40,13 +40,13 @@ def argparser(argv):
 
      "kallithea-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: kallithea-gist --apikey=<key> --apihost=http://your.kallithea.server --save-config"
 
    )
 

	
 
    parser = argparse.ArgumentParser(description='RhodeCode Gist cli',
 
    parser = argparse.ArgumentParser(description='Kallithea 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')
kallithea/bin/ldap_sync.py
Show inline comments
 
@@ -72,13 +72,13 @@ class API(object):
 
            "api_key": self.key,
 
            "method": method,
 
            "args": args
 
        }
 

	
 
    def post(self, method, args):
 
        """Send a generic API post to Rhodecode.
 
        """Send a generic API post to Kallithea.
 

	
 
        This will generate the UUID for validation check after the
 
        response is returned. Handle errors and get the result back.
 
        """
 
        uid = str(uuid.uuid1())
 
        data = self.get_api_data(uid, method, args)
 
@@ -96,13 +96,13 @@ class API(object):
 
        if response["error"] is not None:
 
            raise ResponseError(response["error"])
 

	
 
        return response["result"]
 

	
 
    def create_group(self, name, active=True):
 
        """Create the Rhodecode user group."""
 
        """Create the Kallithea user group."""
 
        args = {
 
            "group_name": name,
 
            "active": str(active)
 
        }
 
        self.post("create_user_group", args)
 

	
 
@@ -205,13 +205,13 @@ class LdapSync(object):
 
                                      config.get("default", "ldap_key"),
 
                                      config.get("default", "base_dn"))
 
        self.rhodocode_api = API(config.get("default", "api_url"),
 
                                          config.get("default", "api_key"))
 

	
 
    def update_groups_from_ldap(self):
 
        """Add all the groups from LDAP to Rhodecode."""
 
        """Add all the groups from LDAP to Kallithea."""
 
        added = existing = 0
 
        groups = self.ldap_client.get_groups()
 
        for group in groups:
 
            try:
 
                self.kallithea_api.create_repo_group(group)
 
                added += 1
kallithea/bin/template.ini.mako
Show inline comments
 
## -*- coding: utf-8 -*-
 
<%text>
 
################################################################################
 
################################################################################
 
# RhodeCode - Example config                                                   #
 
# Kallithea - Example config                                                   #
 
# Built-in functions and variables                                             #
 
# The ${here} variable will be replaced with the parent directory of this file #
 
# ${uuid()} function will generate a unique hash                               #
 
################################################################################
 
</%text>
 
[DEFAULT]
 
debug = true
 
pdebug = false
 
<%text>
 
################################################################################
 
## Uncomment and replace with the address which should receive                ##
 
## any error reports after application crash                                  ##
 
## Additionally those settings will be used by RhodeCode mailing system       ##
 
## Additionally those settings will be used by Kallithea mailing system       ##
 
################################################################################
 
</%text>
 
#email_to = admin@localhost
 
#error_email_from = paste_error@localhost
 
#app_email_from = kallithea-noreply@localhost
 
#error_message =
 
#email_prefix = [RhodeCode]
 
#email_prefix = [Kallithea]
 

	
 
#smtp_server = mail.server.com
 
#smtp_username =
 
#smtp_password =
 
#smtp_port =
 
#smtp_use_tls = false
 
@@ -167,13 +167,13 @@ app_instance_uuid = ${uuid()}
 
<%text>## cut off limit for large diffs (size in bytes)</%text>
 
cut_off_limit = 256000
 

	
 
<%text>## use cache version of scm repo everywhere</%text>
 
vcs_full_cache = true
 

	
 
<%text>## force https in RhodeCode, fixes https redirects, assumes it's always https</%text>
 
<%text>## force https in Kallithea, fixes https redirects, assumes it's always https</%text>
 
force_https = false
 

	
 
<%text>## use Strict-Transport-Security headers</%text>
 
use_htsts = false
 

	
 
<%text>## number of commits stats will parse on each iteration</%text>
 
@@ -198,13 +198,13 @@ rss_include_diff = false
 
show_sha_length = 12
 
show_revision_number = true
 

	
 
<%text>## gist URL alias, used to create nicer urls for gist. This should be an</%text>
 
<%text>## url that does rewrites to _admin/gists/<gistid>.</%text>
 
<%text>## example: http://gist.kallithea.server/{gistid}. Empty means use the internal</%text>
 
<%text>## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid></%text>
 
<%text>## Kallithea url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid></%text>
 
gist_alias_url =
 

	
 
<%text>## white list of API enabled controllers. This allows to add list of</%text>
 
<%text>## controllers to which access will be enabled by api_key. eg: to enable</%text>
 
<%text>## api access to raw_files put `FilesController:raw`, to enable access to patches</%text>
 
<%text>## add `ChangesetController:changeset_patch`. This list should be "," separated</%text>
 
@@ -213,14 +213,14 @@ api_access_controllers_whitelist =
 

	
 
<%text>## alternative_gravatar_url allows you to use your own avatar server application</%text>
 
<%text>## the following parts of the URL will be replaced</%text>
 
<%text>## {email}        user email</%text>
 
<%text>## {md5email}     md5 hash of the user email (like at gravatar.com)</%text>
 
<%text>## {size}         size of the image that is expected from the server application</%text>
 
<%text>## {scheme}       http/https from RhodeCode server</%text>
 
<%text>## {netloc}       network location from RhodeCode server</%text>
 
<%text>## {scheme}       http/https from Kallithea server</%text>
 
<%text>## {netloc}       network location from Kallithea server</%text>
 
#alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
 
#alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
 

	
 

	
 
<%text>## container auth options</%text>
 
container_auth_enabled = false
 
@@ -237,13 +237,13 @@ default_encoding = utf8
 
<%text>## pass - password</%text>
 
<%text>## netloc - network location</%text>
 
<%text>## path - usually repo_name</%text>
 

	
 
#clone_uri = {scheme}://{user}{pass}{netloc}{path}
 

	
 
<%text>## issue tracker for RhodeCode (leave blank to disable, absent for default)</%text>
 
<%text>## issue tracker for Kallithea (leave blank to disable, absent for default)</%text>
 
#bugtracker = https://bitbucket.org/conservancy/kallithea/issues
 

	
 
<%text>## issue tracking mapping for commits messages</%text>
 
<%text>## comment out issue_pat, issue_server, issue_prefix to enable</%text>
 

	
 
<%text>## pattern to get the issues from commit messages</%text>
 
@@ -404,13 +404,13 @@ beaker.session.auto = False
 
############################
 

	
 
####################
 
### [errormator] ###
 
####################
 

	
 
## Errormator is tailored to work with RhodeCode, see
 
## Errormator is tailored to work with Kallithea, see
 
## http://errormator.com for details how to obtain an account
 
## you must install python package `errormator_client` to make it work
 
</%text>
 
<%text>## errormator enabled</%text>
 
errormator = false
 

	
kallithea/config/conf.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.config.conf
 
~~~~~~~~~~~~~~~~~~~~~
 

	
 
Various config settings for RhodeCode
 
Various config settings for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Mar 7, 2012
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/config/deployment.ini_tmpl
Show inline comments
 
################################################################################
 
################################################################################
 
# RhodeCode - Pylons environment configuration                                 #
 
# Kallithea - Pylons environment configuration                                 #
 
#                                                                              #
 
# The %(here)s variable will be replaced with the parent directory of this file#
 
################################################################################
 

	
 
[DEFAULT]
 
debug = true
 
pdebug = false
 
################################################################################
 
## Uncomment and replace with the address which should receive                ##
 
## any error reports after application crash                                  ##
 
## Additionally those settings will be used by RhodeCode mailing system       ##
 
## Additionally those settings will be used by Kallithea mailing system       ##
 
################################################################################
 
#email_to = admin@localhost
 
#error_email_from = paste_error@localhost
 
#app_email_from = kallithea-noreply@localhost
 
#error_message =
 
#email_prefix = [RhodeCode]
 
#email_prefix = [Kallithea]
 

	
 
#smtp_server = mail.server.com
 
#smtp_username =
 
#smtp_password =
 
#smtp_port =
 
#smtp_use_tls = false
 
@@ -158,13 +158,13 @@ app_instance_uuid = ${app_instance_uuid}
 
## cut off limit for large diffs (size in bytes)
 
cut_off_limit = 256000
 

	
 
## use cache version of scm repo everywhere
 
vcs_full_cache = true
 

	
 
## force https in RhodeCode, fixes https redirects, assumes it's always https
 
## force https in Kallithea, fixes https redirects, assumes it's always https
 
force_https = false
 

	
 
## use Strict-Transport-Security headers
 
use_htsts = false
 

	
 
## number of commits stats will parse on each iteration
 
@@ -189,13 +189,13 @@ 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.kallithea.server/{gistid}. Empty means use the internal
 
## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid>
 
## Kallithea url, ie. http[s]://your.kallithea.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
 
@@ -209,14 +209,14 @@ 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
 
## {email}        user email
 
## {md5email}     md5 hash of the user email (like at gravatar.com)
 
## {size}         size of the image that is expected from the server application
 
## {scheme}       http/https from RhodeCode server
 
## {netloc}       network location from RhodeCode server
 
## {scheme}       http/https from Kallithea server
 
## {netloc}       network location from Kallithea server
 
#alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
 
#alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
 

	
 

	
 
## container auth options
 
container_auth_enabled = false
 
@@ -233,13 +233,13 @@ default_encoding = utf8
 
## pass - password
 
## netloc - network location
 
## path - usually repo_name
 

	
 
#clone_uri = {scheme}://{user}{pass}{netloc}{path}
 

	
 
## issue tracker for RhodeCode (leave blank to disable, absent for default)
 
## issue tracker for Kallithea (leave blank to disable, absent for default)
 
#bugtracker = https://bitbucket.org/conservancy/kallithea/issues
 

	
 
## issue tracking mapping for commits messages
 
## comment out issue_pat, issue_server, issue_prefix to enable
 

	
 
## pattern to get the issues from commit messages
 
@@ -397,13 +397,13 @@ beaker.session.auto = False
 
############################
 

	
 
####################
 
### [errormator] ###
 
####################
 

	
 
## Errormator is tailored to work with RhodeCode, see
 
## Errormator is tailored to work with Kallithea, see
 
## http://errormator.com for details how to obtain an account
 
## you must install python package `errormator_client` to make it work
 

	
 
## errormator enabled
 
errormator = false
 

	
kallithea/config/environment.py
Show inline comments
 
@@ -60,13 +60,13 @@ def load_environment(global_conf, app_co
 
        templates=[os.path.join(root, 'templates')]
 
    )
 

	
 
    # Initialize config with the basic options
 
    config.init_app(global_conf, app_conf, package='kallithea', paths=paths)
 

	
 
    # store some globals into rhodecode
 
    # store some globals into kallithea
 
    kallithea.CELERY_ON = str2bool(config['app_conf'].get('use_celery'))
 
    kallithea.CELERY_EAGER = str2bool(config['app_conf'].get('celery.always.eager'))
 

	
 
    config['routes.map'] = make_map(config)
 
    config['pylons.app_globals'] = app_globals.Globals(config)
 
    config['pylons.h'] = helpers
kallithea/config/post_receive_tmpl.py
Show inline comments
 
@@ -13,22 +13,22 @@ except ImportError:
 
        print traceback.format_exc()
 
    kallithea = None
 

	
 

	
 
def main():
 
    if kallithea is None:
 
        # exit with success if we cannot import rhodecode !!
 
        # exit with success if we cannot import kallithea !!
 
        # this allows simply push to this repo even without
 
        # rhodecode
 
        # kallithea
 
        sys.exit(0)
 

	
 
    repo_path = os.path.abspath('.')
 
    push_data = sys.stdin.readlines()
 
    # os.environ is modified here by a subprocess call that
 
    # runs git and later git executes this hook.
 
    # Environ gets some additional info from rhodecode system
 
    # Environ gets some additional info from kallithea system
 
    # like IP or username from basic-auth
 
    _handler(repo_path, push_data, os.environ)
 
    sys.exit(0)
 

	
 
if __name__ == '__main__':
 
    main()
kallithea/config/pre_receive_tmpl.py
Show inline comments
 
@@ -13,22 +13,22 @@ except ImportError:
 
        print traceback.format_exc()
 
    kallithea = None
 

	
 

	
 
def main():
 
    if kallithea is None:
 
        # exit with success if we cannot import rhodecode !!
 
        # exit with success if we cannot import kallithea !!
 
        # this allows simply push to this repo even without
 
        # rhodecode
 
        # kallithea
 
        sys.exit(0)
 

	
 
    repo_path = os.path.abspath('.')
 
    push_data = sys.stdin.readlines()
 
    # os.environ is modified here by a subprocess call that
 
    # runs git and later git executes this hook.
 
    # Environ gets some additional info from rhodecode system
 
    # Environ gets some additional info from kallithea system
 
    # like IP or username from basic-auth
 
    _handler(repo_path, push_data, os.environ)
 
    sys.exit(0)
 

	
 
if __name__ == '__main__':
 
    main()
kallithea/config/rcextensions/__init__.py
Show inline comments
 
@@ -170,13 +170,13 @@ DELETE_USER_HOOK = _dluserhook
 

	
 
#==============================================================================
 
# POST PUSH HOOK
 
#==============================================================================
 

	
 
# this function will be executed after each push it's executed after the
 
# build-in hook that RhodeCode uses for logging pushes
 
# build-in hook that Kallithea uses for logging pushes
 
def _pushhook(*args, **kwargs):
 
    """
 
    Post push hook
 
    kwargs available:
 

	
 
      :param server_url: url of instance that triggered this hook
 
@@ -194,13 +194,13 @@ PUSH_HOOK = _pushhook
 

	
 
#==============================================================================
 
# POST PULL HOOK
 
#==============================================================================
 

	
 
# this function will be executed after each push it's executed after the
 
# build-in hook that RhodeCode uses for logging pulls
 
# build-in hook that Kallithea uses for logging pulls
 
def _pullhook(*args, **kwargs):
 
    """
 
    Post pull hook
 
    kwargs available::
 

	
 
      :param server_url: url of instance that triggered this hook
kallithea/controllers/admin/admin.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.admin.admin
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Controller for Admin panel of Rhodecode
 
Controller for Admin panel of Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 7, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/admin/auth_settings.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.admin.auth_settings
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
pluggable authentication controller for RhodeCode
 
pluggable authentication controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Nov 26, 2010
 
:author: akesterson
 
"""
kallithea/controllers/admin/defaults.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.admin.defaults
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
default settings controller for Rhodecode
 
default settings controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 27, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/admin/gists.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.admin.gist
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
gist controller for RhodeCode
 
gist controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: May 9, 2013
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/admin/my_account.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.admin.my_account
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
my account controller for rhodecode admin
 
my account controller for Kallithea admin
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: August 20, 2013
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/admin/notifications.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.admin.notifications
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
notifications controller for RhodeCode
 
notifications controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Nov 23, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/admin/permissions.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.admin.permissions
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
permissions controller for Rhodecode
 
permissions controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 27, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/admin/repo_groups.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.admin.repo_groups
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Repository groups controller for RhodeCode
 
Repository groups controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Mar 23, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/admin/repos.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.admin.repos
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Repositories controller for RhodeCode
 
Repositories controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 7, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/admin/settings.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.admin.settings
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
settings controller for rhodecode admin
 
settings controller for Kallithea admin
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Jul 14, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -348,15 +348,15 @@ class SettingsController(BaseController)
 
    def settings_email(self):
 
        """GET /admin/settings/email: All items in the collection"""
 
        # url('admin_settings_email')
 
        c.active = 'email'
 
        if request.POST:
 
            test_email = request.POST.get('test_email')
 
            test_email_subj = 'RhodeCode test email'
 
            test_email_body = ('RhodeCode Email test, '
 
                               'RhodeCode version: %s' % c.kallithea_version)
 
            test_email_subj = 'Kallithea test email'
 
            test_email_body = ('Kallithea Email test, '
 
                               'Kallithea version: %s' % c.kallithea_version)
 
            if not test_email:
 
                h.flash(_('Please enter email address'), category='error')
 
                return redirect(url('admin_settings_email'))
 

	
 
            test_email_html_body = EmailNotificationModel()\
 
                .get_email_tmpl(EmailNotificationModel.TYPE_DEFAULT,
 
@@ -491,13 +491,13 @@ class SettingsController(BaseController)
 
        _err = lambda s: '<div style="color:#ff8888; padding:4px 0px">%s</div>' % (s)
 
        try:
 
            import kallithea
 
            ver = kallithea.__version__
 
            log.debug('Checking for upgrade on `%s` server' % _update_url)
 
            opener = urllib2.build_opener()
 
            opener.addheaders = [('User-agent', 'RhodeCode-SCM/%s' % ver)]
 
            opener.addheaders = [('User-agent', 'Kallithea-SCM/%s' % ver)]
 
            response = opener.open(_update_url)
 
            response_data = response.read()
 
            data = json.loads(response_data)
 
        except urllib2.URLError, e:
 
            log.error(traceback.format_exc())
 
            return _err('Failed to contact upgrade server: %r' % e)
kallithea/controllers/admin/users.py
Show inline comments
 
@@ -120,13 +120,13 @@ class UsersController(BaseController):
 

	
 
        return render('admin/users/users.html')
 

	
 
    def create(self):
 
        """POST /users: Create a new item"""
 
        # url('users')
 
        c.default_extern_type = auth_modules.auth_internal.RhodeCodeAuthPlugin.name
 
        c.default_extern_type = auth_modules.auth_internal.KallitheaAuthPlugin.name
 
        user_model = UserModel()
 
        user_form = UserForm()()
 
        try:
 
            form_result = user_form.to_python(dict(request.POST))
 
            user_model.create(form_result)
 
            usr = form_result['username']
 
@@ -150,13 +150,13 @@ class UsersController(BaseController):
 
                    % request.POST.get('username'), category='error')
 
        return redirect(url('users'))
 

	
 
    def new(self, format='html'):
 
        """GET /users/new: Form to create a new item"""
 
        # url('new_user')
 
        c.default_extern_type = auth_modules.auth_internal.RhodeCodeAuthPlugin.name
 
        c.default_extern_type = auth_modules.auth_internal.KallitheaAuthPlugin.name
 
        return render('admin/users/user_add.html')
 

	
 
    def update(self, id):
 
        """PUT /users/id: Update an existing item"""
 
        # Forms posted to this method should contain a hidden field:
 
        #    <input type="hidden" name="_method" value="PUT" />
kallithea/controllers/api/api.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.api
 
~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
API controller for RhodeCode
 
API controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Aug 20, 2011
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -470,13 +470,13 @@ class ApiController(JSONRPCController):
 

	
 
        return ret
 

	
 
    @HasPermissionAllDecorator('hg.admin')
 
    def get_ip(self, apiuser, userid=Optional(OAttr('apiuser'))):
 
        """
 
        Shows IP address as seen from RhodeCode server, together with all
 
        Shows IP address as seen from Kallithea server, together with all
 
        defined IP addresses for given user. If userid is not passed data is
 
        returned for user who's calling this function.
 
        This command can be executed only using api_key belonging to user with
 
        admin rights.
 

	
 
        :param apiuser: filled automatically from apikey
 
@@ -511,25 +511,25 @@ class ApiController(JSONRPCController):
 
    # alias for old
 
    show_ip = get_ip
 

	
 
    @HasPermissionAllDecorator('hg.admin')
 
    def get_server_info(self, apiuser):
 
        """
 
        return server info, including RhodeCode version and installed packages
 
        return server info, including Kallithea version and installed packages
 

	
 
        :param apiuser: filled automatically from apikey
 
        :type apiuser: AuthUser
 

	
 
        OUTPUT::
 

	
 
          id : <id_given_in_input>
 
          result : {
 
            'modules': [<module name>,...]
 
            'py_version': <python version>,
 
            'platform': <platform type>,
 
            'kallithea_version': <rhodecode version>
 
            'kallithea_version': <kallithea version>
 
          }
 
          error :  null
 
        """
 
        return Setting.get_server_info()
 

	
 
    def get_user(self, apiuser, userid=Optional(OAttr('apiuser'))):
 
@@ -1453,13 +1453,13 @@ class ApiController(JSONRPCController):
 

	
 
        """
 
        if not HasPermissionAnyApi('hg.admin')(user=apiuser):
 
            if not isinstance(owner, Optional):
 
                #forbid setting owner for non-admins
 
                raise JSONRPCError(
 
                    'Only RhodeCode admin can specify `owner` param'
 
                    'Only Kallithea admin can specify `owner` param'
 
                )
 
        if isinstance(owner, Optional):
 
            owner = apiuser.user_id
 

	
 
        owner = get_user_or_error(owner)
 

	
 
@@ -1647,13 +1647,13 @@ class ApiController(JSONRPCController):
 
                                     'repository.write',
 
                                     'repository.read')(user=apiuser,
 
                                                        repo_name=repo.repo_name):
 
            if not isinstance(owner, Optional):
 
                #forbid setting owner for non-admins
 
                raise JSONRPCError(
 
                    'Only RhodeCode admin can specify `owner` param'
 
                    'Only Kallithea admin can specify `owner` param'
 
                )
 
        else:
 
            raise JSONRPCError('repository `%s` does not exist' % (repoid,))
 

	
 
        if isinstance(owner, Optional):
 
            owner = apiuser.user_id
kallithea/controllers/bookmarks.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.bookmarks
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Bookmarks controller for rhodecode
 
Bookmarks controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Dec 1, 2011
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/branches.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.branches
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
branches controller for rhodecode
 
branches controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 21, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/changelog.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.changelog
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
changelog controller for rhodecode
 
changelog controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 21, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/error.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.error
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
RhodeCode error controller
 
Kallithea error controller
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Dec 8, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/feed.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.feed
 
~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Feed controller for rhodecode
 
Feed controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 23, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/files.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.files
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Files controller for RhodeCode
 
Files controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 21, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -318,13 +318,13 @@ class FilesController(BaseRepoController
 

	
 
        r_post = request.POST
 

	
 
        c.cs = self.__get_cs_or_redirect(revision, repo_name)
 
        c.file = self.__get_filenode_or_redirect(repo_name, c.cs, f_path)
 

	
 
        c.default_message = _('Deleted file %s via RhodeCode') % (f_path)
 
        c.default_message = _('Deleted file %s via Kallithea') % (f_path)
 
        c.f_path = f_path
 
        node_path = f_path
 
        author = self.authuser.full_contact
 

	
 
        if r_post:
 
            message = r_post.get('message') or c.default_message
 
@@ -381,13 +381,13 @@ class FilesController(BaseRepoController
 
        c.cs = self.__get_cs_or_redirect(revision, repo_name)
 
        c.file = self.__get_filenode_or_redirect(repo_name, c.cs, f_path)
 

	
 
        if c.file.is_binary:
 
            return redirect(url('files_home', repo_name=c.repo_name,
 
                            revision=c.cs.raw_id, f_path=f_path))
 
        c.default_message = _('Edited file %s via RhodeCode') % (f_path)
 
        c.default_message = _('Edited file %s via Kallithea') % (f_path)
 
        c.f_path = f_path
 

	
 
        if r_post:
 

	
 
            old_content = c.file.content
 
            sl = old_content.splitlines(1)
 
@@ -434,13 +434,13 @@ class FilesController(BaseRepoController
 

	
 
        r_post = request.POST
 
        c.cs = self.__get_cs_or_redirect(revision, repo_name,
 
                                         redirect_after=False)
 
        if c.cs is None:
 
            c.cs = EmptyChangeset(alias=c.db_repo_scm_instance.alias)
 
        c.default_message = (_('Added file via RhodeCode'))
 
        c.default_message = (_('Added file via Kallithea'))
 
        c.f_path = f_path
 

	
 
        if r_post:
 
            unix_mode = 0
 
            content = convert_line_endings(r_post.get('content', ''), unix_mode)
 

	
kallithea/controllers/followers.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.followers
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Followers controller for rhodecode
 
Followers controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 23, 2011
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/forks.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.forks
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
forks controller for rhodecode
 
forks controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 23, 2011
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/home.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.home
 
~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Home controller for Rhodecode
 
Home controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Feb 18, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/login.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.login
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Login controller for rhodeocode
 
Login controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 22, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -187,13 +187,13 @@ class LoginController(BaseController):
 
                        _msg = _('bad captcha')
 
                        error_dict = {'recaptcha_field': _msg}
 
                        raise formencode.Invalid(_msg, _value, None,
 
                                                 error_dict=error_dict)
 

	
 
                UserModel().create_registration(form_result)
 
                h.flash(_('You have successfully registered into RhodeCode'),
 
                h.flash(_('You have successfully registered into Kallithea'),
 
                        category='success')
 
                Session().commit()
 
                return redirect(url('login_home'))
 

	
 
            except formencode.Invalid, errors:
 
                return htmlfill.render(
kallithea/controllers/pullrequests.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.pullrequests
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
pull requests controller for rhodecode for initializing pull requests
 
pull requests controller for Kallithea for initializing pull requests
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: May 7, 2012
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/search.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.search
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Search controller for RhodeCode
 
Search controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Aug 7, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/summary.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.summary
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Summary controller for Rhodecode
 
Summary controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 18, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/controllers/tags.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.controllers.tags
 
~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Tags controller for rhodecode
 
Tags controller for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 21, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/i18n/de/LC_MESSAGES/kallithea.po
Show inline comments
 
# Translations template for RhodeCode.
 
# Translations template for Kallithea.
 
# Copyright (C) 2014 RhodeCode GmbH, and others.
 
# This file is distributed under the same license as the RhodeCode project.
 
# This file is distributed under the same license as the Kallithea project.
 
# Translators:
 
# stephanj <info@stephan-jauernick.de>, 2013
 
msgid ""
 
msgstr ""
 
"Project-Id-Version: RhodeCode\n"
 
"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
 
"Project-Id-Version: Kallithea\n"
 
"Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 
"POT-Creation-Date: 2014-02-13 15:30+0100\n"
 
"PO-Revision-Date: 2014-02-13 14:34+0000\n"
 
"Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 
"Language-Team: German (http://www.transifex.com/projects/p/RhodeCode/language/de/)\n"
 
"Language-Team: German (http://www.transifex.com/projects/p/Kallithea/language/de/)\n"
 
"MIME-Version: 1.0\n"
 
"Content-Type: text/plain; charset=UTF-8\n"
 
"Content-Transfer-Encoding: 8bit\n"
 
"Generated-By: Babel 0.9.6\n"
 
"Language: de\n"
 
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -135,13 +135,13 @@ msgstr ""
 
#: kallithea/controllers/files.py:311
 
msgid "You can only delete files with revision being a valid branch "
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:322
 
#, python-format
 
msgid "Deleted file %s via RhodeCode"
 
msgid "Deleted file %s via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:344
 
#, python-format
 
msgid "Successfully deleted file %s"
 
msgstr ""
 
@@ -154,26 +154,26 @@ msgstr "Während des Commitens trat ein Fehler auf"
 
#: kallithea/controllers/files.py:371
 
msgid "You can only edit files with revision being a valid branch "
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:385
 
#, python-format
 
msgid "Edited file %s via RhodeCode"
 
msgid "Edited file %s via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:401
 
msgid "No changes"
 
msgstr "Keine Änderungen"
 

	
 
#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485
 
#, python-format
 
msgid "Successfully committed to %s"
 
msgstr "Der Commit zu %s war erfolgreich"
 

	
 
#: kallithea/controllers/files.py:438
 
msgid "Added file via RhodeCode"
 
msgid "Added file via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:459
 
msgid "No content"
 
msgstr "Kein Inhalt"
 

	
 
@@ -272,13 +272,13 @@ msgstr "Logbuch"
 

	
 
#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230
 
msgid "bad captcha"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:191
 
msgid "You have successfully registered into RhodeCode"
 
msgid "You have successfully registered into Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:235
 
msgid "Your password reset link was sent"
 
msgstr "Ihr Passwort Zurücksetzen link wurde versendet"
 

	
 
@@ -1099,13 +1099,13 @@ msgstr ""
 

	
 
#: kallithea/lib/helpers.py:777
 
msgid "[pushed] into"
 
msgstr "[übermittelt] in"
 

	
 
#: kallithea/lib/helpers.py:779
 
msgid "[committed via RhodeCode] into repository"
 
msgid "[committed via Kallithea] into repository"
 
msgstr ""
 

	
 
#: kallithea/lib/helpers.py:781
 
msgid "[pulled from remote] into repository"
 
msgstr ""
 

	
 
@@ -1316,14 +1316,14 @@ msgstr "Repository Gruppe hat Administra
 
#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509
 
#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510
 
#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531
 
#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
 
#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
 
#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
 
msgid "RhodeCode Administrator"
 
msgstr "RhodeCode Administrator"
 
msgid "Kallithea Administrator"
 
msgstr "Kallithea Administrator"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399
 
#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429
 
@@ -1390,21 +1390,21 @@ msgid "Register disabled"
 
msgstr "Registrierung deaktiviert"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
 
msgid "Register new user with RhodeCode with manual activation"
 
msgstr "Registrierung neuer Benutzer in RhodeCode mit manueller Aktivierung"
 
msgid "Register new user with Kallithea with manual activation"
 
msgstr "Registrierung neuer Benutzer in Kallithea mit manueller Aktivierung"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
 
msgid "Register new user with RhodeCode with auto activation"
 
msgstr "Registrierung neuer Benutzer in RhodeCode mit Automatischer Aktivierung"
 
msgid "Register new user with Kallithea with auto activation"
 
msgstr "Registrierung neuer Benutzer in Kallithea mit Automatischer Aktivierung"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838
 
#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934
 
@@ -1701,13 +1701,13 @@ msgstr ""
 
#, python-format
 
msgid "%(user)s mentioned you at %(when)s"
 
msgstr ""
 

	
 
#: kallithea/model/notification.py:232
 
#, python-format
 
msgid "%(user)s registered in RhodeCode at %(when)s"
 
msgid "%(user)s registered in Kallithea at %(when)s"
 
msgstr ""
 

	
 
#: kallithea/model/notification.py:233
 
#, python-format
 
msgid "%(user)s opened new pull request at %(when)s"
 
msgstr ""
 
@@ -1752,13 +1752,13 @@ msgstr ""
 
#: kallithea/model/user.py:331
 
msgid "Your new password"
 
msgstr ""
 

	
 
#: kallithea/model/user.py:332
 
#, python-format
 
msgid "Your new RhodeCode password:%s"
 
msgid "Your new Kallithea password:%s"
 
msgstr ""
 

	
 
#: kallithea/model/validators.py:82 kallithea/model/validators.py:83
 
msgid "Value cannot be an empty list"
 
msgstr ""
 

	
 
@@ -2318,13 +2318,13 @@ msgstr ""
 
msgid "Enabled Plugins"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:36
 
msgid ""
 
"Comma separated list of plugins. Order of plugins is also order in which "
 
"RhodeCode will try to authenticate user"
 
"Kallithea will try to authenticate user"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:37
 
msgid "Available built-in plugins"
 
msgstr ""
 

	
 
@@ -2926,13 +2926,13 @@ msgstr ""
 
msgid "Anonymous access"
 
msgstr "Anonymer Zugang"
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:13
 
#, python-format
 
msgid ""
 
"Allow access to RhodeCode without need to log in. Anonymous users use %s "
 
"Allow access to Kallithea without need to log in. Anonymous users use %s "
 
"user permissions"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:26
 
msgid ""
 
"All default permissions on each repository will be reset to chosen "
 
@@ -3295,13 +3295,13 @@ msgid ""
 
"this process is finished.repo_name"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_creating.html:42
 
msgid ""
 
"We're sorry but error occured during this operation. Please check your "
 
"RhodeCode server logs, or contact administrator."
 
"Kallithea server logs, or contact administrator."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit.html:8
 
#, python-format
 
msgid "%s repository settings"
 
msgstr ""
 
@@ -3414,13 +3414,13 @@ msgstr ""
 
msgid "Delete forks"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 
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 "
 
"for Kallithea and VCS systems. If you need to fully delete it from file "
 
"system please do it manually"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit_caches.html:4
 
msgid "Invalidate repository cache"
 
msgstr ""
 
@@ -3627,13 +3627,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:4
 
msgid "Email prefix"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:5
 
msgid "RhodeCode email from"
 
msgid "Kallithea email from"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:6
 
msgid "Error email from"
 
msgstr ""
 

	
 
@@ -3679,13 +3679,13 @@ msgstr "Senden"
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:8
 
msgid "Site branding"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:12
 
msgid "Set a custom title for your RhodeCode Service."
 
msgid "Set a custom title for your Kallithea Service."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:18
 
msgid "HTTP authentication realm"
 
msgstr ""
 

	
 
@@ -3739,13 +3739,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_license.html:2
 
msgid "Currently you're using a free license, which is limited to 20 users."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:9
 
#: kallithea/templates/admin/settings/settings_system.html:4
 
msgid "RhodeCode version"
 
msgid "Kallithea version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:10
 
msgid "License token"
 
msgstr ""
 

	
 
@@ -3775,13 +3775,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:33
 
msgid "License key"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:37
 
msgid "Paste your RhodeCode license key into that textarea."
 
msgid "Paste your Kallithea license key into that textarea."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:52
 
msgid ""
 
"Please enter following lines (if yet not present) into [app:main] section of"
 
" your .ini file. The token below is autogenerated."
 
@@ -3814,13 +3814,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_mapping.html:23
 
msgid "Install GIT hooks"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:25
 
msgid ""
 
"Verify if RhodeCodes GIT hooks are installed for each repository. Current "
 
"Verify if Kallitheas GIT hooks are installed for each repository. Current "
 
"hooks will be updated to latest version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:32
 
msgid "Rescan Repositories"
 
msgstr ""
 
@@ -3832,13 +3832,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_search.html:12
 
msgid "Build from scratch"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:15
 
msgid ""
 
"This option completely reindex all the files within RhodeCode for proper "
 
"This option completely reindex all the files within Kallithea for proper "
 
"fulltext search capabilities."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:21
 
msgid "Reindex"
 
msgstr "Erneut Indizieren"
 
@@ -3886,13 +3886,13 @@ msgstr "Web"
 
#: kallithea/templates/admin/settings/settings_vcs.html:11
 
msgid "Require SSL for vcs operations"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:13
 
msgid ""
 
"Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
 
"Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
 
"certificate is missing it will return a HTTP Error 406: Not Acceptable."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:24
 
msgid "Show repository size after push"
 
msgstr ""
 
@@ -3930,13 +3930,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_vcs.html:64
 
msgid "Repositories location"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:69
 
msgid ""
 
"Click to unlock. You must restart RhodeCode in order to make this setting "
 
"Click to unlock. You must restart Kallithea in order to make this setting "
 
"take effect."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:72
 
msgid ""
 
"Filesystem location where repositories should be stored. After changing this"
 
@@ -3953,40 +3953,40 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:15
 
msgid "Allows storing additional customized fields per repository."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:18
 
msgid "Show RhodeCode version"
 
msgid "Show Kallithea version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:20
 
msgid "Shows or hides a version number of RhodeCode displayed in the footer."
 
msgid "Shows or hides a version number of Kallithea displayed in the footer."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:24
 
msgid "Use Gravatars in RhodeCode"
 
msgid "Use Gravatars in Kallithea"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:30
 
msgid ""
 
"Gravatar url allows you to use other avatar server application.\n"
 
"                                                        Following variables of the URL will be replaced accordingly.\n"
 
"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme}    'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {email}     user email,\n"
 
"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
 
"                                                        {size}      size of the image that is expected from the server application,\n"
 
"                                                        {netloc}    network location/server host of running RhodeCode server"
 
"                                                        {netloc}    network location/server host of running Kallithea server"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:42
 
msgid ""
 
"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
 
"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme} 'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {user}   current user username,\n"
 
"                                                        {netloc} network location/server host of running RhodeCode server,\n"
 
"                                                        {netloc} network location/server host of running Kallithea server,\n"
 
"                                                        {repo}   full repository name,\n"
 
"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:54
 
msgid "Dashboard items"
 
@@ -4695,13 +4695,13 @@ msgstr ""
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:9
 
msgid "Refs"
 
msgstr ""
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:86
 
msgid "Add or upload files directly via RhodeCode"
 
msgid "Add or upload files directly via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:89
 
#: kallithea/templates/files/files_ypjax.html:9
 
msgid "Add New File"
 
msgstr ""
 
@@ -4841,13 +4841,13 @@ msgstr ""
 
msgid "Comments parsed using %s syntax with %s support."
 
msgstr ""
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:69
 
#: kallithea/templates/changeset/changeset_file_comment.html:155
 
msgid ""
 
"Use @username inside this text to send notification to this RhodeCode user"
 
"Use @username inside this text to send notification to this Kallithea user"
 
msgstr ""
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:73
 
#: kallithea/templates/changeset/changeset_file_comment.html:166
 
msgid "Preview"
 
msgstr ""
 
@@ -5006,13 +5006,13 @@ msgstr ""
 

	
 
#: kallithea/templates/email_templates/changeset_comment.html:9
 
msgid "The changeset status was changed to"
 
msgstr ""
 

	
 
#: kallithea/templates/email_templates/main.html:8
 
msgid "This is a notification from RhodeCode."
 
msgid "This is a notification from Kallithea."
 
msgstr ""
 

	
 
#: kallithea/templates/email_templates/password_reset.html:4
 
#, python-format
 
msgid "Hello %s"
 
msgstr ""
kallithea/i18n/en/LC_MESSAGES/kallithea.po
Show inline comments
 
# English translations for rhodecode.
 
# English translations for Kallithea.
 
# Copyright (C) 2010 ORGANIZATION
 
# This file is distributed under the same license as the rhodecode project.
 
# This file is distributed under the same license as the Kallithea project.
 
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
 
#
 
msgid ""
 
msgstr ""
 
"Project-Id-Version: rhodecode 0.1\n"
 
"Project-Id-Version: Kallithea 0.1\n"
 
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\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 <LL@li.org>\n"
 
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
@@ -119,13 +119,13 @@ msgstr ""
 
#: kallithea/controllers/files.py:283
 
msgid "You can only edit files with revision being a valid branch "
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:297
 
#, python-format
 
msgid "Edited file %s via RhodeCode"
 
msgid "Edited file %s via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:313
 
msgid "No changes"
 
msgstr ""
 

	
 
@@ -136,13 +136,13 @@ msgstr ""
 

	
 
#: kallithea/controllers/files.py:327 kallithea/controllers/files.py:405
 
msgid "Error occurred during commit"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:351
 
msgid "Added file via RhodeCode"
 
msgid "Added file via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:368
 
msgid "No content"
 
msgstr ""
 

	
 
@@ -209,13 +209,13 @@ msgstr ""
 
#: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157
 
#: kallithea/templates/journal/journal.html:12
 
msgid "journal"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:138
 
msgid "You have successfully registered into RhodeCode"
 
msgid "You have successfully registered into Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:159
 
msgid "Your password reset link was sent"
 
msgstr ""
 

	
 
@@ -966,13 +966,13 @@ msgstr ""
 

	
 
#: kallithea/lib/helpers.py:759
 
msgid "[pushed] into"
 
msgstr ""
 

	
 
#: kallithea/lib/helpers.py:761
 
msgid "[committed via RhodeCode] into repository"
 
msgid "[committed via Kallithea] into repository"
 
msgstr ""
 

	
 
#: kallithea/lib/helpers.py:763
 
msgid "[pulled from remote] into repository"
 
msgstr ""
 

	
 
@@ -1153,13 +1153,13 @@ msgstr ""
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398
 
#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 kallithea/model/db.py:1411
 
msgid "RhodeCode Administrator"
 
msgid "Kallithea Administrator"
 
msgstr ""
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399
 
@@ -1199,20 +1199,20 @@ msgid "Register disabled"
 
msgstr ""
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
 
msgid "Register new user with RhodeCode with manual activation"
 
msgid "Register new user with Kallithea with manual activation"
 
msgstr ""
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
 
msgid "Register new user with RhodeCode with auto activation"
 
msgid "Register new user with Kallithea with auto activation"
 
msgstr ""
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1643
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838
 
@@ -1354,13 +1354,13 @@ msgstr ""
 
#, python-format
 
msgid "%(user)s mentioned you at %(when)s"
 
msgstr ""
 

	
 
#: kallithea/model/notification.py:231
 
#, python-format
 
msgid "%(user)s registered in RhodeCode at %(when)s"
 
msgid "%(user)s registered in Kallithea at %(when)s"
 
msgstr ""
 

	
 
#: kallithea/model/notification.py:232
 
#, python-format
 
msgid "%(user)s opened new pull request at %(when)s"
 
msgstr ""
 
@@ -1405,13 +1405,13 @@ msgstr ""
 
#: kallithea/model/user.py:366
 
msgid "Your new password"
 
msgstr ""
 

	
 
#: kallithea/model/user.py:367
 
#, python-format
 
msgid "Your new RhodeCode password:%s"
 
msgid "Your new Kallithea password:%s"
 
msgstr ""
 

	
 
#: kallithea/model/validators.py:38 kallithea/model/validators.py:39
 
msgid "Value cannot be an empty list"
 
msgstr ""
 

	
 
@@ -2601,13 +2601,13 @@ msgstr ""
 
msgid "Delete forks"
 
msgstr ""
 

	
 
#: kallithea/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"
 
"unaccesible for Kallithea and VCS systems. If you need to fully delete it"
 
" from file system please do it manually"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit.html:329
 
msgid "Extra fields"
 
msgstr ""
 
@@ -2916,17 +2916,17 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings.html:136
 
msgid "Allows storing additional customized fields per repository."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings.html:139
 
msgid "Show RhodeCode version"
 
msgid "Show Kallithea version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings.html:141
 
msgid "Shows or hides displayed version of RhodeCode in the footer"
 
msgid "Shows or hides displayed version of Kallithea in the footer"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings.html:146
 
msgid "Dashboard items"
 
msgstr ""
 

	
 
@@ -2971,13 +2971,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings.html:218
 
msgid "Require SSL for vcs operations"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings.html:220
 
msgid ""
 
"RhodeCode will require SSL for pushing or pulling. If SSL is missing it "
 
"Kallithea will require SSL for pushing or pulling. If SSL is missing it "
 
"will return HTTP Error 406: Not Acceptable"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings.html:226
 
msgid "Hooks"
 
msgstr ""
 
@@ -3023,13 +3023,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings.html:274
 
msgid "Repositories location"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings.html:279
 
msgid ""
 
"Click to unlock. You must restart RhodeCode in order to make this setting"
 
"Click to unlock. You must restart Kallithea in order to make this setting"
 
" take effect."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings.html:280
 
#: kallithea/templates/base/base.html:143
 
msgid "Unlock"
 
@@ -3694,13 +3694,13 @@ msgstr ""
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:9
 
msgid "Refs"
 
msgstr ""
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:86
 
msgid "Add or upload files directly via RhodeCode"
 
msgid "Add or upload files directly via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:89
 
#: kallithea/templates/files/files_add.html:38
 
#: kallithea/templates/files/files_browser.html:31
 
msgid "Add new file"
 
@@ -3825,13 +3825,13 @@ msgstr ""
 
#, python-format
 
msgid "Comments parsed using %s syntax with %s support."
 
msgstr ""
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:61
 
#: kallithea/templates/changeset/changeset_file_comment.html:147
 
msgid "Use @username inside this text to send notification to this RhodeCode user"
 
msgid "Use @username inside this text to send notification to this Kallithea user"
 
msgstr ""
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:65
 
#: kallithea/templates/changeset/changeset_file_comment.html:152
 
#, fuzzy
 
msgid "Preview"
 
@@ -3987,13 +3987,13 @@ msgstr ""
 

	
 
#: kallithea/templates/email_templates/changeset_comment.html:14
 
msgid "The changeset status was changed to"
 
msgstr ""
 

	
 
#: kallithea/templates/email_templates/main.html:8
 
msgid "This is a notification from RhodeCode."
 
msgid "This is a notification from Kallithea."
 
msgstr ""
 

	
 
#: kallithea/templates/email_templates/password_reset.html:4
 
#, python-format
 
msgid "Hello %s"
 
msgstr ""
kallithea/i18n/fr/LC_MESSAGES/kallithea.po
Show inline comments
 
# Translations template for RhodeCode.
 
# Translations template for Kallithea.
 
# Copyright (C) 2014 RhodeCode GmbH, and others.
 
# This file is distributed under the same license as the RhodeCode project.
 
# This file is distributed under the same license as the Kallithea project.
 
# Translators:
 
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 
msgid ""
 
msgstr ""
 
"Project-Id-Version: RhodeCode\n"
 
"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
 
"Project-Id-Version: Kallithea\n"
 
"Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 
"POT-Creation-Date: 2014-02-13 15:30+0100\n"
 
"PO-Revision-Date: 2014-02-13 14:34+0000\n"
 
"Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 
"Language-Team: French (http://www.transifex.com/projects/p/RhodeCode/language/fr/)\n"
 
"Language-Team: French (http://www.transifex.com/projects/p/Kallithea/language/fr/)\n"
 
"MIME-Version: 1.0\n"
 
"Content-Type: text/plain; charset=UTF-8\n"
 
"Content-Transfer-Encoding: 8bit\n"
 
"Generated-By: Babel 0.9.6\n"
 
"Language: fr\n"
 
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
@@ -135,13 +135,13 @@ msgstr "Ce dépôt a été verrouillé par %s sur %s."
 
#: kallithea/controllers/files.py:311
 
msgid "You can only delete files with revision being a valid branch "
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:322
 
#, python-format
 
msgid "Deleted file %s via RhodeCode"
 
msgid "Deleted file %s via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:344
 
#, python-format
 
msgid "Successfully deleted file %s"
 
msgstr ""
 
@@ -154,27 +154,27 @@ msgstr "Une erreur est survenue durant l
 
#: kallithea/controllers/files.py:371
 
msgid "You can only edit files with revision being a valid branch "
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:385
 
#, python-format
 
msgid "Edited file %s via RhodeCode"
 
msgstr "%s édité via RhodeCode"
 
msgid "Edited file %s via Kallithea"
 
msgstr "%s édité via Kallithea"
 

	
 
#: kallithea/controllers/files.py:401
 
msgid "No changes"
 
msgstr "Aucun changement"
 

	
 
#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485
 
#, python-format
 
msgid "Successfully committed to %s"
 
msgstr "Commit réalisé avec succès sur %s"
 

	
 
#: kallithea/controllers/files.py:438
 
msgid "Added file via RhodeCode"
 
msgstr "%s ajouté par RhodeCode"
 
msgid "Added file via Kallithea"
 
msgstr "%s ajouté par Kallithea"
 

	
 
#: kallithea/controllers/files.py:459
 
msgid "No content"
 
msgstr "Aucun contenu"
 

	
 
#: kallithea/controllers/files.py:463
 
@@ -272,14 +272,14 @@ msgstr "Journal"
 

	
 
#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230
 
msgid "bad captcha"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:191
 
msgid "You have successfully registered into RhodeCode"
 
msgstr "Vous vous êtes inscrits avec succès à RhodeCode"
 
msgid "You have successfully registered into Kallithea"
 
msgstr "Vous vous êtes inscrits avec succès à Kallithea"
 

	
 
#: kallithea/controllers/login.py:235
 
msgid "Your password reset link was sent"
 
msgstr "Un lien de rénitialisation de votre mot de passe vous a été envoyé."
 

	
 
#: kallithea/controllers/login.py:255
 
@@ -1099,14 +1099,14 @@ msgstr "[a fermé] la requête de pull de"
 

	
 
#: kallithea/lib/helpers.py:777
 
msgid "[pushed] into"
 
msgstr "[a pushé] dans"
 

	
 
#: kallithea/lib/helpers.py:779
 
msgid "[committed via RhodeCode] into repository"
 
msgstr "[a commité via RhodeCode] dans le dépôt"
 
msgid "[committed via Kallithea] into repository"
 
msgstr "[a commité via Kallithea] dans le dépôt"
 

	
 
#: kallithea/lib/helpers.py:781
 
msgid "[pulled from remote] into repository"
 
msgstr "[a pullé depuis un site distant] dans le dépôt"
 

	
 
#: kallithea/lib/helpers.py:783
 
@@ -1316,14 +1316,14 @@ msgstr "Accès administrateur au groupe de dépôts"
 
#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509
 
#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510
 
#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531
 
#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
 
#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
 
#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
 
msgid "RhodeCode Administrator"
 
msgstr "Administrateur RhodeCode"
 
msgid "Kallithea Administrator"
 
msgstr "Administrateur Kallithea"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399
 
#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429
 
@@ -1390,21 +1390,21 @@ msgid "Register disabled"
 
msgstr "Enregistrement désactivé"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
 
#: kallithea/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é"
 
msgid "Register new user with Kallithea with manual activation"
 
msgstr "Enregistrer un nouvel utilisateur Kallithea manuellement activé"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
 
#: kallithea/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é"
 
msgid "Register new user with Kallithea with auto activation"
 
msgstr "Enregistrer un nouvel utilisateur Kallithea auto-activé"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838
 
#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934
 
@@ -1701,13 +1701,13 @@ msgstr ""
 
#, python-format
 
msgid "%(user)s mentioned you at %(when)s"
 
msgstr ""
 

	
 
#: kallithea/model/notification.py:232
 
#, python-format
 
msgid "%(user)s registered in RhodeCode at %(when)s"
 
msgid "%(user)s registered in Kallithea at %(when)s"
 
msgstr ""
 

	
 
#: kallithea/model/notification.py:233
 
#, python-format
 
msgid "%(user)s opened new pull request at %(when)s"
 
msgstr ""
 
@@ -1752,13 +1752,13 @@ msgstr ""
 
#: kallithea/model/user.py:331
 
msgid "Your new password"
 
msgstr ""
 

	
 
#: kallithea/model/user.py:332
 
#, python-format
 
msgid "Your new RhodeCode password:%s"
 
msgid "Your new Kallithea password:%s"
 
msgstr ""
 

	
 
#: kallithea/model/validators.py:82 kallithea/model/validators.py:83
 
msgid "Value cannot be an empty list"
 
msgstr "Cette valeur ne peut être une liste vide."
 

	
 
@@ -2318,13 +2318,13 @@ msgstr ""
 
msgid "Enabled Plugins"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:36
 
msgid ""
 
"Comma separated list of plugins. Order of plugins is also order in which "
 
"RhodeCode will try to authenticate user"
 
"Kallithea will try to authenticate user"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:37
 
msgid "Available built-in plugins"
 
msgstr ""
 

	
 
@@ -2926,13 +2926,13 @@ msgstr ""
 
msgid "Anonymous access"
 
msgstr "Accès anonyme"
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:13
 
#, python-format
 
msgid ""
 
"Allow access to RhodeCode without need to log in. Anonymous users use %s "
 
"Allow access to Kallithea without need to log in. Anonymous users use %s "
 
"user permissions"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:26
 
msgid ""
 
"All default permissions on each repository will be reset to chosen "
 
@@ -3295,13 +3295,13 @@ msgid ""
 
"this process is finished.repo_name"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_creating.html:42
 
msgid ""
 
"We're sorry but error occured during this operation. Please check your "
 
"RhodeCode server logs, or contact administrator."
 
"Kallithea server logs, or contact administrator."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit.html:8
 
#, python-format
 
msgid "%s repository settings"
 
msgstr ""
 
@@ -3414,13 +3414,13 @@ msgstr ""
 
msgid "Delete forks"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 
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 "
 
"for Kallithea and VCS systems. If you need to fully delete it from file "
 
"system please do it manually"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit_caches.html:4
 
msgid "Invalidate repository cache"
 
msgstr "Invalider le cache du dépôt"
 
@@ -3627,13 +3627,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:4
 
msgid "Email prefix"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:5
 
msgid "RhodeCode email from"
 
msgid "Kallithea email from"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:6
 
msgid "Error email from"
 
msgstr ""
 

	
 
@@ -3679,13 +3679,13 @@ msgstr "Envoyer"
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:8
 
msgid "Site branding"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:12
 
msgid "Set a custom title for your RhodeCode Service."
 
msgid "Set a custom title for your Kallithea Service."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:18
 
msgid "HTTP authentication realm"
 
msgstr ""
 

	
 
@@ -3739,13 +3739,13 @@ msgstr "Erreur lors de la suppression du
 
#: kallithea/templates/admin/settings/settings_license.html:2
 
msgid "Currently you're using a free license, which is limited to 20 users."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:9
 
#: kallithea/templates/admin/settings/settings_system.html:4
 
msgid "RhodeCode version"
 
msgid "Kallithea version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:10
 
msgid "License token"
 
msgstr ""
 

	
 
@@ -3775,13 +3775,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:33
 
msgid "License key"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:37
 
msgid "Paste your RhodeCode license key into that textarea."
 
msgid "Paste your Kallithea license key into that textarea."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:52
 
msgid ""
 
"Please enter following lines (if yet not present) into [app:main] section of"
 
" your .ini file. The token below is autogenerated."
 
@@ -3814,13 +3814,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_mapping.html:23
 
msgid "Install GIT hooks"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:25
 
msgid ""
 
"Verify if RhodeCodes GIT hooks are installed for each repository. Current "
 
"Verify if Kallitheas GIT hooks are installed for each repository. Current "
 
"hooks will be updated to latest version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:32
 
msgid "Rescan Repositories"
 
msgstr ""
 
@@ -3832,13 +3832,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_search.html:12
 
msgid "Build from scratch"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:15
 
msgid ""
 
"This option completely reindex all the files within RhodeCode for proper "
 
"This option completely reindex all the files within Kallithea for proper "
 
"fulltext search capabilities."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:21
 
msgid "Reindex"
 
msgstr "Mettre à jour l’index"
 
@@ -3886,13 +3886,13 @@ msgstr "Web"
 
#: kallithea/templates/admin/settings/settings_vcs.html:11
 
msgid "Require SSL for vcs operations"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:13
 
msgid ""
 
"Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
 
"Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
 
"certificate is missing it will return a HTTP Error 406: Not Acceptable."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:24
 
msgid "Show repository size after push"
 
msgstr "Afficher la taille du dépôt après un push"
 
@@ -3930,13 +3930,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_vcs.html:64
 
msgid "Repositories location"
 
msgstr "Emplacement des dépôts"
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:69
 
msgid ""
 
"Click to unlock. You must restart RhodeCode in order to make this setting "
 
"Click to unlock. You must restart Kallithea in order to make this setting "
 
"take effect."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:72
 
msgid ""
 
"Filesystem location where repositories should be stored. After changing this"
 
@@ -3953,40 +3953,40 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:15
 
msgid "Allows storing additional customized fields per repository."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:18
 
msgid "Show RhodeCode version"
 
msgid "Show Kallithea version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:20
 
msgid "Shows or hides a version number of RhodeCode displayed in the footer."
 
msgid "Shows or hides a version number of Kallithea displayed in the footer."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:24
 
msgid "Use Gravatars in RhodeCode"
 
msgid "Use Gravatars in Kallithea"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:30
 
msgid ""
 
"Gravatar url allows you to use other avatar server application.\n"
 
"                                                        Following variables of the URL will be replaced accordingly.\n"
 
"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme}    'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {email}     user email,\n"
 
"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
 
"                                                        {size}      size of the image that is expected from the server application,\n"
 
"                                                        {netloc}    network location/server host of running RhodeCode server"
 
"                                                        {netloc}    network location/server host of running Kallithea server"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:42
 
msgid ""
 
"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
 
"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme} 'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {user}   current user username,\n"
 
"                                                        {netloc} network location/server host of running RhodeCode server,\n"
 
"                                                        {netloc} network location/server host of running Kallithea server,\n"
 
"                                                        {repo}   full repository name,\n"
 
"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:54
 
msgid "Dashboard items"
 
@@ -4695,14 +4695,14 @@ msgstr ""
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:9
 
msgid "Refs"
 
msgstr ""
 

	
 
#: kallithea/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…"
 
msgid "Add or upload files directly via Kallithea"
 
msgstr "Ajouter ou téléverser des fichiers directement via Kallithea…"
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:89
 
#: kallithea/templates/files/files_ypjax.html:9
 
msgid "Add New File"
 
msgstr ""
 

	
 
@@ -4841,14 +4841,14 @@ msgstr "Commentaire sur la ligne {1}."
 
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."
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:69
 
#: kallithea/templates/changeset/changeset_file_comment.html:155
 
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."
 
"Use @username inside this text to send notification to this Kallithea user"
 
msgstr "Utilisez @nomutilisateur dans ce texte pour envoyer une notification à l’utilisateur Kallithea en question."
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:73
 
#: kallithea/templates/changeset/changeset_file_comment.html:166
 
msgid "Preview"
 
msgstr ""
 

	
 
@@ -5006,13 +5006,13 @@ msgstr ""
 

	
 
#: kallithea/templates/email_templates/changeset_comment.html:9
 
msgid "The changeset status was changed to"
 
msgstr ""
 

	
 
#: kallithea/templates/email_templates/main.html:8
 
msgid "This is a notification from RhodeCode."
 
msgid "This is a notification from Kallithea."
 
msgstr ""
 

	
 
#: kallithea/templates/email_templates/password_reset.html:4
 
#, python-format
 
msgid "Hello %s"
 
msgstr ""
kallithea/i18n/how_to
Show inline comments
 
##########################
 
# to create new language #
 
##########################
 

	
 
Translations are available on transifex under::
 

	
 
    https://www.transifex.com/projects/p/RhodeCode/
 
    https://www.transifex.com/projects/p/Kallithea/
 

	
 
Preferred method is to register on transifex and request new language translation.
 

	
 
manual creation of new language
 
+++++++++++++++++++++++++++++++
 
 
 
Dowload sources of RhodeCode. Run::
 
Dowload sources of Kallithea. Run::
 

	
 
    python setup.py develop
 

	
 
To prepare the enviroment
 

	
 

	
 
@@ -59,9 +59,9 @@ new translation instructions
 
########################
 

	
 
Edit test.ini file and set lang attribute to::
 

	
 
    lang=<new_language_code>
 

	
 
Run RhodeCode tests by executing::
 
Run Kallithea tests by executing::
 

	
 
    nosetests
kallithea/i18n/ja/LC_MESSAGES/kallithea.po
Show inline comments
 
# Translations template for RhodeCode.
 
# Translations template for Kallithea.
 
# Copyright (C) 2014 RhodeCode GmbH, and others.
 
# This file is distributed under the same license as the RhodeCode project.
 
# This file is distributed under the same license as the Kallithea project.
 
# Translators:
 
# しろう, 2013
 
# shirou - しろう, 2013
 
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 
# こいんとす <tkondou@gmail.com>, 2013
 
# Takumi IINO <trot.thunder@gmail.com>, 2013
 
# こいんとす <tkondou@gmail.com>, 2013
 
# shirou - しろう, 2013
 
# whosaysni <whosaysni@gmail.com>, 2014
 
msgid ""
 
msgstr ""
 
"Project-Id-Version: RhodeCode\n"
 
"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
 
"Project-Id-Version: Kallithea\n"
 
"Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 
"POT-Creation-Date: 2014-02-13 15:30+0100\n"
 
"PO-Revision-Date: 2014-02-13 14:34+0000\n"
 
"Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 
"Language-Team: Japanese (http://www.transifex.com/projects/p/RhodeCode/language/ja/)\n"
 
"Language-Team: Japanese (http://www.transifex.com/projects/p/Kallithea/language/ja/)\n"
 
"MIME-Version: 1.0\n"
 
"Content-Type: text/plain; charset=UTF-8\n"
 
"Content-Transfer-Encoding: 8bit\n"
 
"Generated-By: Babel 0.9.6\n"
 
"Language: ja\n"
 
"Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -142,14 +142,14 @@ msgstr "このリポジトリは %s によって %s にロックされました"
 
#: kallithea/controllers/files.py:311
 
msgid "You can only delete files with revision being a valid branch "
 
msgstr "有効なブランチ上のリビジョンからしかファイルを削除できません"
 

	
 
#: kallithea/controllers/files.py:322
 
#, python-format
 
msgid "Deleted file %s via RhodeCode"
 
msgstr "RhodeCode経由で %s を削除"
 
msgid "Deleted file %s via Kallithea"
 
msgstr "Kallithea経由で %s を削除"
 

	
 
#: kallithea/controllers/files.py:344
 
#, python-format
 
msgid "Successfully deleted file %s"
 
msgstr "%s ファイルの削除に成功しました"
 

	
 
@@ -161,27 +161,27 @@ msgstr "コミット中にエラーが発生しました"
 
#: kallithea/controllers/files.py:371
 
msgid "You can only edit files with revision being a valid branch "
 
msgstr "有効なブランチを示すリビジョンでのみファイルを編集できます。"
 

	
 
#: kallithea/controllers/files.py:385
 
#, python-format
 
msgid "Edited file %s via RhodeCode"
 
msgstr "RhodeCode経由で %s を変更"
 
msgid "Edited file %s via Kallithea"
 
msgstr "Kallithea経由で %s を変更"
 

	
 
#: kallithea/controllers/files.py:401
 
msgid "No changes"
 
msgstr "変更点なし"
 

	
 
#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485
 
#, python-format
 
msgid "Successfully committed to %s"
 
msgstr "%s へのコミットが成功しました"
 

	
 
#: kallithea/controllers/files.py:438
 
msgid "Added file via RhodeCode"
 
msgstr "RhodeCode経由でファイルを追加"
 
msgid "Added file via Kallithea"
 
msgstr "Kallithea経由でファイルを追加"
 

	
 
#: kallithea/controllers/files.py:459
 
msgid "No content"
 
msgstr "内容がありません"
 

	
 
#: kallithea/controllers/files.py:463
 
@@ -279,14 +279,14 @@ msgstr "ジャーナル"
 

	
 
#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230
 
msgid "bad captcha"
 
msgstr "キャプチャが一致しません"
 

	
 
#: kallithea/controllers/login.py:191
 
msgid "You have successfully registered into RhodeCode"
 
msgstr "RhodeCodeへの登録を受け付けました"
 
msgid "You have successfully registered into Kallithea"
 
msgstr "Kallitheaへの登録を受け付けました"
 

	
 
#: kallithea/controllers/login.py:235
 
msgid "Your password reset link was sent"
 
msgstr "パスワードリセットのリンクを送信しました"
 

	
 
#: kallithea/controllers/login.py:255
 
@@ -1106,14 +1106,14 @@ msgstr "プルリクエストを[クローズ]"
 

	
 
#: kallithea/lib/helpers.py:777
 
msgid "[pushed] into"
 
msgstr "[プッシュ]"
 

	
 
#: kallithea/lib/helpers.py:779
 
msgid "[committed via RhodeCode] into repository"
 
msgstr "リポジトリに[RhodeCode経由でコミット]"
 
msgid "[committed via Kallithea] into repository"
 
msgstr "リポジトリに[Kallithea経由でコミット]"
 

	
 
#: kallithea/lib/helpers.py:781
 
msgid "[pulled from remote] into repository"
 
msgstr "リポジトリに[リモートからプル]"
 

	
 
#: kallithea/lib/helpers.py:783
 
@@ -1317,14 +1317,14 @@ msgstr "リポジトリグループに管理権限でアクセス"
 
#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509
 
#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510
 
#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531
 
#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
 
#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
 
#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
 
msgid "RhodeCode Administrator"
 
msgstr "RhodeCode 管理者"
 
msgid "Kallithea Administrator"
 
msgstr "Kallithea 管理者"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399
 
#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429
 
@@ -1391,21 +1391,21 @@ msgid "Register disabled"
 
msgstr "新規登録を無効にする"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
 
msgid "Register new user with RhodeCode with manual activation"
 
msgstr "Rhodecodeに登録した新しいユーザーを手動でアクティベートする"
 
msgid "Register new user with Kallithea with manual activation"
 
msgstr "Kallitheaに登録した新しいユーザーを手動でアクティベートする"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
 
msgid "Register new user with RhodeCode with auto activation"
 
msgstr "Rhodecodeに登録した新しいユーザーを自動でアクティベートする"
 
msgid "Register new user with Kallithea with auto activation"
 
msgstr "Kallitheaに登録した新しいユーザーを自動でアクティベートする"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838
 
#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934
 
@@ -1702,14 +1702,14 @@ msgstr "%(user)s がメッセージを送信 %(when)s"
 
#, python-format
 
msgid "%(user)s mentioned you at %(when)s"
 
msgstr "%(user)s がにあなたにメンション %(when)s"
 

	
 
#: kallithea/model/notification.py:232
 
#, python-format
 
msgid "%(user)s registered in RhodeCode at %(when)s"
 
msgstr "%(user)s がRhodeCodeに登録 %(when)s"
 
msgid "%(user)s registered in Kallithea at %(when)s"
 
msgstr "%(user)s がKallitheaに登録 %(when)s"
 

	
 
#: kallithea/model/notification.py:233
 
#, python-format
 
msgid "%(user)s opened new pull request at %(when)s"
 
msgstr "%(user)s が新しいプルリクエストを作成 %(when)s"
 

	
 
@@ -1753,14 +1753,14 @@ msgstr "パスワードリセットのリンク"
 
#: kallithea/model/user.py:331
 
msgid "Your new password"
 
msgstr "新しいパスワード"
 

	
 
#: kallithea/model/user.py:332
 
#, python-format
 
msgid "Your new RhodeCode password:%s"
 
msgstr "新しいRhodeCodeパスワード:%s"
 
msgid "Your new Kallithea password:%s"
 
msgstr "新しいKallitheaパスワード:%s"
 

	
 
#: kallithea/model/validators.py:82 kallithea/model/validators.py:83
 
msgid "Value cannot be an empty list"
 
msgstr "空のリストにはできません"
 

	
 
#: kallithea/model/validators.py:120
 
@@ -2318,14 +2318,14 @@ msgstr "認証プラグイン"
 
msgid "Enabled Plugins"
 
msgstr "有効なプラグイン"
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:36
 
msgid ""
 
"Comma separated list of plugins. Order of plugins is also order in which "
 
"RhodeCode will try to authenticate user"
 
msgstr "カンマ区切りのプラグインの一覧です。プラグインの並び順はRhodeCodeがユーザー認証を試す順番でもあります。"
 
"Kallithea will try to authenticate user"
 
msgstr "カンマ区切りのプラグインの一覧です。プラグインの並び順はKallitheaがユーザー認証を試す順番でもあります。"
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:37
 
msgid "Available built-in plugins"
 
msgstr "有効な組み込みプラグイン"
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:43
 
@@ -2926,15 +2926,15 @@ msgstr "概要"
 
msgid "Anonymous access"
 
msgstr "匿名アクセス"
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:13
 
#, python-format
 
msgid ""
 
"Allow access to RhodeCode without need to log in. Anonymous users use %s "
 
"Allow access to Kallithea without need to log in. Anonymous users use %s "
 
"user permissions"
 
msgstr "ログインしなくても RhodeCode にアクセスできるようにします。匿名ユーザーは %s ユーザーパーミッションを使います"
 
msgstr "ログインしなくても Kallithea にアクセスできるようにします。匿名ユーザーは %s ユーザーパーミッションを使います"
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:26
 
msgid ""
 
"All default permissions on each repository will be reset to chosen "
 
"permission, note that all custom default permission on repositories will be "
 
"lost"
 
@@ -3294,14 +3294,14 @@ msgid ""
 
"this process is finished.repo_name"
 
msgstr "リポジトリ \"%(repo_name)s\" を作成中です。処理を完了したらリダイレクトします。"
 

	
 
#: kallithea/templates/admin/repos/repo_creating.html:42
 
msgid ""
 
"We're sorry but error occured during this operation. Please check your "
 
"RhodeCode server logs, or contact administrator."
 
msgstr "恐れいります。操作中にエラーが発生しました。 RhodeCode サーバのログをチェックするか、管理者に問い合わせてください。"
 
"Kallithea server logs, or contact administrator."
 
msgstr "恐れいります。操作中にエラーが発生しました。 Kallithea サーバのログをチェックするか、管理者に問い合わせてください。"
 

	
 
#: kallithea/templates/admin/repos/repo_edit.html:8
 
#, python-format
 
msgid "%s repository settings"
 
msgstr "%s リポジトリ設定"
 

	
 
@@ -3412,15 +3412,15 @@ msgstr "フォークの切り離し"
 
msgid "Delete forks"
 
msgstr "フォークも削除"
 

	
 
#: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 
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 "
 
"for Kallithea and VCS systems. If you need to fully delete it from file "
 
"system please do it manually"
 
msgstr "このリポジトリはRhodeCodeとVCSシステムからアクセス出来ないようにするために特別な方法でリネームされます。\n完全な削除が必要な場合はファイルシステムから手動で削除してください"
 
msgstr "このリポジトリはKallitheaとVCSシステムからアクセス出来ないようにするために特別な方法でリネームされます。\n完全な削除が必要な場合はファイルシステムから手動で削除してください"
 

	
 
#: kallithea/templates/admin/repos/repo_edit_caches.html:4
 
msgid "Invalidate repository cache"
 
msgstr "リポジトリのキャッシュを無効化"
 

	
 
#: kallithea/templates/admin/repos/repo_edit_caches.html:4
 
@@ -3625,14 +3625,14 @@ msgstr "ライセンス"
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:4
 
msgid "Email prefix"
 
msgstr "メールアドレスプレフィックス"
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:5
 
msgid "RhodeCode email from"
 
msgstr "RhodeCode メールのFrom"
 
msgid "Kallithea email from"
 
msgstr "Kallithea メールのFrom"
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:6
 
msgid "Error email from"
 
msgstr "エラーメールのFrom"
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:7
 
@@ -3677,14 +3677,14 @@ msgstr "送信"
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:8
 
msgid "Site branding"
 
msgstr "サイト名"
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:12
 
msgid "Set a custom title for your RhodeCode Service."
 
msgstr "このRhodeCodeサービスのカスタムタイトルを設定します。"
 
msgid "Set a custom title for your Kallithea Service."
 
msgstr "このKallitheaサービスのカスタムタイトルを設定します。"
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:18
 
msgid "HTTP authentication realm"
 
msgstr "HTTP認証レルム"
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:27
 
@@ -3737,14 +3737,14 @@ msgstr "フックの削除に失敗しました"
 
#: kallithea/templates/admin/settings/settings_license.html:2
 
msgid "Currently you're using a free license, which is limited to 20 users."
 
msgstr "20ユーザーまで利用可能な無料ライセンスを使用しています。"
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:9
 
#: kallithea/templates/admin/settings/settings_system.html:4
 
msgid "RhodeCode version"
 
msgstr "RhodeCode バージョン"
 
msgid "Kallithea version"
 
msgstr "Kallithea バージョン"
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:10
 
msgid "License token"
 
msgstr "ライセンストークン"
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:10
 
@@ -3773,14 +3773,14 @@ msgstr "ライセンス有効期限"
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:33
 
msgid "License key"
 
msgstr "ライセンスキー"
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:37
 
msgid "Paste your RhodeCode license key into that textarea."
 
msgstr "RhodeCode ライセンスキーをテキストエリアにペーストしてください。"
 
msgid "Paste your Kallithea license key into that textarea."
 
msgstr "Kallithea ライセンスキーをテキストエリアにペーストしてください。"
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:52
 
msgid ""
 
"Please enter following lines (if yet not present) into [app:main] section of"
 
" your .ini file. The token below is autogenerated."
 
msgstr "以下の行を .ini ファイルの [app:main] セクションに (まだなければ) 入力してください。以下のトークンは、自動生成されています。"
 
@@ -3812,15 +3812,15 @@ msgstr "このオプションを選ぶと、各リポジトリのキャッシュデータを抹消します。データのリロードやキャッシュキーの消去が必要なときに使ってください。"
 
#: kallithea/templates/admin/settings/settings_mapping.html:23
 
msgid "Install GIT hooks"
 
msgstr "GITフックをインストール"
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:25
 
msgid ""
 
"Verify if RhodeCodes GIT hooks are installed for each repository. Current "
 
"Verify if Kallitheas GIT hooks are installed for each repository. Current "
 
"hooks will be updated to latest version"
 
msgstr "各リポジトリに RhodeCodes の GIT フックがインストールされているか確認してください。現在のフックは最新版に更新されます"
 
msgstr "各リポジトリに Kallitheas の GIT フックがインストールされているか確認してください。現在のフックは最新版に更新されます"
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:32
 
msgid "Rescan Repositories"
 
msgstr "リポジトリを再スキャン"
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:7
 
@@ -3830,15 +3830,15 @@ msgstr "インデックス作成時の設定"
 
#: kallithea/templates/admin/settings/settings_search.html:12
 
msgid "Build from scratch"
 
msgstr "一度削除してから再度インデックスを作成"
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:15
 
msgid ""
 
"This option completely reindex all the files within RhodeCode for proper "
 
"This option completely reindex all the files within Kallithea for proper "
 
"fulltext search capabilities."
 
msgstr "このオプションを使うと、全文検索の機能が正しく発揮されるよう、 RhodeCode 中の全てのファイルのインデックスを再生成します。"
 
msgstr "このオプションを使うと、全文検索の機能が正しく発揮されるよう、 Kallithea 中の全てのファイルのインデックスを再生成します。"
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:21
 
msgid "Reindex"
 
msgstr "再インデックス"
 

	
 
#: kallithea/templates/admin/settings/settings_system.html:4
 
@@ -3884,13 +3884,13 @@ msgstr "Web"
 
#: kallithea/templates/admin/settings/settings_vcs.html:11
 
msgid "Require SSL for vcs operations"
 
msgstr "VCSの操作にSSLを必須とする"
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:13
 
msgid ""
 
"Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
 
"Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
 
"certificate is missing it will return a HTTP Error 406: Not Acceptable."
 
msgstr "プッシュ、プル時にSSLを要求します。SSLでない場合はHTTP Error 406: Not Acceptableを返します。"
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:24
 
msgid "Show repository size after push"
 
msgstr "プッシュ後にリポジトリのサイズを表示する"
 
@@ -3928,15 +3928,15 @@ msgstr "hgsubversion ライブラリのインストールが必要です。リモートのSVNリポジトリをクローンしてMercurialリポジトリに変換するすることが可能です。"
 
#: kallithea/templates/admin/settings/settings_vcs.html:64
 
msgid "Repositories location"
 
msgstr "リポジトリロケーション"
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:69
 
msgid ""
 
"Click to unlock. You must restart RhodeCode in order to make this setting "
 
"Click to unlock. You must restart Kallithea in order to make this setting "
 
"take effect."
 
msgstr "アンロックする。この設定を有効にするためにはRhodeCodeの再起動が必要です。"
 
msgstr "アンロックする。この設定を有効にするためにはKallitheaの再起動が必要です。"
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:72
 
msgid ""
 
"Filesystem location where repositories should be stored. After changing this"
 
" value a restart and rescan of the repository folder are required."
 
msgstr "リポジトリを保存するファイルシステムのロケーション。この値を変更した場合、サーバーの再起動とリポジトリフォルダの再スキャンが必要です。"
 
@@ -3951,43 +3951,43 @@ msgstr "リポジトリの拡張フィールドを使用する"
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:15
 
msgid "Allows storing additional customized fields per repository."
 
msgstr "追加のカスタムフィールドをリポジトリ毎に保存することを許可します。"
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:18
 
msgid "Show RhodeCode version"
 
msgstr "Rhodecodeのバージョンを表示する"
 
msgid "Show Kallithea version"
 
msgstr "Kallitheaのバージョンを表示する"
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:20
 
msgid "Shows or hides a version number of RhodeCode displayed in the footer."
 
msgstr "フッターに表示されるRhodeCodeのバージョン番号の表示、非表示を設定します。"
 
msgid "Shows or hides a version number of Kallithea displayed in the footer."
 
msgstr "フッターに表示されるKallitheaのバージョン番号の表示、非表示を設定します。"
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:24
 
msgid "Use Gravatars in RhodeCode"
 
msgid "Use Gravatars in Kallithea"
 
msgstr "Gravatorsを利用する"
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:30
 
msgid ""
 
"Gravatar url allows you to use other avatar server application.\n"
 
"                                                        Following variables of the URL will be replaced accordingly.\n"
 
"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme}    'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {email}     user email,\n"
 
"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
 
"                                                        {size}      size of the image that is expected from the server application,\n"
 
"                                                        {netloc}    network location/server host of running RhodeCode server"
 
msgstr "Gravatar URL を設定すると、外部のアバターサーバーアプリケーションを使用します。\n必要に応じて、 URL に以下の変数を使ってください。\n{scheme} RhodeCode サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n{email} ユーザーのメールアドレス\n{md5email} ユーザーのメールアドレスの md5 ハッシュ値 (gravatar.com で使っています)\n{size} サーバーアプリケーションに要求する画像のサイズ\n{netloc} RhodeCode サーバーのアドレスまたはホスト名"
 
"                                                        {netloc}    network location/server host of running Kallithea server"
 
msgstr "Gravatar URL を設定すると、外部のアバターサーバーアプリケーションを使用します。\n必要に応じて、 URL に以下の変数を使ってください。\n{scheme} Kallithea サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n{email} ユーザーのメールアドレス\n{md5email} ユーザーのメールアドレスの md5 ハッシュ値 (gravatar.com で使っています)\n{size} サーバーアプリケーションに要求する画像のサイズ\n{netloc} Kallithea サーバーのアドレスまたはホスト名"
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:42
 
msgid ""
 
"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
 
"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme} 'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {user}   current user username,\n"
 
"                                                        {netloc} network location/server host of running RhodeCode server,\n"
 
"                                                        {netloc} network location/server host of running Kallithea server,\n"
 
"                                                        {repo}   full repository name,\n"
 
"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
 
msgstr "クローン URL のスキーマは、 '{scheme}://{user}@{netloc}/{repo}' のような形式にします。使える変数は下記の通りです:\n                                                        {scheme} RhodeCode サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n                                                        {user}   ユーザーのユーザー名\n                                                        {netloc} RhodeCode サーバーのアドレスまたはホスト名\n                                                        {repo}   リポジトリの完全な名前\n                                                        {repoid} リポジトリの ID。 clone-by-id に使います。"
 
msgstr "クローン URL のスキーマは、 '{scheme}://{user}@{netloc}/{repo}' のような形式にします。使える変数は下記の通りです:\n                                                        {scheme} Kallithea サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n                                                        {user}   ユーザーのユーザー名\n                                                        {netloc} Kallithea サーバーのアドレスまたはホスト名\n                                                        {repo}   リポジトリの完全な名前\n                                                        {repoid} リポジトリの ID。 clone-by-id に使います。"
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:54
 
msgid "Dashboard items"
 
msgstr "ダッシュボードの項目"
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:58
 
@@ -4692,14 +4692,14 @@ msgstr "経過時間"
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:9
 
msgid "Refs"
 
msgstr "Refs"
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:86
 
msgid "Add or upload files directly via RhodeCode"
 
msgstr "RhodeCode経由で直接ファイルを追加またはアップロード"
 
msgid "Add or upload files directly via Kallithea"
 
msgstr "Kallithea経由で直接ファイルを追加またはアップロード"
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:89
 
#: kallithea/templates/files/files_ypjax.html:9
 
msgid "Add New File"
 
msgstr "新しいファイルを追加"
 

	
 
@@ -4834,14 +4834,14 @@ msgstr "{1} 行目にコメント"
 
msgid "Comments parsed using %s syntax with %s support."
 
msgstr "コメントには %s 構文 ( %s サポートつき ) が利用出来ます"
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:69
 
#: kallithea/templates/changeset/changeset_file_comment.html:155
 
msgid ""
 
"Use @username inside this text to send notification to this RhodeCode user"
 
msgstr "テキスト内で @username を使うと、その RhodeCode のユーザーに通知を送信します"
 
"Use @username inside this text to send notification to this Kallithea user"
 
msgstr "テキスト内で @username を使うと、その Kallithea のユーザーに通知を送信します"
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:73
 
#: kallithea/templates/changeset/changeset_file_comment.html:166
 
msgid "Preview"
 
msgstr "プレビュー"
 

	
 
@@ -4998,14 +4998,14 @@ msgstr "%s が %s のチェンジセットにコメント"
 

	
 
#: kallithea/templates/email_templates/changeset_comment.html:9
 
msgid "The changeset status was changed to"
 
msgstr "チェンジセットを次に変更"
 

	
 
#: kallithea/templates/email_templates/main.html:8
 
msgid "This is a notification from RhodeCode."
 
msgstr "RhodeCodeからの通知です"
 
msgid "This is a notification from Kallithea."
 
msgstr "Kallitheaからの通知です"
 

	
 
#: kallithea/templates/email_templates/password_reset.html:4
 
#, python-format
 
msgid "Hello %s"
 
msgstr "こんにちは %s"
 

	
kallithea/i18n/kallithea.pot
Show inline comments
 
# Translations template for RhodeCode.
 
# Translations template for Kallithea.
 
# Copyright (C) 2014 RhodeCode GmbH
 
# This file is distributed under the same license as the RhodeCode project.
 
# This file is distributed under the same license as the Kallithea project.
 
# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 
##, fuzzy
 
msgid ""
 
msgstr ""
 
"Project-Id-Version: RhodeCode 2.2.5\n"
 
"Project-Id-Version: Kallithea 2.2.5\n"
 
"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
 
"POT-Creation-Date: 2014-02-13 15:30+0100\n"
 
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 
"Language-Team: LANGUAGE <LL@li.org>\n"
 
"MIME-Version: 1.0\n"
 
@@ -128,13 +128,13 @@ msgstr ""
 
#: kallithea/controllers/files.py:311
 
msgid "You can only delete files with revision being a valid branch "
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:322
 
#, python-format
 
msgid "Deleted file %s via RhodeCode"
 
msgid "Deleted file %s via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:344
 
#, python-format
 
msgid "Successfully deleted file %s"
 
msgstr ""
 
@@ -147,26 +147,26 @@ msgstr ""
 
#: kallithea/controllers/files.py:371
 
msgid "You can only edit files with revision being a valid branch "
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:385
 
#, python-format
 
msgid "Edited file %s via RhodeCode"
 
msgid "Edited file %s via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:401
 
msgid "No changes"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485
 
#, python-format
 
msgid "Successfully committed to %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:438
 
msgid "Added file via RhodeCode"
 
msgid "Added file via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:459
 
msgid "No content"
 
msgstr ""
 

	
 
@@ -263,13 +263,13 @@ msgstr ""
 

	
 
#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230
 
msgid "bad captcha"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:191
 
msgid "You have successfully registered into RhodeCode"
 
msgid "You have successfully registered into Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:235
 
msgid "Your password reset link was sent"
 
msgstr ""
 

	
 
@@ -1078,13 +1078,13 @@ msgstr ""
 

	
 
#: kallithea/lib/helpers.py:777
 
msgid "[pushed] into"
 
msgstr ""
 

	
 
#: kallithea/lib/helpers.py:779
 
msgid "[committed via RhodeCode] into repository"
 
msgid "[committed via Kallithea] into repository"
 
msgstr ""
 

	
 
#: kallithea/lib/helpers.py:781
 
msgid "[pulled from remote] into repository"
 
msgstr ""
 

	
 
@@ -1293,13 +1293,13 @@ msgstr ""
 
#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509
 
#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510
 
#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531
 
#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
 
#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
 
#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
 
msgid "RhodeCode Administrator"
 
msgid "Kallithea Administrator"
 
msgstr ""
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399
 
@@ -1367,20 +1367,20 @@ msgid "Register disabled"
 
msgstr ""
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
 
msgid "Register new user with RhodeCode with manual activation"
 
msgid "Register new user with Kallithea with manual activation"
 
msgstr ""
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
 
msgid "Register new user with RhodeCode with auto activation"
 
msgid "Register new user with Kallithea with auto activation"
 
msgstr ""
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838
 
@@ -1676,13 +1676,13 @@ msgstr ""
 
#, python-format
 
msgid "%(user)s mentioned you at %(when)s"
 
msgstr ""
 

	
 
#: kallithea/model/notification.py:232
 
#, python-format
 
msgid "%(user)s registered in RhodeCode at %(when)s"
 
msgid "%(user)s registered in Kallithea at %(when)s"
 
msgstr ""
 

	
 
#: kallithea/model/notification.py:233
 
#, python-format
 
msgid "%(user)s opened new pull request at %(when)s"
 
msgstr ""
 
@@ -1725,13 +1725,13 @@ msgstr ""
 
#: kallithea/model/user.py:331
 
msgid "Your new password"
 
msgstr ""
 

	
 
#: kallithea/model/user.py:332
 
#, python-format
 
msgid "Your new RhodeCode password:%s"
 
msgid "Your new Kallithea password:%s"
 
msgstr ""
 

	
 
#: kallithea/model/validators.py:82 kallithea/model/validators.py:83
 
msgid "Value cannot be an empty list"
 
msgstr ""
 

	
 
@@ -2281,13 +2281,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:34
 
msgid "Enabled Plugins"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:36
 
msgid "Comma separated list of plugins. Order of plugins is also order in which RhodeCode will try to authenticate user"
 
msgid "Comma separated list of plugins. Order of plugins is also order in which Kallithea will try to authenticate user"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:37
 
msgid "Available built-in plugins"
 
msgstr ""
 

	
 
@@ -2882,13 +2882,13 @@ msgstr ""
 
#: kallithea/templates/admin/permissions/permissions_globals.html:7
 
msgid "Anonymous access"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:13
 
#, python-format
 
msgid "Allow access to RhodeCode without need to log in. Anonymous users use %s user permissions"
 
msgid "Allow access to Kallithea without need to log in. Anonymous users use %s user permissions"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:26
 
msgid "All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost"
 
msgstr ""
 

	
 
@@ -3227,13 +3227,13 @@ msgstr ""
 
#: kallithea/templates/admin/repos/repo_creating.html:30
 
#, python-format
 
msgid "Repository \"%(repo_name)s\" is beeing created, you will be redirected when this process is finished.repo_name"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_creating.html:42
 
msgid "We're sorry but error occured during this operation. Please check your RhodeCode server logs, or contact administrator."
 
msgid "We're sorry but error occured during this operation. Please check your Kallithea server logs, or contact administrator."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit.html:8
 
#, python-format
 
msgid "%s repository settings"
 
msgstr ""
 
@@ -3339,13 +3339,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit_advanced.html:90
 
msgid "Delete forks"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 
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"
 
msgid "This repository will be renamed in a special way in order to be unaccesible for Kallithea and VCS systems. If you need to fully delete it from file system please do it manually"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit_caches.html:4
 
msgid "Invalidate repository cache"
 
msgstr ""
 

	
 
@@ -3549,13 +3549,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:4
 
msgid "Email prefix"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:5
 
msgid "RhodeCode email from"
 
msgid "Kallithea email from"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:6
 
msgid "Error email from"
 
msgstr ""
 

	
 
@@ -3601,13 +3601,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:8
 
msgid "Site branding"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:12
 
msgid "Set a custom title for your RhodeCode Service."
 
msgid "Set a custom title for your Kallithea Service."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:18
 
msgid "HTTP authentication realm"
 
msgstr ""
 

	
 
@@ -3657,13 +3657,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_license.html:2
 
msgid "Currently you're using a free license, which is limited to 20 users."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:9
 
#: kallithea/templates/admin/settings/settings_system.html:4
 
msgid "RhodeCode version"
 
msgid "Kallithea version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:10
 
msgid "License token"
 
msgstr ""
 

	
 
@@ -3693,13 +3693,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:33
 
msgid "License key"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:37
 
msgid "Paste your RhodeCode license key into that textarea."
 
msgid "Paste your Kallithea license key into that textarea."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:52
 
msgid "Please enter following lines (if yet not present) into [app:main] section of your .ini file. The token below is autogenerated."
 
msgstr ""
 

	
 
@@ -3725,13 +3725,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:23
 
msgid "Install GIT hooks"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:25
 
msgid "Verify if RhodeCodes GIT hooks are installed for each repository. Current hooks will be updated to latest version"
 
msgid "Verify if Kallitheas GIT hooks are installed for each repository. Current hooks will be updated to latest version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:32
 
msgid "Rescan Repositories"
 
msgstr ""
 

	
 
@@ -3741,13 +3741,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:12
 
msgid "Build from scratch"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:15
 
msgid "This option completely reindex all the files within RhodeCode for proper fulltext search capabilities."
 
msgid "This option completely reindex all the files within Kallithea for proper fulltext search capabilities."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:21
 
msgid "Reindex"
 
msgstr ""
 

	
 
@@ -3793,13 +3793,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:11
 
msgid "Require SSL for vcs operations"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:13
 
msgid "Activate to set RhodeCode to require SSL for pushing or pulling. If SSL certificate is missing it will return a HTTP Error 406: Not Acceptable."
 
msgid "Activate to set Kallithea to require SSL for pushing or pulling. If SSL certificate is missing it will return a HTTP Error 406: Not Acceptable."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:24
 
msgid "Show repository size after push"
 
msgstr ""
 

	
 
@@ -3833,13 +3833,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:64
 
msgid "Repositories location"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:69
 
msgid "Click to unlock. You must restart RhodeCode in order to make this setting take effect."
 
msgid "Click to unlock. You must restart Kallithea in order to make this setting take effect."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:72
 
msgid "Filesystem location where repositories should be stored. After changing this value a restart and rescan of the repository folder are required."
 
msgstr ""
 

	
 
@@ -3853,40 +3853,40 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:15
 
msgid "Allows storing additional customized fields per repository."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:18
 
msgid "Show RhodeCode version"
 
msgid "Show Kallithea version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:20
 
msgid "Shows or hides a version number of RhodeCode displayed in the footer."
 
msgid "Shows or hides a version number of Kallithea displayed in the footer."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:24
 
msgid "Use Gravatars in RhodeCode"
 
msgid "Use Gravatars in Kallithea"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:30
 
msgid ""
 
"Gravatar url allows you to use other avatar server application.\n"
 
"                                                        Following variables of the URL will be replaced accordingly.\n"
 
"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme}    'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {email}     user email,\n"
 
"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
 
"                                                        {size}      size of the image that is expected from the server application,\n"
 
"                                                        {netloc}    network location/server host of running RhodeCode server"
 
"                                                        {netloc}    network location/server host of running Kallithea server"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:42
 
msgid ""
 
"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
 
"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme} 'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {user}   current user username,\n"
 
"                                                        {netloc} network location/server host of running RhodeCode server,\n"
 
"                                                        {netloc} network location/server host of running Kallithea server,\n"
 
"                                                        {repo}   full repository name,\n"
 
"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:54
 
msgid "Dashboard items"
 
@@ -4585,13 +4585,13 @@ msgstr ""
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:9
 
msgid "Refs"
 
msgstr ""
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:86
 
msgid "Add or upload files directly via RhodeCode"
 
msgid "Add or upload files directly via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:89
 
#: kallithea/templates/files/files_ypjax.html:9
 
msgid "Add New File"
 
msgstr ""
 
@@ -4730,13 +4730,13 @@ msgstr ""
 
#, python-format
 
msgid "Comments parsed using %s syntax with %s support."
 
msgstr ""
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:69
 
#: kallithea/templates/changeset/changeset_file_comment.html:155
 
msgid "Use @username inside this text to send notification to this RhodeCode user"
 
msgid "Use @username inside this text to send notification to this Kallithea user"
 
msgstr ""
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:73
 
#: kallithea/templates/changeset/changeset_file_comment.html:166
 
msgid "Preview"
 
msgstr ""
 
@@ -4895,13 +4895,13 @@ msgstr ""
 

	
 
#: kallithea/templates/email_templates/changeset_comment.html:9
 
msgid "The changeset status was changed to"
 
msgstr ""
 

	
 
#: kallithea/templates/email_templates/main.html:8
 
msgid "This is a notification from RhodeCode."
 
msgid "This is a notification from Kallithea."
 
msgstr ""
 

	
 
#: kallithea/templates/email_templates/password_reset.html:4
 
#, python-format
 
msgid "Hello %s"
 
msgstr ""
kallithea/i18n/pl/LC_MESSAGES/kallithea.po
Show inline comments
 
# Translations template for RhodeCode.
 
# Translations template for Kallithea.
 
# Copyright (C) 2014 RhodeCode GmbH, and others.
 
# This file is distributed under the same license as the RhodeCode project.
 
# This file is distributed under the same license as the Kallithea project.
 
# Translators:
 
# Nemcio <areczek01@gmail.com>, 2013
 
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010
 
# marcinkuzminski <marcin@python-blog.com>, 2013
 
# Nemcio <bogdan114@g.pl>, 2012
 
# Nemcio <areczek01@gmail.com>, 2012-2013
 
msgid ""
 
msgstr ""
 
"Project-Id-Version: RhodeCode\n"
 
"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
 
"Project-Id-Version: Kallithea\n"
 
"Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 
"POT-Creation-Date: 2014-02-13 15:30+0100\n"
 
"PO-Revision-Date: 2014-02-13 14:34+0000\n"
 
"Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 
"Language-Team: Polish (http://www.transifex.com/projects/p/RhodeCode/language/pl/)\n"
 
"Language-Team: Polish (http://www.transifex.com/projects/p/Kallithea/language/pl/)\n"
 
"MIME-Version: 1.0\n"
 
"Content-Type: text/plain; charset=UTF-8\n"
 
"Content-Transfer-Encoding: 8bit\n"
 
"Generated-By: Babel 0.9.6\n"
 
"Language: pl\n"
 
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -139,13 +139,13 @@ msgstr "Repozytorium zostało zablokowane przez %s na %s"
 
#: kallithea/controllers/files.py:311
 
msgid "You can only delete files with revision being a valid branch "
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:322
 
#, python-format
 
msgid "Deleted file %s via RhodeCode"
 
msgid "Deleted file %s via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:344
 
#, python-format
 
msgid "Successfully deleted file %s"
 
msgstr ""
 
@@ -158,27 +158,27 @@ msgstr "Wystąpił błąd w trakcie zatwierdzania"
 
#: kallithea/controllers/files.py:371
 
msgid "You can only edit files with revision being a valid branch "
 
msgstr "Można tylko edytować pliki z rewizji obecnej gałęzi"
 

	
 
#: kallithea/controllers/files.py:385
 
#, python-format
 
msgid "Edited file %s via RhodeCode"
 
msgstr "Edytowanie %s w RhodeCode"
 
msgid "Edited file %s via Kallithea"
 
msgstr "Edytowanie %s w Kallithea"
 

	
 
#: kallithea/controllers/files.py:401
 
msgid "No changes"
 
msgstr "Bez zmian"
 

	
 
#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485
 
#, python-format
 
msgid "Successfully committed to %s"
 
msgstr "Committ wykonany do %s"
 

	
 
#: kallithea/controllers/files.py:438
 
msgid "Added file via RhodeCode"
 
msgstr "Dodano %s poprzez RhodeCode"
 
msgid "Added file via Kallithea"
 
msgstr "Dodano %s poprzez Kallithea"
 

	
 
#: kallithea/controllers/files.py:459
 
msgid "No content"
 
msgstr "Brak treści"
 

	
 
#: kallithea/controllers/files.py:463
 
@@ -276,13 +276,13 @@ msgstr "dziennik"
 

	
 
#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230
 
msgid "bad captcha"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:191
 
msgid "You have successfully registered into RhodeCode"
 
msgid "You have successfully registered into Kallithea"
 
msgstr "Udało Ci się zarejestrować na stronie"
 

	
 
#: kallithea/controllers/login.py:235
 
msgid "Your password reset link was sent"
 
msgstr "Twój link zresetowania hasła został wysłany"
 

	
 
@@ -1103,14 +1103,14 @@ msgstr "[zamknięty] wniosek o połączenie gałęzi"
 

	
 
#: kallithea/lib/helpers.py:777
 
msgid "[pushed] into"
 
msgstr "[wysłane zmiany] w"
 

	
 
#: kallithea/lib/helpers.py:779
 
msgid "[committed via RhodeCode] into repository"
 
msgstr "[synchronizacja przez RhodeCode] z repozytorium"
 
msgid "[committed via Kallithea] into repository"
 
msgstr "[synchronizacja przez Kallithea] z repozytorium"
 

	
 
#: kallithea/lib/helpers.py:781
 
msgid "[pulled from remote] into repository"
 
msgstr "[pobieranie z zdalnego] do repozytorium"
 

	
 
#: kallithea/lib/helpers.py:783
 
@@ -1326,13 +1326,13 @@ msgstr "Repozytoria Grupy dostęp administratora"
 
#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509
 
#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510
 
#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531
 
#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
 
#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
 
#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
 
msgid "RhodeCode Administrator"
 
msgid "Kallithea Administrator"
 
msgstr "Administrator Repo"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399
 
@@ -1400,20 +1400,20 @@ msgid "Register disabled"
 
msgstr "Rejestracja wyłączona"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
 
msgid "Register new user with RhodeCode with manual activation"
 
msgid "Register new user with Kallithea with manual activation"
 
msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
 
msgid "Register new user with RhodeCode with auto activation"
 
msgid "Register new user with Kallithea with auto activation"
 
msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838
 
@@ -1711,13 +1711,13 @@ msgstr "%(user)s wysłał wiadomość do %(when)s"
 
#, python-format
 
msgid "%(user)s mentioned you at %(when)s"
 
msgstr "%(user)s wspomniał o Tobie w %(when)s"
 

	
 
#: kallithea/model/notification.py:232
 
#, python-format
 
msgid "%(user)s registered in RhodeCode at %(when)s"
 
msgid "%(user)s registered in Kallithea at %(when)s"
 
msgstr "%(user)s zarejestrował na stronie w %(when)s"
 

	
 
#: kallithea/model/notification.py:233
 
#, python-format
 
msgid "%(user)s opened new pull request at %(when)s"
 
msgstr "%(user)s otworzył nowe połączenie gałęzi w %(when)s"
 
@@ -1762,13 +1762,13 @@ msgstr "łącze resetowania hasła"
 
#: kallithea/model/user.py:331
 
msgid "Your new password"
 
msgstr "Nowe hasło"
 

	
 
#: kallithea/model/user.py:332
 
#, python-format
 
msgid "Your new RhodeCode password:%s"
 
msgid "Your new Kallithea password:%s"
 
msgstr "Nowe hasło do strony: %s"
 

	
 
#: kallithea/model/validators.py:82 kallithea/model/validators.py:83
 
msgid "Value cannot be an empty list"
 
msgstr "Wartość listy nie może być pusta"
 

	
 
@@ -2329,13 +2329,13 @@ msgstr "Wtyczki Autentykacji"
 
msgid "Enabled Plugins"
 
msgstr "Włączone Wtyczki"
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:36
 
msgid ""
 
"Comma separated list of plugins. Order of plugins is also order in which "
 
"RhodeCode will try to authenticate user"
 
"Kallithea will try to authenticate user"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:37
 
msgid "Available built-in plugins"
 
msgstr ""
 

	
 
@@ -2937,13 +2937,13 @@ msgstr "Podgląd"
 
msgid "Anonymous access"
 
msgstr "Dostęp anonimowy"
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:13
 
#, python-format
 
msgid ""
 
"Allow access to RhodeCode without need to log in. Anonymous users use %s "
 
"Allow access to Kallithea without need to log in. Anonymous users use %s "
 
"user permissions"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:26
 
msgid ""
 
"All default permissions on each repository will be reset to chosen "
 
@@ -3307,13 +3307,13 @@ msgid ""
 
"this process is finished.repo_name"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_creating.html:42
 
msgid ""
 
"We're sorry but error occured during this operation. Please check your "
 
"RhodeCode server logs, or contact administrator."
 
"Kallithea server logs, or contact administrator."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit.html:8
 
#, python-format
 
msgid "%s repository settings"
 
msgstr ""
 
@@ -3427,13 +3427,13 @@ msgstr "Ustaw jako rozwidlenie"
 
msgid "Delete forks"
 
msgstr "Usuń rozwidlenie"
 

	
 
#: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 
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 "
 
"for Kallithea and VCS systems. If you need to fully delete it from file "
 
"system please do it manually"
 
msgstr "To repozytorium zostanie zmienione w sposób szczególny, żeby było niedostępne dla strony i systemów VCS. Jeśli chcesz całkowicie usunąć go z systemu plików prosimy zrobić to ręcznie"
 

	
 
#: kallithea/templates/admin/repos/repo_edit_caches.html:4
 
msgid "Invalidate repository cache"
 
msgstr "Unieważnij pamięć podręczną repozytorium"
 
@@ -3640,13 +3640,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:4
 
msgid "Email prefix"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:5
 
msgid "RhodeCode email from"
 
msgid "Kallithea email from"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:6
 
msgid "Error email from"
 
msgstr ""
 

	
 
@@ -3692,13 +3692,13 @@ msgstr "Wyślij"
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:8
 
msgid "Site branding"
 
msgstr "Nazwa strony"
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:12
 
msgid "Set a custom title for your RhodeCode Service."
 
msgid "Set a custom title for your Kallithea Service."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:18
 
msgid "HTTP authentication realm"
 
msgstr "Sfera uwierzytelniania HTTP"
 

	
 
@@ -3752,13 +3752,13 @@ msgstr "Nie udało się usunąć hooka"
 
#: kallithea/templates/admin/settings/settings_license.html:2
 
msgid "Currently you're using a free license, which is limited to 20 users."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:9
 
#: kallithea/templates/admin/settings/settings_system.html:4
 
msgid "RhodeCode version"
 
msgid "Kallithea version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:10
 
msgid "License token"
 
msgstr ""
 

	
 
@@ -3788,13 +3788,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:33
 
msgid "License key"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:37
 
msgid "Paste your RhodeCode license key into that textarea."
 
msgid "Paste your Kallithea license key into that textarea."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:52
 
msgid ""
 
"Please enter following lines (if yet not present) into [app:main] section of"
 
" your .ini file. The token below is autogenerated."
 
@@ -3827,13 +3827,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_mapping.html:23
 
msgid "Install GIT hooks"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:25
 
msgid ""
 
"Verify if RhodeCodes GIT hooks are installed for each repository. Current "
 
"Verify if Kallitheas GIT hooks are installed for each repository. Current "
 
"hooks will be updated to latest version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:32
 
msgid "Rescan Repositories"
 
msgstr ""
 
@@ -3845,13 +3845,13 @@ msgstr "Opcja odbudowy indeksowania"
 
#: kallithea/templates/admin/settings/settings_search.html:12
 
msgid "Build from scratch"
 
msgstr "Buduj od podstaw"
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:15
 
msgid ""
 
"This option completely reindex all the files within RhodeCode for proper "
 
"This option completely reindex all the files within Kallithea for proper "
 
"fulltext search capabilities."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:21
 
msgid "Reindex"
 
msgstr "Indeksuj ponownie"
 
@@ -3899,13 +3899,13 @@ msgstr "www"
 
#: kallithea/templates/admin/settings/settings_vcs.html:11
 
msgid "Require SSL for vcs operations"
 
msgstr "Wymagaj ssl dla operacji vcs"
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:13
 
msgid ""
 
"Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
 
"Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
 
"certificate is missing it will return a HTTP Error 406: Not Acceptable."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:24
 
msgid "Show repository size after push"
 
msgstr "Pokaż rozmiar repozytorium po wysłaniu zmian"
 
@@ -3943,15 +3943,15 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_vcs.html:64
 
msgid "Repositories location"
 
msgstr "Położenie repozytorium"
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:69
 
msgid ""
 
"Click to unlock. You must restart RhodeCode in order to make this setting "
 
"Click to unlock. You must restart Kallithea in order to make this setting "
 
"take effect."
 
msgstr "Kliknij, aby odblokować. Musisz ponownie uruchomić RhodeCode żeby wprowadzić to ustawienie w życie."
 
msgstr "Kliknij, aby odblokować. Musisz ponownie uruchomić Kallithea żeby wprowadzić to ustawienie w życie."
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:72
 
msgid ""
 
"Filesystem location where repositories should be stored. After changing this"
 
" value a restart and rescan of the repository folder are required."
 
msgstr ""
 
@@ -3966,40 +3966,40 @@ msgstr "Używaj w repozytorium dodatkowych pól"
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:15
 
msgid "Allows storing additional customized fields per repository."
 
msgstr "Umożliwia przechowywanie dodatkowych niestandardowych pól w repozytorium."
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:18
 
msgid "Show RhodeCode version"
 
msgstr "Pokaż wersję RhodeCode"
 
msgid "Show Kallithea version"
 
msgstr "Pokaż wersję Kallithea"
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:20
 
msgid "Shows or hides a version number of RhodeCode displayed in the footer."
 
msgid "Shows or hides a version number of Kallithea displayed in the footer."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:24
 
msgid "Use Gravatars in RhodeCode"
 
msgid "Use Gravatars in Kallithea"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:30
 
msgid ""
 
"Gravatar url allows you to use other avatar server application.\n"
 
"                                                        Following variables of the URL will be replaced accordingly.\n"
 
"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme}    'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {email}     user email,\n"
 
"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
 
"                                                        {size}      size of the image that is expected from the server application,\n"
 
"                                                        {netloc}    network location/server host of running RhodeCode server"
 
"                                                        {netloc}    network location/server host of running Kallithea server"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:42
 
msgid ""
 
"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
 
"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme} 'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {user}   current user username,\n"
 
"                                                        {netloc} network location/server host of running RhodeCode server,\n"
 
"                                                        {netloc} network location/server host of running Kallithea server,\n"
 
"                                                        {repo}   full repository name,\n"
 
"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:54
 
msgid "Dashboard items"
 
@@ -4709,13 +4709,13 @@ msgstr "Ostatnia zmiana"
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:9
 
msgid "Refs"
 
msgstr "Gałąź/Etykieta"
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:86
 
msgid "Add or upload files directly via RhodeCode"
 
msgid "Add or upload files directly via Kallithea"
 
msgstr "Dodaj lub prześlij pliki bezpośrednio przez stronę"
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:89
 
#: kallithea/templates/files/files_ypjax.html:9
 
msgid "Add New File"
 
msgstr ""
 
@@ -4859,13 +4859,13 @@ msgstr "Komentując linię {1}."
 
msgid "Comments parsed using %s syntax with %s support."
 
msgstr "Komentarze analizowane za pomocą %s składni od %s wsparcia."
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:69
 
#: kallithea/templates/changeset/changeset_file_comment.html:155
 
msgid ""
 
"Use @username inside this text to send notification to this RhodeCode user"
 
"Use @username inside this text to send notification to this Kallithea user"
 
msgstr "Użyj @username wewnątrz tego tekstu, aby wysłać powiadomienie do użytkownika strony"
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:73
 
#: kallithea/templates/changeset/changeset_file_comment.html:166
 
msgid "Preview"
 
msgstr "Podgląd"
 
@@ -5025,13 +5025,13 @@ msgstr "%s komentarzy %s zestawów zmian."
 

	
 
#: kallithea/templates/email_templates/changeset_comment.html:9
 
msgid "The changeset status was changed to"
 
msgstr "Status zestawienia zmian został zmieniony na"
 

	
 
#: kallithea/templates/email_templates/main.html:8
 
msgid "This is a notification from RhodeCode."
 
msgid "This is a notification from Kallithea."
 
msgstr "To jest powiadomienie z strony"
 

	
 
#: kallithea/templates/email_templates/password_reset.html:4
 
#, python-format
 
msgid "Hello %s"
 
msgstr "Witaj %s"
kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po
Show inline comments
 
# Translations template for RhodeCode.
 
# Translations template for Kallithea.
 
# Copyright (C) 2014 RhodeCode GmbH, and others.
 
# This file is distributed under the same license as the RhodeCode project.
 
# This file is distributed under the same license as the Kallithea project.
 
# Translators:
 
# Augusto Herrmann <augusto.herrmann@gmail.com>, 2012
 
# gnustavo <gustavo@gnustavo.com>, 2013
 
msgid ""
 
msgstr ""
 
"Project-Id-Version: RhodeCode\n"
 
"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
 
"Project-Id-Version: Kallithea\n"
 
"Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 
"POT-Creation-Date: 2014-02-13 15:30+0100\n"
 
"PO-Revision-Date: 2014-02-13 14:34+0000\n"
 
"Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/RhodeCode/language/pt_BR/)\n"
 
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/Kallithea/language/pt_BR/)\n"
 
"MIME-Version: 1.0\n"
 
"Content-Type: text/plain; charset=UTF-8\n"
 
"Content-Transfer-Encoding: 8bit\n"
 
"Generated-By: Babel 0.9.6\n"
 
"Language: pt_BR\n"
 
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
@@ -136,13 +136,13 @@ msgstr "Este repositório foi travado por %s em %s"
 
#: kallithea/controllers/files.py:311
 
msgid "You can only delete files with revision being a valid branch "
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:322
 
#, python-format
 
msgid "Deleted file %s via RhodeCode"
 
msgid "Deleted file %s via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:344
 
#, python-format
 
msgid "Successfully deleted file %s"
 
msgstr ""
 
@@ -155,27 +155,27 @@ msgstr "Ocorreu um erro ao realizar comm
 
#: kallithea/controllers/files.py:371
 
msgid "You can only edit files with revision being a valid branch "
 
msgstr "Só é possível editar arquivos quando a revisão é um ramo válido"
 

	
 
#: kallithea/controllers/files.py:385
 
#, python-format
 
msgid "Edited file %s via RhodeCode"
 
msgstr "Arquivo %s editado via RhodeCode"
 
msgid "Edited file %s via Kallithea"
 
msgstr "Arquivo %s editado via Kallithea"
 

	
 
#: kallithea/controllers/files.py:401
 
msgid "No changes"
 
msgstr "Sem modificações"
 

	
 
#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485
 
#, python-format
 
msgid "Successfully committed to %s"
 
msgstr "Commit realizado com sucesso para %s"
 

	
 
#: kallithea/controllers/files.py:438
 
msgid "Added file via RhodeCode"
 
msgstr "Arquivo adicionado via RhodeCode"
 
msgid "Added file via Kallithea"
 
msgstr "Arquivo adicionado via Kallithea"
 

	
 
#: kallithea/controllers/files.py:459
 
msgid "No content"
 
msgstr "Nenhum conteúdo"
 

	
 
#: kallithea/controllers/files.py:463
 
@@ -273,14 +273,14 @@ msgstr "diário"
 

	
 
#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230
 
msgid "bad captcha"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:191
 
msgid "You have successfully registered into RhodeCode"
 
msgstr "Você foi registrado no RhodeCode com sucesso"
 
msgid "You have successfully registered into Kallithea"
 
msgstr "Você foi registrado no Kallithea com sucesso"
 

	
 
#: kallithea/controllers/login.py:235
 
msgid "Your password reset link was sent"
 
msgstr "Seu link de reinicialização de senha foi enviado"
 

	
 
#: kallithea/controllers/login.py:255
 
@@ -1100,14 +1100,14 @@ msgstr "[fechado] pull request para"
 

	
 
#: kallithea/lib/helpers.py:777
 
msgid "[pushed] into"
 
msgstr "[realizado push] para"
 

	
 
#: kallithea/lib/helpers.py:779
 
msgid "[committed via RhodeCode] into repository"
 
msgstr "[commitado via RhodeCode] no repositório"
 
msgid "[committed via Kallithea] into repository"
 
msgstr "[commitado via Kallithea] no repositório"
 

	
 
#: kallithea/lib/helpers.py:781
 
msgid "[pulled from remote] into repository"
 
msgstr "[pulled do remote] no repositório"
 

	
 
#: kallithea/lib/helpers.py:783
 
@@ -1317,14 +1317,14 @@ msgstr "Acesso administrativo ao Grupo de Repositórios"
 
#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509
 
#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510
 
#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531
 
#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
 
#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
 
#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
 
msgid "RhodeCode Administrator"
 
msgstr "Administrador do RhodeCode"
 
msgid "Kallithea Administrator"
 
msgstr "Administrador do Kallithea"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399
 
#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429
 
@@ -1391,21 +1391,21 @@ msgid "Register disabled"
 
msgstr "Registro desabilitado"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
 
msgid "Register new user with RhodeCode with manual activation"
 
msgstr "Registro de novo usuário no RhodeCode com ativação manual"
 
msgid "Register new user with Kallithea with manual activation"
 
msgstr "Registro de novo usuário no Kallithea com ativação manual"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
 
msgid "Register new user with RhodeCode with auto activation"
 
msgstr "Registro de novo usuário no RhodeCode com auto-ativação"
 
msgid "Register new user with Kallithea with auto activation"
 
msgstr "Registro de novo usuário no Kallithea com auto-ativação"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838
 
#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934
 
@@ -1702,14 +1702,14 @@ msgstr "%(user)s enviou mensagem em %(wh
 
#, python-format
 
msgid "%(user)s mentioned you at %(when)s"
 
msgstr "%(user)s mencionou-o em %(when)s"
 

	
 
#: kallithea/model/notification.py:232
 
#, python-format
 
msgid "%(user)s registered in RhodeCode at %(when)s"
 
msgstr "%(user)s registrou-se no RhodeCode em %(when)s"
 
msgid "%(user)s registered in Kallithea at %(when)s"
 
msgstr "%(user)s registrou-se no Kallithea em %(when)s"
 

	
 
#: kallithea/model/notification.py:233
 
#, python-format
 
msgid "%(user)s opened new pull request at %(when)s"
 
msgstr "%(user)s abriu um novo pull request em %(when)s"
 

	
 
@@ -1753,14 +1753,14 @@ msgstr "Link para trocar senha"
 
#: kallithea/model/user.py:331
 
msgid "Your new password"
 
msgstr "Sua nova senha"
 

	
 
#: kallithea/model/user.py:332
 
#, python-format
 
msgid "Your new RhodeCode password:%s"
 
msgstr "Sua nova senha no RhodeCode: %s"
 
msgid "Your new Kallithea password:%s"
 
msgstr "Sua nova senha no Kallithea: %s"
 

	
 
#: kallithea/model/validators.py:82 kallithea/model/validators.py:83
 
msgid "Value cannot be an empty list"
 
msgstr "O valor não pode ser uma lista vazia"
 

	
 
#: kallithea/model/validators.py:120
 
@@ -2319,13 +2319,13 @@ msgstr ""
 
msgid "Enabled Plugins"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:36
 
msgid ""
 
"Comma separated list of plugins. Order of plugins is also order in which "
 
"RhodeCode will try to authenticate user"
 
"Kallithea will try to authenticate user"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:37
 
msgid "Available built-in plugins"
 
msgstr ""
 

	
 
@@ -2927,13 +2927,13 @@ msgstr ""
 
msgid "Anonymous access"
 
msgstr "Acesso anônimo"
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:13
 
#, python-format
 
msgid ""
 
"Allow access to RhodeCode without need to log in. Anonymous users use %s "
 
"Allow access to Kallithea without need to log in. Anonymous users use %s "
 
"user permissions"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:26
 
msgid ""
 
"All default permissions on each repository will be reset to chosen "
 
@@ -3296,13 +3296,13 @@ msgid ""
 
"this process is finished.repo_name"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_creating.html:42
 
msgid ""
 
"We're sorry but error occured during this operation. Please check your "
 
"RhodeCode server logs, or contact administrator."
 
"Kallithea server logs, or contact administrator."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit.html:8
 
#, python-format
 
msgid "%s repository settings"
 
msgstr ""
 
@@ -3415,15 +3415,15 @@ msgstr "Desassociar bifurcações"
 
msgid "Delete forks"
 
msgstr "Excluir bifurcações"
 

	
 
#: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 
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 "
 
"for Kallithea and VCS systems. If you need to fully delete it from file "
 
"system please do it manually"
 
msgstr "Este repositório será renomeado de um modo especial para não ser mais acessívei pelo RhodeCode ou outros sistemas VCS. Se você precisa excluí-lo totalmente do sistema de arquivos, por favor, faça-o manualmente"
 
msgstr "Este repositório será renomeado de um modo especial para não ser mais acessívei pelo Kallithea ou outros sistemas VCS. Se você precisa excluí-lo totalmente do sistema de arquivos, por favor, faça-o manualmente"
 

	
 
#: kallithea/templates/admin/repos/repo_edit_caches.html:4
 
msgid "Invalidate repository cache"
 
msgstr "Invalidar cache do repositório"
 

	
 
#: kallithea/templates/admin/repos/repo_edit_caches.html:4
 
@@ -3628,13 +3628,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:4
 
msgid "Email prefix"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:5
 
msgid "RhodeCode email from"
 
msgid "Kallithea email from"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:6
 
msgid "Error email from"
 
msgstr ""
 

	
 
@@ -3680,13 +3680,13 @@ msgstr "Enviar"
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:8
 
msgid "Site branding"
 
msgstr "Marca do site"
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:12
 
msgid "Set a custom title for your RhodeCode Service."
 
msgid "Set a custom title for your Kallithea Service."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:18
 
msgid "HTTP authentication realm"
 
msgstr "Realm de autenticação HTTP"
 

	
 
@@ -3740,13 +3740,13 @@ msgstr "Falha ao remover gancho"
 
#: kallithea/templates/admin/settings/settings_license.html:2
 
msgid "Currently you're using a free license, which is limited to 20 users."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:9
 
#: kallithea/templates/admin/settings/settings_system.html:4
 
msgid "RhodeCode version"
 
msgid "Kallithea version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:10
 
msgid "License token"
 
msgstr ""
 

	
 
@@ -3776,13 +3776,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:33
 
msgid "License key"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:37
 
msgid "Paste your RhodeCode license key into that textarea."
 
msgid "Paste your Kallithea license key into that textarea."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:52
 
msgid ""
 
"Please enter following lines (if yet not present) into [app:main] section of"
 
" your .ini file. The token below is autogenerated."
 
@@ -3815,13 +3815,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_mapping.html:23
 
msgid "Install GIT hooks"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:25
 
msgid ""
 
"Verify if RhodeCodes GIT hooks are installed for each repository. Current "
 
"Verify if Kallitheas GIT hooks are installed for each repository. Current "
 
"hooks will be updated to latest version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:32
 
msgid "Rescan Repositories"
 
msgstr ""
 
@@ -3833,13 +3833,13 @@ msgstr "Opção de construção do índice"
 
#: kallithea/templates/admin/settings/settings_search.html:12
 
msgid "Build from scratch"
 
msgstr "Construir do zero"
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:15
 
msgid ""
 
"This option completely reindex all the files within RhodeCode for proper "
 
"This option completely reindex all the files within Kallithea for proper "
 
"fulltext search capabilities."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:21
 
msgid "Reindex"
 
msgstr "Reindexar"
 
@@ -3887,13 +3887,13 @@ msgstr "Web"
 
#: kallithea/templates/admin/settings/settings_vcs.html:11
 
msgid "Require SSL for vcs operations"
 
msgstr "Requer SSL para operações de VCS"
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:13
 
msgid ""
 
"Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
 
"Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
 
"certificate is missing it will return a HTTP Error 406: Not Acceptable."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:24
 
msgid "Show repository size after push"
 
msgstr "Mostrar tamanho do repositório após o push"
 
@@ -3931,15 +3931,15 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_vcs.html:64
 
msgid "Repositories location"
 
msgstr "Localização dos repositórios"
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:69
 
msgid ""
 
"Click to unlock. You must restart RhodeCode in order to make this setting "
 
"Click to unlock. You must restart Kallithea in order to make this setting "
 
"take effect."
 
msgstr "Clique para destravar. Você deve reiniciar o RhodeCode para que esta configuração tenha efeito."
 
msgstr "Clique para destravar. Você deve reiniciar o Kallithea para que esta configuração tenha efeito."
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:72
 
msgid ""
 
"Filesystem location where repositories should be stored. After changing this"
 
" value a restart and rescan of the repository folder are required."
 
msgstr ""
 
@@ -3954,40 +3954,40 @@ msgstr "Usar campos extras do repositório"
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:15
 
msgid "Allows storing additional customized fields per repository."
 
msgstr "Permite armazenar campos customizados adicionais por repositório."
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:18
 
msgid "Show RhodeCode version"
 
msgstr "Mostrar versão do RhodeCode"
 
msgid "Show Kallithea version"
 
msgstr "Mostrar versão do Kallithea"
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:20
 
msgid "Shows or hides a version number of RhodeCode displayed in the footer."
 
msgid "Shows or hides a version number of Kallithea displayed in the footer."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:24
 
msgid "Use Gravatars in RhodeCode"
 
msgid "Use Gravatars in Kallithea"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:30
 
msgid ""
 
"Gravatar url allows you to use other avatar server application.\n"
 
"                                                        Following variables of the URL will be replaced accordingly.\n"
 
"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme}    'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {email}     user email,\n"
 
"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
 
"                                                        {size}      size of the image that is expected from the server application,\n"
 
"                                                        {netloc}    network location/server host of running RhodeCode server"
 
"                                                        {netloc}    network location/server host of running Kallithea server"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:42
 
msgid ""
 
"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
 
"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme} 'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {user}   current user username,\n"
 
"                                                        {netloc} network location/server host of running RhodeCode server,\n"
 
"                                                        {netloc} network location/server host of running Kallithea server,\n"
 
"                                                        {repo}   full repository name,\n"
 
"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:54
 
msgid "Dashboard items"
 
@@ -4696,14 +4696,14 @@ msgstr "Idade"
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:9
 
msgid "Refs"
 
msgstr "Refs"
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:86
 
msgid "Add or upload files directly via RhodeCode"
 
msgstr "Adicionar ou enviar arquivos diretamente pelo RhodeCode"
 
msgid "Add or upload files directly via Kallithea"
 
msgstr "Adicionar ou enviar arquivos diretamente pelo Kallithea"
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:89
 
#: kallithea/templates/files/files_ypjax.html:9
 
msgid "Add New File"
 
msgstr ""
 

	
 
@@ -4842,14 +4842,14 @@ msgstr "Comentando a linha {1}."
 
msgid "Comments parsed using %s syntax with %s support."
 
msgstr "Comentários interpretados usando a sintaxe %s com suporte a %s."
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:69
 
#: kallithea/templates/changeset/changeset_file_comment.html:155
 
msgid ""
 
"Use @username inside this text to send notification to this RhodeCode user"
 
msgstr "Use @nomedeusuário dentro desse texto para enviar notificação a este usuário do RhodeCode"
 
"Use @username inside this text to send notification to this Kallithea user"
 
msgstr "Use @nomedeusuário dentro desse texto para enviar notificação a este usuário do Kallithea"
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:73
 
#: kallithea/templates/changeset/changeset_file_comment.html:166
 
msgid "Preview"
 
msgstr "Visualizar"
 

	
 
@@ -5007,14 +5007,14 @@ msgstr "%s comentou num changeset de %s.
 

	
 
#: kallithea/templates/email_templates/changeset_comment.html:9
 
msgid "The changeset status was changed to"
 
msgstr "O estado do changeset foi alterado para"
 

	
 
#: kallithea/templates/email_templates/main.html:8
 
msgid "This is a notification from RhodeCode."
 
msgstr "Esta é uma notificação do RhodeCode."
 
msgid "This is a notification from Kallithea."
 
msgstr "Esta é uma notificação do Kallithea."
 

	
 
#: kallithea/templates/email_templates/password_reset.html:4
 
#, python-format
 
msgid "Hello %s"
 
msgstr "Olá %s"
 

	
kallithea/i18n/ru/LC_MESSAGES/kallithea.po
Show inline comments
 
# Translations template for RhodeCode.
 
# Translations template for Kallithea.
 
# Copyright (C) 2014 RhodeCode GmbH, and others.
 
# This file is distributed under the same license as the RhodeCode project.
 
# This file is distributed under the same license as the Kallithea project.
 
# Translators:
 
# ArcheR <aleclitvinov1980@gmail.com>, 2013
 
# mokeev1995 <mokeev_andre@mail.ru>, 2013
 
# Andrey Mivrenik <myvrenik@gmail.com>, 2013
 
# ArcheR <aleclitvinov1980@gmail.com>, 2013
 
# invision70 <invision70@gmail.com>, 2014
 
@@ -19,18 +19,18 @@
 
# softforwinxp <softforwinxp@gmail.com>, 2013
 
# softforwinxp <softforwinxp@gmail.com>, 2013
 
# zhmylove <zhmylove@narod.ru>, 2013
 
# Mikhail Zholobov <legal90@gmail.com>, 2013
 
msgid ""
 
msgstr ""
 
"Project-Id-Version: RhodeCode\n"
 
"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
 
"Project-Id-Version: Kallithea\n"
 
"Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 
"POT-Creation-Date: 2014-02-13 15:30+0100\n"
 
"PO-Revision-Date: 2014-02-13 14:34+0000\n"
 
"Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 
"Language-Team: Russian (http://www.transifex.com/projects/p/RhodeCode/language/ru/)\n"
 
"Language-Team: Russian (http://www.transifex.com/projects/p/Kallithea/language/ru/)\n"
 
"MIME-Version: 1.0\n"
 
"Content-Type: text/plain; charset=UTF-8\n"
 
"Content-Transfer-Encoding: 8bit\n"
 
"Generated-By: Babel 0.9.6\n"
 
"Language: ru\n"
 
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -152,13 +152,13 @@ msgstr "Репозиторий заблокировал %s в %s"
 
#: kallithea/controllers/files.py:311
 
msgid "You can only delete files with revision being a valid branch "
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:322
 
#, python-format
 
msgid "Deleted file %s via RhodeCode"
 
msgid "Deleted file %s via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:344
 
#, python-format
 
msgid "Successfully deleted file %s"
 
msgstr ""
 
@@ -171,27 +171,27 @@ msgstr "Во время фиксации изменений произошла ошибка"
 
#: kallithea/controllers/files.py:371
 
msgid "You can only edit files with revision being a valid branch "
 
msgstr "Вы можете редактировать файлы только в редакции, связанной с существующей веткой"
 

	
 
#: kallithea/controllers/files.py:385
 
#, python-format
 
msgid "Edited file %s via RhodeCode"
 
msgstr "Файл %s отредактирован с помощью RhodeCode"
 
msgid "Edited file %s via Kallithea"
 
msgstr "Файл %s отредактирован с помощью Kallithea"
 

	
 
#: kallithea/controllers/files.py:401
 
msgid "No changes"
 
msgstr "Без изменений"
 

	
 
#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485
 
#, python-format
 
msgid "Successfully committed to %s"
 
msgstr "Изменения применены в %s"
 

	
 
#: kallithea/controllers/files.py:438
 
msgid "Added file via RhodeCode"
 
msgstr "Файл добавлен с помощью RhodeCode"
 
msgid "Added file via Kallithea"
 
msgstr "Файл добавлен с помощью Kallithea"
 

	
 
#: kallithea/controllers/files.py:459
 
msgid "No content"
 
msgstr "Пусто"
 

	
 
#: kallithea/controllers/files.py:463
 
@@ -289,14 +289,14 @@ msgstr "журнал"
 

	
 
#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230
 
msgid "bad captcha"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:191
 
msgid "You have successfully registered into RhodeCode"
 
msgstr "Регистрация в RhodeCode прошла успешно"
 
msgid "You have successfully registered into Kallithea"
 
msgstr "Регистрация в Kallithea прошла успешно"
 

	
 
#: kallithea/controllers/login.py:235
 
msgid "Your password reset link was sent"
 
msgstr "Ссылка для сброса пароля отправлена"
 

	
 
#: kallithea/controllers/login.py:255
 
@@ -1116,14 +1116,14 @@ msgstr "[закрыт] Pull-request для"
 

	
 
#: kallithea/lib/helpers.py:777
 
msgid "[pushed] into"
 
msgstr "[отправлено] в"
 

	
 
#: kallithea/lib/helpers.py:779
 
msgid "[committed via RhodeCode] into repository"
 
msgstr "[внесены изменения с помощью RhodeCode] в репозитории"
 
msgid "[committed via Kallithea] into repository"
 
msgstr "[внесены изменения с помощью Kallithea] в репозитории"
 

	
 
#: kallithea/lib/helpers.py:781
 
msgid "[pulled from remote] into repository"
 
msgstr "[внесены изменения из удалённого репозитория] в репозиторий"
 

	
 
#: kallithea/lib/helpers.py:783
 
@@ -1339,14 +1339,14 @@ msgstr "Группа Репозиториев - администрирование"
 
#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509
 
#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510
 
#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531
 
#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
 
#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
 
#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
 
msgid "RhodeCode Administrator"
 
msgstr "Администратор RhodeCode "
 
msgid "Kallithea Administrator"
 
msgstr "Администратор Kallithea "
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399
 
#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429
 
@@ -1413,21 +1413,21 @@ msgid "Register disabled"
 
msgstr "Регистрация отключена"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
 
msgid "Register new user with RhodeCode with manual activation"
 
msgstr "Регистрация нового пользователя в RhodeCode с ручной активацией"
 
msgid "Register new user with Kallithea with manual activation"
 
msgstr "Регистрация нового пользователя в Kallithea с ручной активацией"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
 
msgid "Register new user with RhodeCode with auto activation"
 
msgstr "Регистрация нового пользователя в RhodeCode с автоматической активацией"
 
msgid "Register new user with Kallithea with auto activation"
 
msgstr "Регистрация нового пользователя в Kallithea с автоматической активацией"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838
 
#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934
 
@@ -1724,14 +1724,14 @@ msgstr "%(user)s отправил сообщение %(when)s"
 
#, python-format
 
msgid "%(user)s mentioned you at %(when)s"
 
msgstr "%(user)s упомянул вас %(when)s"
 

	
 
#: kallithea/model/notification.py:232
 
#, python-format
 
msgid "%(user)s registered in RhodeCode at %(when)s"
 
msgstr "%(user)s зарегистрировался в RhodeCode %(when)s"
 
msgid "%(user)s registered in Kallithea at %(when)s"
 
msgstr "%(user)s зарегистрировался в Kallithea %(when)s"
 

	
 
#: kallithea/model/notification.py:233
 
#, python-format
 
msgid "%(user)s opened new pull request at %(when)s"
 
msgstr "%(user)s открыл новый pull request %(when)s"
 

	
 
@@ -1775,14 +1775,14 @@ msgstr "Ссылка сброса пароля"
 
#: kallithea/model/user.py:331
 
msgid "Your new password"
 
msgstr "Ваш новый пароль"
 

	
 
#: kallithea/model/user.py:332
 
#, python-format
 
msgid "Your new RhodeCode password:%s"
 
msgstr "Ваш новый пароль от RhodeCode: %s"
 
msgid "Your new Kallithea password:%s"
 
msgstr "Ваш новый пароль от Kallithea: %s"
 

	
 
#: kallithea/model/validators.py:82 kallithea/model/validators.py:83
 
msgid "Value cannot be an empty list"
 
msgstr "Значение не может быть пустым списком"
 

	
 
#: kallithea/model/validators.py:120
 
@@ -2342,14 +2342,14 @@ msgstr "Плагины аутентификации"
 
msgid "Enabled Plugins"
 
msgstr "Включенные плагины"
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:36
 
msgid ""
 
"Comma separated list of plugins. Order of plugins is also order in which "
 
"RhodeCode will try to authenticate user"
 
msgstr "Список плагинов, разделенных запятой. RhodeCode будет пробовать аутентифицировать пользователя в порядке указания плагинов."
 
"Kallithea will try to authenticate user"
 
msgstr "Список плагинов, разделенных запятой. Kallithea будет пробовать аутентифицировать пользователя в порядке указания плагинов."
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:37
 
msgid "Available built-in plugins"
 
msgstr "Доступные встроенные плагины"
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:43
 
@@ -2950,13 +2950,13 @@ msgstr "Обзор"
 
msgid "Anonymous access"
 
msgstr "Анонимный доступ"
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:13
 
#, python-format
 
msgid ""
 
"Allow access to RhodeCode without need to log in. Anonymous users use %s "
 
"Allow access to Kallithea without need to log in. Anonymous users use %s "
 
"user permissions"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:26
 
msgid ""
 
"All default permissions on each repository will be reset to chosen "
 
@@ -3320,13 +3320,13 @@ msgid ""
 
"this process is finished.repo_name"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_creating.html:42
 
msgid ""
 
"We're sorry but error occured during this operation. Please check your "
 
"RhodeCode server logs, or contact administrator."
 
"Kallithea server logs, or contact administrator."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit.html:8
 
#, python-format
 
msgid "%s repository settings"
 
msgstr ""
 
@@ -3440,15 +3440,15 @@ msgstr "Отсоединить fork'и"
 
msgid "Delete forks"
 
msgstr "Удалить fork'и"
 

	
 
#: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 
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 "
 
"for Kallithea and VCS systems. If you need to fully delete it from file "
 
"system please do it manually"
 
msgstr "Этот репозитарий будет переименован таким образом, чтобы сделать его недоступным для RhodeCode и систем управления версиями. Если вам необходимо полностью удалить его из файловой системы, пожалуйста, сделайте это вручную"
 
msgstr "Этот репозитарий будет переименован таким образом, чтобы сделать его недоступным для Kallithea и систем управления версиями. Если вам необходимо полностью удалить его из файловой системы, пожалуйста, сделайте это вручную"
 

	
 
#: kallithea/templates/admin/repos/repo_edit_caches.html:4
 
msgid "Invalidate repository cache"
 
msgstr "Сбросить кэш репозитория"
 

	
 
#: kallithea/templates/admin/repos/repo_edit_caches.html:4
 
@@ -3653,13 +3653,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:4
 
msgid "Email prefix"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:5
 
msgid "RhodeCode email from"
 
msgid "Kallithea email from"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:6
 
msgid "Error email from"
 
msgstr ""
 

	
 
@@ -3705,13 +3705,13 @@ msgstr "Отправить"
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:8
 
msgid "Site branding"
 
msgstr "Брендинг сайта"
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:12
 
msgid "Set a custom title for your RhodeCode Service."
 
msgid "Set a custom title for your Kallithea Service."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:18
 
msgid "HTTP authentication realm"
 
msgstr "Приветствие для HTTP-аутентификации"
 

	
 
@@ -3765,13 +3765,13 @@ msgstr "Не удалось удалить хук"
 
#: kallithea/templates/admin/settings/settings_license.html:2
 
msgid "Currently you're using a free license, which is limited to 20 users."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:9
 
#: kallithea/templates/admin/settings/settings_system.html:4
 
msgid "RhodeCode version"
 
msgid "Kallithea version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:10
 
msgid "License token"
 
msgstr ""
 

	
 
@@ -3801,13 +3801,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:33
 
msgid "License key"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:37
 
msgid "Paste your RhodeCode license key into that textarea."
 
msgid "Paste your Kallithea license key into that textarea."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:52
 
msgid ""
 
"Please enter following lines (if yet not present) into [app:main] section of"
 
" your .ini file. The token below is autogenerated."
 
@@ -3840,13 +3840,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_mapping.html:23
 
msgid "Install GIT hooks"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:25
 
msgid ""
 
"Verify if RhodeCodes GIT hooks are installed for each repository. Current "
 
"Verify if Kallitheas GIT hooks are installed for each repository. Current "
 
"hooks will be updated to latest version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:32
 
msgid "Rescan Repositories"
 
msgstr ""
 
@@ -3858,13 +3858,13 @@ msgstr "Опции создания индекса"
 
#: kallithea/templates/admin/settings/settings_search.html:12
 
msgid "Build from scratch"
 
msgstr "Сборка с нуля"
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:15
 
msgid ""
 
"This option completely reindex all the files within RhodeCode for proper "
 
"This option completely reindex all the files within Kallithea for proper "
 
"fulltext search capabilities."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:21
 
msgid "Reindex"
 
msgstr "Перестроить индекс"
 
@@ -3912,13 +3912,13 @@ msgstr "Веб"
 
#: kallithea/templates/admin/settings/settings_vcs.html:11
 
msgid "Require SSL for vcs operations"
 
msgstr "Запрашивать SSL для операций с VCS"
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:13
 
msgid ""
 
"Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
 
"Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
 
"certificate is missing it will return a HTTP Error 406: Not Acceptable."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:24
 
msgid "Show repository size after push"
 
msgstr "Показывать размер репозитория после отправки"
 
@@ -3956,15 +3956,15 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_vcs.html:64
 
msgid "Repositories location"
 
msgstr "Расположение репозитариев"
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:69
 
msgid ""
 
"Click to unlock. You must restart RhodeCode in order to make this setting "
 
"Click to unlock. You must restart Kallithea in order to make this setting "
 
"take effect."
 
msgstr "Нажмите для разблокирования. Изменения вступят в силу после перезагрузки RhodeCode."
 
msgstr "Нажмите для разблокирования. Изменения вступят в силу после перезагрузки Kallithea."
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:72
 
msgid ""
 
"Filesystem location where repositories should be stored. After changing this"
 
" value a restart and rescan of the repository folder are required."
 
msgstr ""
 
@@ -3979,40 +3979,40 @@ msgstr "Использовать дополнительные поля в репозиториях"
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:15
 
msgid "Allows storing additional customized fields per repository."
 
msgstr "Позволяет хранить дополнительные поля в репозиториях"
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:18
 
msgid "Show RhodeCode version"
 
msgstr "Отображать версию RhodeCode"
 
msgid "Show Kallithea version"
 
msgstr "Отображать версию Kallithea"
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:20
 
msgid "Shows or hides a version number of RhodeCode displayed in the footer."
 
msgid "Shows or hides a version number of Kallithea displayed in the footer."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:24
 
msgid "Use Gravatars in RhodeCode"
 
msgid "Use Gravatars in Kallithea"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:30
 
msgid ""
 
"Gravatar url allows you to use other avatar server application.\n"
 
"                                                        Following variables of the URL will be replaced accordingly.\n"
 
"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme}    'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {email}     user email,\n"
 
"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
 
"                                                        {size}      size of the image that is expected from the server application,\n"
 
"                                                        {netloc}    network location/server host of running RhodeCode server"
 
"                                                        {netloc}    network location/server host of running Kallithea server"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:42
 
msgid ""
 
"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
 
"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme} 'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {user}   current user username,\n"
 
"                                                        {netloc} network location/server host of running RhodeCode server,\n"
 
"                                                        {netloc} network location/server host of running Kallithea server,\n"
 
"                                                        {repo}   full repository name,\n"
 
"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:54
 
msgid "Dashboard items"
 
@@ -4722,14 +4722,14 @@ msgstr "Возраст"
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:9
 
msgid "Refs"
 
msgstr "Ссылки"
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:86
 
msgid "Add or upload files directly via RhodeCode"
 
msgstr "Добавить или загрузить файлы через RhodeCode"
 
msgid "Add or upload files directly via Kallithea"
 
msgstr "Добавить или загрузить файлы через Kallithea"
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:89
 
#: kallithea/templates/files/files_ypjax.html:9
 
msgid "Add New File"
 
msgstr ""
 

	
 
@@ -4872,14 +4872,14 @@ msgstr "Комментарий к строке {1}."
 
msgid "Comments parsed using %s syntax with %s support."
 
msgstr "Парсинг комментариев выполнен с использованием синтаксиса %s с поддержкой %s."
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:69
 
#: kallithea/templates/changeset/changeset_file_comment.html:155
 
msgid ""
 
"Use @username inside this text to send notification to this RhodeCode user"
 
msgstr "Используйте @имя_пользователя в тексте, чтобы отправить оповещение указанному пользователю RhodeCode"
 
"Use @username inside this text to send notification to this Kallithea user"
 
msgstr "Используйте @имя_пользователя в тексте, чтобы отправить оповещение указанному пользователю Kallithea"
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:73
 
#: kallithea/templates/changeset/changeset_file_comment.html:166
 
msgid "Preview"
 
msgstr "Предпросмотр"
 

	
 
@@ -5038,14 +5038,14 @@ msgstr "прокомментирован %s в наборе изменений %s."
 

	
 
#: kallithea/templates/email_templates/changeset_comment.html:9
 
msgid "The changeset status was changed to"
 
msgstr "Состояние набора изменений изменено на"
 

	
 
#: kallithea/templates/email_templates/main.html:8
 
msgid "This is a notification from RhodeCode."
 
msgstr "Это уведомление от RhodeCode"
 
msgid "This is a notification from Kallithea."
 
msgstr "Это уведомление от Kallithea"
 

	
 
#: kallithea/templates/email_templates/password_reset.html:4
 
#, python-format
 
msgid "Hello %s"
 
msgstr "Здравствуйте, %s"
 

	
kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po
Show inline comments
 
# Translations template for RhodeCode.
 
# Translations template for Kallithea.
 
# Copyright (C) 2014 RhodeCode GmbH, and others.
 
# This file is distributed under the same license as the RhodeCode project.
 
# This file is distributed under the same license as the Kallithea project.
 
# Translators:
 
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 
# mikespook <mikespook@gmail.com>, 2012
 
# xpol <xpolife@gmail.com>, 2012
 
msgid ""
 
msgstr ""
 
"Project-Id-Version: RhodeCode\n"
 
"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
 
"Project-Id-Version: Kallithea\n"
 
"Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 
"POT-Creation-Date: 2014-02-13 15:30+0100\n"
 
"PO-Revision-Date: 2014-02-13 14:34+0000\n"
 
"Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/RhodeCode/language/zh_CN/)\n"
 
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/Kallithea/language/zh_CN/)\n"
 
"MIME-Version: 1.0\n"
 
"Content-Type: text/plain; charset=UTF-8\n"
 
"Content-Transfer-Encoding: 8bit\n"
 
"Generated-By: Babel 0.9.6\n"
 
"Language: zh_CN\n"
 
"Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -137,13 +137,13 @@ msgstr "版本库由%s于%s锁定"
 
#: kallithea/controllers/files.py:311
 
msgid "You can only delete files with revision being a valid branch "
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:322
 
#, python-format
 
msgid "Deleted file %s via RhodeCode"
 
msgid "Deleted file %s via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:344
 
#, python-format
 
msgid "Successfully deleted file %s"
 
msgstr ""
 
@@ -156,26 +156,26 @@ msgstr "提交时发生错误"
 
#: kallithea/controllers/files.py:371
 
msgid "You can only edit files with revision being a valid branch "
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:385
 
#, python-format
 
msgid "Edited file %s via RhodeCode"
 
msgid "Edited file %s via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:401
 
msgid "No changes"
 
msgstr "无变更"
 

	
 
#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485
 
#, python-format
 
msgid "Successfully committed to %s"
 
msgstr "成功提交到%s"
 

	
 
#: kallithea/controllers/files.py:438
 
msgid "Added file via RhodeCode"
 
msgid "Added file via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:459
 
msgid "No content"
 
msgstr "无内容"
 

	
 
@@ -274,13 +274,13 @@ msgstr "日志"
 

	
 
#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230
 
msgid "bad captcha"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:191
 
msgid "You have successfully registered into RhodeCode"
 
msgid "You have successfully registered into Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:235
 
msgid "Your password reset link was sent"
 
msgstr "密码重置链接已经发送"
 

	
 
@@ -1101,14 +1101,14 @@ msgstr "[关闭] 拉取请求"
 

	
 
#: kallithea/lib/helpers.py:777
 
msgid "[pushed] into"
 
msgstr "[推送]到"
 

	
 
#: kallithea/lib/helpers.py:779
 
msgid "[committed via RhodeCode] into repository"
 
msgstr "[通过RhodeCode提交]到版本库"
 
msgid "[committed via Kallithea] into repository"
 
msgstr "[通过Kallithea提交]到版本库"
 

	
 
#: kallithea/lib/helpers.py:781
 
msgid "[pulled from remote] into repository"
 
msgstr "[远程拉取]到版本库"
 

	
 
#: kallithea/lib/helpers.py:783
 
@@ -1154,13 +1154,13 @@ msgstr ""
 

	
 
#: kallithea/lib/helpers.py:1418
 
#, python-format
 
msgid ""
 
"%s repository is not mapped to db perhaps it was created or renamed from the"
 
" filesystem please run the application again in order to rescan repositories"
 
msgstr "版本库%s没有映射到数据库,可能是从文件系统创建或者重命名,请重启RhodeCode以重新扫描版本库"
 
msgstr "版本库%s没有映射到数据库,可能是从文件系统创建或者重命名,请重启Kallithea以重新扫描版本库"
 

	
 
#: kallithea/lib/utils2.py:413
 
#, python-format
 
msgid "%d year"
 
msgid_plural "%d years"
 
msgstr[0] "%d年"
 
@@ -1312,14 +1312,14 @@ msgstr "版本库组管理权限"
 
#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509
 
#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510
 
#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531
 
#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
 
#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
 
#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
 
msgid "RhodeCode Administrator"
 
msgstr "RhodeCode 管理员"
 
msgid "Kallithea Administrator"
 
msgstr "Kallithea 管理员"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399
 
#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429
 
@@ -1386,20 +1386,20 @@ msgid "Register disabled"
 
msgstr "禁用注册"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
 
msgid "Register new user with RhodeCode with manual activation"
 
msgid "Register new user with Kallithea with manual activation"
 
msgstr "用手动激活注册新用户"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
 
msgid "Register new user with RhodeCode with auto activation"
 
msgid "Register new user with Kallithea with auto activation"
 
msgstr "用自动激活注册新用户"
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838
 
@@ -1697,13 +1697,13 @@ msgstr ""
 
#, python-format
 
msgid "%(user)s mentioned you at %(when)s"
 
msgstr ""
 

	
 
#: kallithea/model/notification.py:232
 
#, python-format
 
msgid "%(user)s registered in RhodeCode at %(when)s"
 
msgid "%(user)s registered in Kallithea at %(when)s"
 
msgstr ""
 

	
 
#: kallithea/model/notification.py:233
 
#, python-format
 
msgid "%(user)s opened new pull request at %(when)s"
 
msgstr ""
 
@@ -1748,13 +1748,13 @@ msgstr ""
 
#: kallithea/model/user.py:331
 
msgid "Your new password"
 
msgstr ""
 

	
 
#: kallithea/model/user.py:332
 
#, python-format
 
msgid "Your new RhodeCode password:%s"
 
msgid "Your new Kallithea password:%s"
 
msgstr ""
 

	
 
#: kallithea/model/validators.py:82 kallithea/model/validators.py:83
 
msgid "Value cannot be an empty list"
 
msgstr "值不能为空"
 

	
 
@@ -2313,13 +2313,13 @@ msgstr ""
 
msgid "Enabled Plugins"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:36
 
msgid ""
 
"Comma separated list of plugins. Order of plugins is also order in which "
 
"RhodeCode will try to authenticate user"
 
"Kallithea will try to authenticate user"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:37
 
msgid "Available built-in plugins"
 
msgstr ""
 

	
 
@@ -2921,13 +2921,13 @@ msgstr ""
 
msgid "Anonymous access"
 
msgstr "匿名访问"
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:13
 
#, python-format
 
msgid ""
 
"Allow access to RhodeCode without need to log in. Anonymous users use %s "
 
"Allow access to Kallithea without need to log in. Anonymous users use %s "
 
"user permissions"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:26
 
msgid ""
 
"All default permissions on each repository will be reset to chosen "
 
@@ -3289,13 +3289,13 @@ msgid ""
 
"this process is finished.repo_name"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_creating.html:42
 
msgid ""
 
"We're sorry but error occured during this operation. Please check your "
 
"RhodeCode server logs, or contact administrator."
 
"Kallithea server logs, or contact administrator."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit.html:8
 
#, python-format
 
msgid "%s repository settings"
 
msgstr ""
 
@@ -3407,13 +3407,13 @@ msgstr ""
 
msgid "Delete forks"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 
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 "
 
"for Kallithea and VCS systems. If you need to fully delete it from file "
 
"system please do it manually"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit_caches.html:4
 
msgid "Invalidate repository cache"
 
msgstr "清除版本库缓存"
 
@@ -3620,13 +3620,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:4
 
msgid "Email prefix"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:5
 
msgid "RhodeCode email from"
 
msgid "Kallithea email from"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:6
 
msgid "Error email from"
 
msgstr ""
 

	
 
@@ -3672,13 +3672,13 @@ msgstr "发送"
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:8
 
msgid "Site branding"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:12
 
msgid "Set a custom title for your RhodeCode Service."
 
msgid "Set a custom title for your Kallithea Service."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:18
 
msgid "HTTP authentication realm"
 
msgstr ""
 

	
 
@@ -3732,13 +3732,13 @@ msgstr "移除钩子失败"
 
#: kallithea/templates/admin/settings/settings_license.html:2
 
msgid "Currently you're using a free license, which is limited to 20 users."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:9
 
#: kallithea/templates/admin/settings/settings_system.html:4
 
msgid "RhodeCode version"
 
msgid "Kallithea version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:10
 
msgid "License token"
 
msgstr ""
 

	
 
@@ -3768,13 +3768,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:33
 
msgid "License key"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:37
 
msgid "Paste your RhodeCode license key into that textarea."
 
msgid "Paste your Kallithea license key into that textarea."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:52
 
msgid ""
 
"Please enter following lines (if yet not present) into [app:main] section of"
 
" your .ini file. The token below is autogenerated."
 
@@ -3807,13 +3807,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_mapping.html:23
 
msgid "Install GIT hooks"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:25
 
msgid ""
 
"Verify if RhodeCodes GIT hooks are installed for each repository. Current "
 
"Verify if Kallitheas GIT hooks are installed for each repository. Current "
 
"hooks will be updated to latest version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:32
 
msgid "Rescan Repositories"
 
msgstr ""
 
@@ -3825,13 +3825,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_search.html:12
 
msgid "Build from scratch"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:15
 
msgid ""
 
"This option completely reindex all the files within RhodeCode for proper "
 
"This option completely reindex all the files within Kallithea for proper "
 
"fulltext search capabilities."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:21
 
msgid "Reindex"
 
msgstr "重新索引"
 
@@ -3879,13 +3879,13 @@ msgstr "网络"
 
#: kallithea/templates/admin/settings/settings_vcs.html:11
 
msgid "Require SSL for vcs operations"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:13
 
msgid ""
 
"Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
 
"Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
 
"certificate is missing it will return a HTTP Error 406: Not Acceptable."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:24
 
msgid "Show repository size after push"
 
msgstr "推送后显示版本库大小"
 
@@ -3923,13 +3923,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_vcs.html:64
 
msgid "Repositories location"
 
msgstr "版本库路径"
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:69
 
msgid ""
 
"Click to unlock. You must restart RhodeCode in order to make this setting "
 
"Click to unlock. You must restart Kallithea in order to make this setting "
 
"take effect."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:72
 
msgid ""
 
"Filesystem location where repositories should be stored. After changing this"
 
@@ -3946,40 +3946,40 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:15
 
msgid "Allows storing additional customized fields per repository."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:18
 
msgid "Show RhodeCode version"
 
msgid "Show Kallithea version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:20
 
msgid "Shows or hides a version number of RhodeCode displayed in the footer."
 
msgid "Shows or hides a version number of Kallithea displayed in the footer."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:24
 
msgid "Use Gravatars in RhodeCode"
 
msgid "Use Gravatars in Kallithea"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:30
 
msgid ""
 
"Gravatar url allows you to use other avatar server application.\n"
 
"                                                        Following variables of the URL will be replaced accordingly.\n"
 
"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme}    'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {email}     user email,\n"
 
"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
 
"                                                        {size}      size of the image that is expected from the server application,\n"
 
"                                                        {netloc}    network location/server host of running RhodeCode server"
 
"                                                        {netloc}    network location/server host of running Kallithea server"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:42
 
msgid ""
 
"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
 
"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme} 'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {user}   current user username,\n"
 
"                                                        {netloc} network location/server host of running RhodeCode server,\n"
 
"                                                        {netloc} network location/server host of running Kallithea server,\n"
 
"                                                        {repo}   full repository name,\n"
 
"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:54
 
msgid "Dashboard items"
 
@@ -4687,14 +4687,14 @@ msgstr ""
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:9
 
msgid "Refs"
 
msgstr ""
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:86
 
msgid "Add or upload files directly via RhodeCode"
 
msgstr "通过RhodeCode直接添加或者上传文件"
 
msgid "Add or upload files directly via Kallithea"
 
msgstr "通过Kallithea直接添加或者上传文件"
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:89
 
#: kallithea/templates/files/files_ypjax.html:9
 
msgid "Add New File"
 
msgstr ""
 

	
 
@@ -4829,14 +4829,14 @@ msgstr "在{1}行上评论"
 
msgid "Comments parsed using %s syntax with %s support."
 
msgstr "评论使用%s语法并支持%s"
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:69
 
#: kallithea/templates/changeset/changeset_file_comment.html:155
 
msgid ""
 
"Use @username inside this text to send notification to this RhodeCode user"
 
msgstr "在文本中使用 @用户名 以发送通知到该RhodeCode用户"
 
"Use @username inside this text to send notification to this Kallithea user"
 
msgstr "在文本中使用 @用户名 以发送通知到该Kallithea用户"
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:73
 
#: kallithea/templates/changeset/changeset_file_comment.html:166
 
msgid "Preview"
 
msgstr ""
 

	
 
@@ -4993,14 +4993,14 @@ msgstr ""
 

	
 
#: kallithea/templates/email_templates/changeset_comment.html:9
 
msgid "The changeset status was changed to"
 
msgstr ""
 

	
 
#: kallithea/templates/email_templates/main.html:8
 
msgid "This is a notification from RhodeCode."
 
msgstr "这是一个RhodeCode通知。"
 
msgid "This is a notification from Kallithea."
 
msgstr "这是一个Kallithea通知。"
 

	
 
#: kallithea/templates/email_templates/password_reset.html:4
 
#, python-format
 
msgid "Hello %s"
 
msgstr ""
 

	
kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po
Show inline comments
 
# Translations template for RhodeCode.
 
# Translations template for Kallithea.
 
# Copyright (C) 2014 RhodeCode GmbH, and others.
 
# This file is distributed under the same license as the RhodeCode project.
 
# This file is distributed under the same license as the Kallithea project.
 
# Translators:
 
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 
msgid ""
 
msgstr ""
 
"Project-Id-Version: RhodeCode\n"
 
"Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
 
"Project-Id-Version: Kallithea\n"
 
"Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 
"POT-Creation-Date: 2014-02-13 15:30+0100\n"
 
"PO-Revision-Date: 2014-02-13 14:34+0000\n"
 
"Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/RhodeCode/language/zh_TW/)\n"
 
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/Kallithea/language/zh_TW/)\n"
 
"MIME-Version: 1.0\n"
 
"Content-Type: text/plain; charset=UTF-8\n"
 
"Content-Transfer-Encoding: 8bit\n"
 
"Generated-By: Babel 0.9.6\n"
 
"Language: zh_TW\n"
 
"Plural-Forms: nplurals=1; plural=0;\n"
 
@@ -135,13 +135,13 @@ msgstr ""
 
#: kallithea/controllers/files.py:311
 
msgid "You can only delete files with revision being a valid branch "
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:322
 
#, python-format
 
msgid "Deleted file %s via RhodeCode"
 
msgid "Deleted file %s via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:344
 
#, python-format
 
msgid "Successfully deleted file %s"
 
msgstr ""
 
@@ -154,26 +154,26 @@ msgstr ""
 
#: kallithea/controllers/files.py:371
 
msgid "You can only edit files with revision being a valid branch "
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:385
 
#, python-format
 
msgid "Edited file %s via RhodeCode"
 
msgid "Edited file %s via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:401
 
msgid "No changes"
 
msgstr "沒有修改"
 

	
 
#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:485
 
#, python-format
 
msgid "Successfully committed to %s"
 
msgstr "成功遞交至 %s"
 

	
 
#: kallithea/controllers/files.py:438
 
msgid "Added file via RhodeCode"
 
msgid "Added file via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:459
 
msgid "No content"
 
msgstr ""
 

	
 
@@ -272,13 +272,13 @@ msgstr "日誌"
 

	
 
#: kallithea/controllers/login.py:185 kallithea/controllers/login.py:230
 
msgid "bad captcha"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:191
 
msgid "You have successfully registered into RhodeCode"
 
msgid "You have successfully registered into Kallithea"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:235
 
msgid "Your password reset link was sent"
 
msgstr "您的密碼重設連結已寄出"
 

	
 
@@ -1099,13 +1099,13 @@ msgstr ""
 

	
 
#: kallithea/lib/helpers.py:777
 
msgid "[pushed] into"
 
msgstr ""
 

	
 
#: kallithea/lib/helpers.py:779
 
msgid "[committed via RhodeCode] into repository"
 
msgid "[committed via Kallithea] into repository"
 
msgstr ""
 

	
 
#: kallithea/lib/helpers.py:781
 
msgid "[pulled from remote] into repository"
 
msgstr ""
 

	
 
@@ -1310,13 +1310,13 @@ msgstr ""
 
#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509
 
#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510
 
#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531
 
#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
 
#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
 
#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
 
msgid "RhodeCode Administrator"
 
msgid "Kallithea Administrator"
 
msgstr ""
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399
 
@@ -1384,20 +1384,20 @@ msgid "Register disabled"
 
msgstr ""
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1180
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
 
msgid "Register new user with RhodeCode with manual activation"
 
msgid "Register new user with Kallithea with manual activation"
 
msgstr ""
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
 
msgid "Register new user with RhodeCode with auto activation"
 
msgid "Register new user with Kallithea with auto activation"
 
msgstr ""
 

	
 
#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
 
#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
 
#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763
 
#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838
 
@@ -1695,13 +1695,13 @@ msgstr ""
 
#, python-format
 
msgid "%(user)s mentioned you at %(when)s"
 
msgstr ""
 

	
 
#: kallithea/model/notification.py:232
 
#, python-format
 
msgid "%(user)s registered in RhodeCode at %(when)s"
 
msgid "%(user)s registered in Kallithea at %(when)s"
 
msgstr ""
 

	
 
#: kallithea/model/notification.py:233
 
#, python-format
 
msgid "%(user)s opened new pull request at %(when)s"
 
msgstr ""
 
@@ -1746,13 +1746,13 @@ msgstr ""
 
#: kallithea/model/user.py:331
 
msgid "Your new password"
 
msgstr ""
 

	
 
#: kallithea/model/user.py:332
 
#, python-format
 
msgid "Your new RhodeCode password:%s"
 
msgid "Your new Kallithea password:%s"
 
msgstr ""
 

	
 
#: kallithea/model/validators.py:82 kallithea/model/validators.py:83
 
msgid "Value cannot be an empty list"
 
msgstr ""
 

	
 
@@ -2311,13 +2311,13 @@ msgstr ""
 
msgid "Enabled Plugins"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:36
 
msgid ""
 
"Comma separated list of plugins. Order of plugins is also order in which "
 
"RhodeCode will try to authenticate user"
 
"Kallithea will try to authenticate user"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/auth/auth_settings.html:37
 
msgid "Available built-in plugins"
 
msgstr ""
 

	
 
@@ -2919,13 +2919,13 @@ msgstr ""
 
msgid "Anonymous access"
 
msgstr "訪客權限"
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:13
 
#, python-format
 
msgid ""
 
"Allow access to RhodeCode without need to log in. Anonymous users use %s "
 
"Allow access to Kallithea without need to log in. Anonymous users use %s "
 
"user permissions"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/permissions/permissions_globals.html:26
 
msgid ""
 
"All default permissions on each repository will be reset to chosen "
 
@@ -3287,13 +3287,13 @@ msgid ""
 
"this process is finished.repo_name"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_creating.html:42
 
msgid ""
 
"We're sorry but error occured during this operation. Please check your "
 
"RhodeCode server logs, or contact administrator."
 
"Kallithea server logs, or contact administrator."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit.html:8
 
#, python-format
 
msgid "%s repository settings"
 
msgstr ""
 
@@ -3405,13 +3405,13 @@ msgstr ""
 
msgid "Delete forks"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit_advanced.html:94
 
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 "
 
"for Kallithea and VCS systems. If you need to fully delete it from file "
 
"system please do it manually"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/repos/repo_edit_caches.html:4
 
msgid "Invalidate repository cache"
 
msgstr ""
 
@@ -3618,13 +3618,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:4
 
msgid "Email prefix"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:5
 
msgid "RhodeCode email from"
 
msgid "Kallithea email from"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_email.html:6
 
msgid "Error email from"
 
msgstr ""
 

	
 
@@ -3670,13 +3670,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:8
 
msgid "Site branding"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:12
 
msgid "Set a custom title for your RhodeCode Service."
 
msgid "Set a custom title for your Kallithea Service."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_global.html:18
 
msgid "HTTP authentication realm"
 
msgstr ""
 

	
 
@@ -3730,13 +3730,13 @@ msgstr "移除hook失敗"
 
#: kallithea/templates/admin/settings/settings_license.html:2
 
msgid "Currently you're using a free license, which is limited to 20 users."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:9
 
#: kallithea/templates/admin/settings/settings_system.html:4
 
msgid "RhodeCode version"
 
msgid "Kallithea version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:10
 
msgid "License token"
 
msgstr ""
 

	
 
@@ -3766,13 +3766,13 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:33
 
msgid "License key"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:37
 
msgid "Paste your RhodeCode license key into that textarea."
 
msgid "Paste your Kallithea license key into that textarea."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_license.html:52
 
msgid ""
 
"Please enter following lines (if yet not present) into [app:main] section of"
 
" your .ini file. The token below is autogenerated."
 
@@ -3805,13 +3805,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_mapping.html:23
 
msgid "Install GIT hooks"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:25
 
msgid ""
 
"Verify if RhodeCodes GIT hooks are installed for each repository. Current "
 
"Verify if Kallitheas GIT hooks are installed for each repository. Current "
 
"hooks will be updated to latest version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_mapping.html:32
 
msgid "Rescan Repositories"
 
msgstr ""
 
@@ -3823,13 +3823,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_search.html:12
 
msgid "Build from scratch"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:15
 
msgid ""
 
"This option completely reindex all the files within RhodeCode for proper "
 
"This option completely reindex all the files within Kallithea for proper "
 
"fulltext search capabilities."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_search.html:21
 
msgid "Reindex"
 
msgstr "重新索引"
 
@@ -3877,13 +3877,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_vcs.html:11
 
msgid "Require SSL for vcs operations"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:13
 
msgid ""
 
"Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
 
"Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
 
"certificate is missing it will return a HTTP Error 406: Not Acceptable."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:24
 
msgid "Show repository size after push"
 
msgstr "push 後顯示版本庫大小"
 
@@ -3921,13 +3921,13 @@ msgstr ""
 
#: kallithea/templates/admin/settings/settings_vcs.html:64
 
msgid "Repositories location"
 
msgstr "版本庫路徑"
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:69
 
msgid ""
 
"Click to unlock. You must restart RhodeCode in order to make this setting "
 
"Click to unlock. You must restart Kallithea in order to make this setting "
 
"take effect."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_vcs.html:72
 
msgid ""
 
"Filesystem location where repositories should be stored. After changing this"
 
@@ -3944,40 +3944,40 @@ msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:15
 
msgid "Allows storing additional customized fields per repository."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:18
 
msgid "Show RhodeCode version"
 
msgid "Show Kallithea version"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:20
 
msgid "Shows or hides a version number of RhodeCode displayed in the footer."
 
msgid "Shows or hides a version number of Kallithea displayed in the footer."
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:24
 
msgid "Use Gravatars in RhodeCode"
 
msgid "Use Gravatars in Kallithea"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:30
 
msgid ""
 
"Gravatar url allows you to use other avatar server application.\n"
 
"                                                        Following variables of the URL will be replaced accordingly.\n"
 
"                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme}    'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {email}     user email,\n"
 
"                                                        {md5email}  md5 hash of the user email (like at gravatar.com),\n"
 
"                                                        {size}      size of the image that is expected from the server application,\n"
 
"                                                        {netloc}    network location/server host of running RhodeCode server"
 
"                                                        {netloc}    network location/server host of running Kallithea server"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:42
 
msgid ""
 
"Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
 
"                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
 
"                                                        {scheme} 'http' or 'https' sent from running Kallithea server,\n"
 
"                                                        {user}   current user username,\n"
 
"                                                        {netloc} network location/server host of running RhodeCode server,\n"
 
"                                                        {netloc} network location/server host of running Kallithea server,\n"
 
"                                                        {repo}   full repository name,\n"
 
"                                                        {repoid} ID of repository, can be used to contruct clone-by-id"
 
msgstr ""
 

	
 
#: kallithea/templates/admin/settings/settings_visual.html:54
 
msgid "Dashboard items"
 
@@ -4685,13 +4685,13 @@ msgstr ""
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:9
 
msgid "Refs"
 
msgstr ""
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:86
 
msgid "Add or upload files directly via RhodeCode"
 
msgid "Add or upload files directly via Kallithea"
 
msgstr ""
 

	
 
#: kallithea/templates/changelog/changelog_summary_data.html:89
 
#: kallithea/templates/files/files_ypjax.html:9
 
msgid "Add New File"
 
msgstr ""
 
@@ -4827,13 +4827,13 @@ msgstr ""
 
msgid "Comments parsed using %s syntax with %s support."
 
msgstr ""
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:69
 
#: kallithea/templates/changeset/changeset_file_comment.html:155
 
msgid ""
 
"Use @username inside this text to send notification to this RhodeCode user"
 
"Use @username inside this text to send notification to this Kallithea user"
 
msgstr ""
 

	
 
#: kallithea/templates/changeset/changeset_file_comment.html:73
 
#: kallithea/templates/changeset/changeset_file_comment.html:166
 
msgid "Preview"
 
msgstr ""
 
@@ -4991,13 +4991,13 @@ msgstr ""
 

	
 
#: kallithea/templates/email_templates/changeset_comment.html:9
 
msgid "The changeset status was changed to"
 
msgstr ""
 

	
 
#: kallithea/templates/email_templates/main.html:8
 
msgid "This is a notification from RhodeCode."
 
msgid "This is a notification from Kallithea."
 
msgstr ""
 

	
 
#: kallithea/templates/email_templates/password_reset.html:4
 
#, python-format
 
msgid "Hello %s"
 
msgstr ""
kallithea/lib/__init__.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib
 
~~~~~~~~~~~~~
 

	
 
RhodeCode libs
 
Kallithea libs
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Oct 06, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -44,10 +44,10 @@ def get_current_revision(quiet=False):
 
        repo = get_repo(path=repopath, alias=scm)
 
        wk_dir = repo.workdir
 
        cur_rev = wk_dir.get_changeset()
 
        return (cur_rev.revision, cur_rev.short_id)
 
    except Exception, err:
 
        if not quiet:
 
            print ("WARNING: Cannot retrieve rhodecode's revision. "
 
            print ("WARNING: Cannot retrieve kallithea's revision. "
 
                   "disregard this if you don't know what that means. "
 
                   "Original error was: %s" % err)
 
        return None
kallithea/lib/annotate.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.annotate
 
~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Anontation library for usage in rhodecode, previously part of vcs
 
Anontation library for usage in kallithea, previously part of vcs
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Dec 4, 2011
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/lib/auth.py
Show inline comments
 
@@ -473,13 +473,13 @@ def allowed_api_access(controller_name, 
 
            log.debug(msg)
 
    return api_access_valid
 

	
 

	
 
class AuthUser(object):
 
    """
 
    A simple object that handles all attributes of user in RhodeCode
 
    A simple object that handles all attributes of user in Kallithea
 

	
 
    It does lookup based on API key,given user, or user present in session
 
    Then it fills all required information for such user. It also checks if
 
    anonymous access is enabled and if so, it returns default user as logged in
 
    """
 

	
kallithea/lib/auth_modules/__init__.py
Show inline comments
 
@@ -42,31 +42,31 @@ class LazyFormencode(object):
 
        if isfunction(formencode_obj):
 
            #case we wrap validators into functions
 
            formencode_obj = self.formencode_obj(*args, **kwargs)
 
        return formencode_obj(*self.args, **self.kwargs)
 

	
 

	
 
class RhodeCodeAuthPluginBase(object):
 
class KallitheaAuthPluginBase(object):
 
    auth_func_attrs = {
 
        "username": "unique username",
 
        "firstname": "first name",
 
        "lastname": "last name",
 
        "email": "email address",
 
        "groups": '["list", "of", "groups"]',
 
        "extern_name": "name in external source of record",
 
        "extern_type": "type of external source of record",
 
        "admin": 'True|False defines if user should be RhodeCode super admin',
 
        "active": 'True|False defines active state of user internally for RhodeCode',
 
        "admin": 'True|False defines if user should be Kallithea super admin',
 
        "active": 'True|False defines active state of user internally for Kallithea',
 
        "active_from_extern": "True|False\None, active state from the external auth, "
 
                              "None means use definition from RhodeCode extern_type active value"
 
                              "None means use definition from Kallithea extern_type active value"
 
    }
 

	
 
    @property
 
    def validators(self):
 
        """
 
        Exposes RhodeCode validators modules
 
        Exposes Kallithea validators modules
 
        """
 
        # this is a hack to overcome issues with pylons threadlocals and
 
        # translator object _() not beein registered properly.
 
        class LazyCaller(object):
 
            def __init__(self, name):
 
                self.validator_name = name
 
@@ -133,13 +133,13 @@ class RhodeCodeAuthPluginBase(object):
 
        eg. container auth plugin to fetch user by environ params
 

	
 
        :param username: username if given to fetch from database
 
        :param kwargs: extra arguments needed for user fetching.
 
        """
 
        user = None
 
        log.debug('Trying to fetch user `%s` from RhodeCode database'
 
        log.debug('Trying to fetch user `%s` from Kallithea database'
 
                  % (username))
 
        if username:
 
            user = User.get_by_username(username)
 
            if not user:
 
                log.debug('Fallback to fetch user in case insensitive mode')
 
                user = User.get_by_username(username, case_insensitive=True)
 
@@ -172,13 +172,13 @@ class RhodeCodeAuthPluginBase(object):
 
                password : password input box
 
                string : input box
 
                select : single select dropdown
 

	
 
        'validator' is an lazy instantiated form field validator object, ala
 
        formencode. You need to *call* this object to init the validators.
 
        All calls to RhodeCode validators should be used through self.validators
 
        All calls to Kallithea validators should be used through self.validators
 
        which is a lazy loading proxy of formencode module.
 
        """
 
        raise NotImplementedError("Not implemented in base class")
 

	
 
    def plugin_settings(self):
 
        """
 
@@ -213,13 +213,13 @@ class RhodeCodeAuthPluginBase(object):
 
        Given a user object (which may be null), username, a plaintext password,
 
        and a settings object (containing all the keys needed as listed in settings()),
 
        authenticate this user's login attempt.
 

	
 
        Return None on failure. On success, return a dictionary of the form:
 

	
 
            see: RhodeCodeAuthPluginBase.auth_func_attrs
 
            see: KallitheaAuthPluginBase.auth_func_attrs
 
        This is later validated for correctness
 
        """
 
        raise NotImplementedError("not implemented in base class")
 

	
 
    def _authenticate(self, userobj, username, passwd, settings, **kwargs):
 
        """
 
@@ -241,32 +241,32 @@ class RhodeCodeAuthPluginBase(object):
 
        for k in self.auth_func_attrs:
 
            if k not in ret:
 
                raise Exception('Missing %s attribute from returned data' % k)
 
        return ret
 

	
 

	
 
class RhodeCodeExternalAuthPlugin(RhodeCodeAuthPluginBase):
 
class KallitheaExternalAuthPlugin(KallitheaAuthPluginBase):
 
    def use_fake_password(self):
 
        """
 
        Return a boolean that indicates whether or not we should set the user's
 
        password to a random value when it is authenticated by this plugin.
 
        If your plugin provides authentication, then you will generally want this.
 

	
 
        :returns: boolean
 
        """
 
        raise NotImplementedError("Not implemented in base class")
 

	
 
    def _authenticate(self, userobj, username, passwd, settings, **kwargs):
 
        auth = super(RhodeCodeExternalAuthPlugin, self)._authenticate(
 
        auth = super(KallitheaExternalAuthPlugin, self)._authenticate(
 
            userobj, username, passwd, settings, **kwargs)
 
        if auth:
 
            # maybe plugin will clean the username ?
 
            # we should use the return value
 
            username = auth['username']
 
            # if user is not active from our extern type we should fail to authe
 
            # this can prevent from creating users in RhodeCode when using
 
            # this can prevent from creating users in Kallithea when using
 
            # external authentication, but if it's inactive user we shouldn't
 
            # create that user anyway
 
            if auth['active_from_extern'] is False:
 
                log.warning("User %s authenticated against %s, but is inactive"
 
                            % (username, self.__module__))
 
                return None
 
@@ -303,48 +303,48 @@ class RhodeCodeExternalAuthPlugin(RhodeC
 

	
 

	
 
def importplugin(plugin):
 
    """
 
    Imports and returns the authentication plugin in the module named by plugin
 
    (e.g., plugin='kallithea.lib.auth_modules.auth_internal'). Returns the
 
    RhodeCodeAuthPluginBase subclass on success, raises exceptions on failure.
 
    KallitheaAuthPluginBase subclass on success, raises exceptions on failure.
 

	
 
    raises:
 
        AttributeError -- no RhodeCodeAuthPlugin class in the module
 
        TypeError -- if the RhodeCodeAuthPlugin is not a subclass of ours RhodeCodeAuthPluginBase
 
        AttributeError -- no KallitheaAuthPlugin class in the module
 
        TypeError -- if the KallitheaAuthPlugin is not a subclass of ours KallitheaAuthPluginBase
 
        ImportError -- if we couldn't import the plugin at all
 
    """
 
    log.debug("Importing %s" % plugin)
 
    PLUGIN_CLASS_NAME = "RhodeCodeAuthPlugin"
 
    PLUGIN_CLASS_NAME = "KallitheaAuthPlugin"
 
    try:
 
        module = importlib.import_module(plugin)
 
    except (ImportError, TypeError):
 
        log.error(traceback.format_exc())
 
        # TODO: make this more error prone, if by some accident we screw up
 
        # the plugin name, the crash is preatty bad and hard to recover
 
        raise
 

	
 
    log.debug("Loaded auth plugin from %s (module:%s, file:%s)"
 
              % (plugin, module.__name__, module.__file__))
 

	
 
    pluginclass = getattr(module, PLUGIN_CLASS_NAME)
 
    if not issubclass(pluginclass, RhodeCodeAuthPluginBase):
 
        raise TypeError("Authentication class %s.RhodeCodeAuthPlugin is not "
 
                        "a subclass of %s" % (plugin, RhodeCodeAuthPluginBase))
 
    if not issubclass(pluginclass, KallitheaAuthPluginBase):
 
        raise TypeError("Authentication class %s.KallitheaAuthPlugin is not "
 
                        "a subclass of %s" % (plugin, KallitheaAuthPluginBase))
 
    return pluginclass
 

	
 

	
 
def loadplugin(plugin):
 
    """
 
    Loads and returns an instantiated authentication plugin.
 

	
 
        see: importplugin
 
    """
 
    plugin = importplugin(plugin)()
 
    if plugin.plugin_settings.im_func != RhodeCodeAuthPluginBase.plugin_settings.im_func:
 
        raise TypeError("Authentication class %s.RhodeCodeAuthPluginBase "
 
    if plugin.plugin_settings.im_func != KallitheaAuthPluginBase.plugin_settings.im_func:
 
        raise TypeError("Authentication class %s.KallitheaAuthPluginBase "
 
                        "has overriden the plugin_settings method, which is "
 
                        "forbidden." % plugin)
 
    return plugin
 

	
 

	
 
def authenticate(username, password, environ=None):
 
@@ -364,13 +364,13 @@ def authenticate(username, password, env
 
        try:
 
            plugin = loadplugin(module)
 
        except (ImportError, AttributeError, TypeError), e:
 
            raise ImportError('Failed to load authentication module %s : %s'
 
                              % (module, str(e)))
 
        log.debug('Trying authentication using ** %s **' % (module,))
 
        # load plugin settings from RhodeCode database
 
        # load plugin settings from Kallithea database
 
        plugin_name = plugin.name
 
        plugin_settings = {}
 
        for v in plugin.plugin_settings():
 
            conf_key = "auth_%s_%s" % (plugin_name, v["name"])
 
            setting = Setting.get_by_name(conf_key)
 
            plugin_settings[v["name"]] = setting.app_settings_value if setting else None
 
@@ -392,15 +392,15 @@ def authenticate(username, password, env
 
        else:
 
            log.debug('Plugin %s accepted user `%s` for authentication'
 
                      % (module, user))
 

	
 
        log.info('Authenticating user using %s plugin' % plugin.__module__)
 
        # _authenticate is a wrapper for .auth() method of plugin.
 
        # it checks if .auth() sends proper data. for RhodeCodeExternalAuthPlugin
 
        # it checks if .auth() sends proper data. for KallitheaExternalAuthPlugin
 
        # it also maps users to Database and maps the attributes returned
 
        # from .auth() to RhodeCode database. If this function returns data
 
        # from .auth() to Kallithea database. If this function returns data
 
        # then auth is correct.
 
        plugin_user = plugin._authenticate(user, username, password,
 
                                           plugin_settings,
 
                                           environ=environ or {})
 
        log.debug('PLUGIN USER DATA: %s' % plugin_user)
 

	
kallithea/lib/auth_modules/auth_container.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.auth_modules.auth_container
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
RhodeCode container based authentication plugin
 
Kallithea container based authentication plugin
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Created on Nov 17, 2012
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -31,13 +31,13 @@ from kallithea.lib.utils2 import str2boo
 
from kallithea.lib.compat import hybrid_property
 
from kallithea.model.db import User
 

	
 
log = logging.getLogger(__name__)
 

	
 

	
 
class RhodeCodeAuthPlugin(auth_modules.RhodeCodeExternalAuthPlugin):
 
class KallitheaAuthPlugin(auth_modules.KallitheaExternalAuthPlugin):
 
    def __init__(self):
 
        pass
 

	
 
    @hybrid_property
 
    def name(self):
 
        return "container"
 
@@ -124,24 +124,24 @@ class RhodeCodeAuthPlugin(auth_modules.R
 
        :param kwargs: extra arguments needed for user fetching.
 
        """
 
        environ = kwargs.get('environ') or {}
 
        settings = kwargs.get('settings') or {}
 
        username = self._get_username(environ, settings)
 
        # we got the username, so use default method now
 
        return super(RhodeCodeAuthPlugin, self).get_user(username)
 
        return super(KallitheaAuthPlugin, self).get_user(username)
 

	
 
    def auth(self, userobj, username, password, settings, **kwargs):
 
        """
 
        Get's the container_auth username (or email). It tries to get username
 
        from REMOTE_USER if this plugin is enabled, if that fails
 
        it tries to get username from HTTP_X_FORWARDED_USER if fallback header
 
        is set. clean_username extracts the username from this data if it's
 
        having @ in it.
 
        Return None on failure. On success, return a dictionary of the form:
 

	
 
            see: RhodeCodeAuthPluginBase.auth_func_attrs
 
            see: KallitheaAuthPluginBase.auth_func_attrs
 

	
 
        :param userobj:
 
        :param username:
 
        :param password:
 
        :param settings:
 
        :param kwargs:
 
@@ -166,13 +166,13 @@ class RhodeCodeAuthPlugin(auth_modules.R
 
            username = self._get_username(environ, settings)
 

	
 
        # if cannot fetch username, it's a no-go for this plugin to proceed
 
        if not username:
 
            return None
 

	
 
        # old attrs fetched from RhodeCode database
 
        # old attrs fetched from Kallithea database
 
        admin = getattr(userobj, 'admin', False)
 
        active = getattr(userobj, 'active', True)
 
        email = getattr(userobj, 'email', '')
 
        firstname = getattr(userobj, 'firstname', '')
 
        lastname = getattr(userobj, 'lastname', '')
 
        extern_type = getattr(userobj, 'extern_type', '')
kallithea/lib/auth_modules/auth_crowd.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.auth_modules.auth_crowd
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
RhodeCode authentication plugin for Atlassian CROWD
 
Kallithea authentication plugin for Atlassian CROWD
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Created on Nov 17, 2012
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -127,13 +127,13 @@ class CrowdServer(object):
 
        """Retrieve a list of groups to which this user belongs."""
 
        url = ("%s/rest/usermanagement/%s/user/group/nested?username=%s"
 
               % (self._uri, self._version, username))
 
        return self._request(url)
 

	
 

	
 
class RhodeCodeAuthPlugin(auth_modules.RhodeCodeExternalAuthPlugin):
 
class KallitheaAuthPlugin(auth_modules.KallitheaExternalAuthPlugin):
 

	
 
    @hybrid_property
 
    def name(self):
 
        return "crowd"
 

	
 
    def settings(self):
 
@@ -171,13 +171,13 @@ class RhodeCodeAuthPlugin(auth_modules.R
 
                "formname": "Application Password"
 
            },
 
            {
 
                "name": "admin_groups",
 
                "validator": self.validators.UnicodeString(strip=True),
 
                "type": "string",
 
                "description": "A comma separated list of group names that identify users as RhodeCode Administrators",
 
                "description": "A comma separated list of group names that identify users as Kallithea Administrators",
 
                "formname": "Admin Groups"
 
            }
 
        ]
 
        return settings
 

	
 
    def use_fake_password(self):
 
@@ -192,13 +192,13 @@ class RhodeCodeAuthPlugin(auth_modules.R
 
        Given a user object (which may be null), username, a plaintext password,
 
        and a settings object (containing all the keys needed as listed in settings()),
 
        authenticate this user's login attempt.
 

	
 
        Return None on failure. On success, return a dictionary of the form:
 

	
 
            see: RhodeCodeAuthPluginBase.auth_func_attrs
 
            see: KallitheaAuthPluginBase.auth_func_attrs
 
        This is later validated for correctness
 
        """
 
        if not username or not password:
 
            log.debug('Empty username or password skipping...')
 
            return None
 

	
 
@@ -211,13 +211,13 @@ class RhodeCodeAuthPlugin(auth_modules.R
 
            return None
 

	
 
        res = server.user_groups(crowd_user["name"])
 
        log.debug("Crowd groups: \n%s" % (formatted_json(res)))
 
        crowd_user["groups"] = [x["name"] for x in res["groups"]]
 

	
 
        # old attrs fetched from RhodeCode database
 
        # old attrs fetched from Kallithea database
 
        admin = getattr(userobj, 'admin', False)
 
        active = getattr(userobj, 'active', True)
 
        email = getattr(userobj, 'email', '')
 
        firstname = getattr(userobj, 'firstname', '')
 
        lastname = getattr(userobj, 'lastname', '')
 
        extern_type = getattr(userobj, 'extern_type', '')
kallithea/lib/auth_modules/auth_internal.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.auth_modules.auth_internal
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
RhodeCode authentication plugin for built in internal auth
 
Kallithea authentication plugin for built in internal auth
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Created on Nov 17, 2012
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -32,13 +32,13 @@ from kallithea.lib.compat import formatt
 
from kallithea.model.db import User
 

	
 

	
 
log = logging.getLogger(__name__)
 

	
 

	
 
class RhodeCodeAuthPlugin(auth_modules.RhodeCodeAuthPluginBase):
 
class KallitheaAuthPlugin(auth_modules.KallitheaAuthPluginBase):
 
    def __init__(self):
 
        pass
 

	
 
    @hybrid_property
 
    def name(self):
 
        return "internal"
 
@@ -52,13 +52,13 @@ class RhodeCodeAuthPlugin(auth_modules.R
 

	
 
    def accepts(self, user, accepts_empty=True):
 
        """
 
        Custom accepts for this auth that doesn't accept empty users. We
 
        know that user exisits in database.
 
        """
 
        return super(RhodeCodeAuthPlugin, self).accepts(user,
 
        return super(KallitheaAuthPlugin, self).accepts(user,
 
                                                        accepts_empty=False)
 

	
 
    def auth(self, userobj, username, password, settings, **kwargs):
 
        if not userobj:
 
            log.debug('userobj was:%s skipping' % (userobj, ))
 
            return None
 
@@ -80,13 +80,13 @@ class RhodeCodeAuthPlugin(auth_modules.R
 
            'extern_type': userobj.extern_type,
 
        }
 

	
 
        log.debug(formatted_json(user_attrs))
 
        if userobj.active:
 
            from kallithea.lib import auth
 
            password_match = auth.RhodeCodeCrypto.hash_check(password, userobj.password)
 
            password_match = auth.KallitheaCrypto.hash_check(password, userobj.password)
 
            if userobj.username == User.DEFAULT_USER and userobj.active:
 
                log.info('user %s authenticated correctly as anonymous user' %
 
                         username)
 
                return user_attrs
 

	
 
            elif userobj.username == username and password_match:
kallithea/lib/auth_modules/auth_ldap.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.auth_modules.auth_ldap
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
RhodeCode authentication plugin for LDAP
 
Kallithea authentication plugin for LDAP
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Created on Nov 17, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -167,13 +167,13 @@ class AuthLdap(object):
 
        except ldap.SERVER_DOWN:
 
            raise LdapConnectionError("LDAP can't access authentication server")
 

	
 
        return dn, attrs
 

	
 

	
 
class RhodeCodeAuthPlugin(auth_modules.RhodeCodeExternalAuthPlugin):
 
class KallitheaAuthPlugin(auth_modules.KallitheaExternalAuthPlugin):
 
    def __init__(self):
 
        self._logger = logging.getLogger(__name__)
 
        self._tls_kind_values = ["PLAIN", "LDAPS", "START_TLS"]
 
        self._tls_reqcert_values = ["NEVER", "ALLOW", "TRY", "DEMAND", "HARD"]
 
        self._search_scopes = ["BASE", "ONELEVEL", "SUBTREE"]
 

	
 
@@ -294,13 +294,13 @@ class RhodeCodeAuthPlugin(auth_modules.R
 
        Given a user object (which may be null), username, a plaintext password,
 
        and a settings object (containing all the keys needed as listed in settings()),
 
        authenticate this user's login attempt.
 

	
 
        Return None on failure. On success, return a dictionary of the form:
 

	
 
            see: RhodeCodeAuthPluginBase.auth_func_attrs
 
            see: KallitheaAuthPluginBase.auth_func_attrs
 
        This is later validated for correctness
 
        """
 

	
 
        if not username or not password:
 
            log.debug('Empty username or password skipping...')
 
            return None
 
@@ -329,13 +329,13 @@ class RhodeCodeAuthPlugin(auth_modules.R
 
            aldap = AuthLdap(**kwargs)
 
            (user_dn, ldap_attrs) = aldap.authenticate_ldap(username, password)
 
            log.debug('Got ldap DN response %s' % user_dn)
 

	
 
            get_ldap_attr = lambda k: ldap_attrs.get(settings.get(k), [''])[0]
 

	
 
            # old attrs fetched from RhodeCode database
 
            # old attrs fetched from Kallithea database
 
            admin = getattr(userobj, 'admin', False)
 
            active = getattr(userobj, 'active', True)
 
            email = getattr(userobj, 'email', '')
 
            firstname = getattr(userobj, 'firstname', '')
 
            lastname = getattr(userobj, 'lastname', '')
 
            extern_type = getattr(userobj, 'extern_type', '')
kallithea/lib/auth_modules/auth_pam.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.auth_pam
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
RhodeCode authentication library for PAM
 
Kallithea authentication library for PAM
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Created on Apr 09, 2013
 
:author: Alexey Larikov
 
"""
 
@@ -39,23 +39,23 @@ log = logging.getLogger(__name__)
 

	
 
# Cache to store PAM authenticated users
 
_auth_cache = dict()
 
_pam_lock = threading.Lock()
 

	
 

	
 
class RhodeCodeAuthPlugin(auth_modules.RhodeCodeExternalAuthPlugin):
 
class KallitheaAuthPlugin(auth_modules.KallitheaExternalAuthPlugin):
 
    # PAM authnetication can be slow. Repository operations involve a lot of
 
    # auth calls. Little caching helps speedup push/pull operations significantly
 
    AUTH_CACHE_TTL = 4
 

	
 
    def __init__(self):
 
        global _auth_cache
 
        ts = time.time()
 
        cleared_cache = dict(
 
            [(k, v) for (k, v) in _auth_cache.items() if
 
             (v + RhodeCodeAuthPlugin.AUTH_CACHE_TTL > ts)])
 
             (v + KallitheaAuthPlugin.AUTH_CACHE_TTL > ts)])
 
        _auth_cache = cleared_cache
 

	
 
    @hybrid_property
 
    def name(self):
 
        return "pam"
 

	
 
@@ -100,13 +100,13 @@ class RhodeCodeAuthPlugin(auth_modules.R
 
            if not auth_result:
 
                log.error("PAM was unable to authenticate user: %s" % (username,))
 
                return None
 
        else:
 
            log.debug("Using cached auth for user: %s" % (username,))
 

	
 
        # old attrs fetched from RhodeCode database
 
        # old attrs fetched from Kallithea database
 
        admin = getattr(userobj, 'admin', False)
 
        active = getattr(userobj, 'active', True)
 
        email = getattr(userobj, 'email', '') or "%s@%s" % (username, socket.gethostname())
 
        firstname = getattr(userobj, 'firstname', '')
 
        lastname = getattr(userobj, 'lastname', '')
 
        extern_type = getattr(userobj, 'extern_type', '')
kallithea/lib/base.py
Show inline comments
 
@@ -108,13 +108,13 @@ class BasicAuth(AuthBasicAuthenticator):
 
        self._rc_auth_http_code = auth_http_code
 

	
 
    def build_authentication(self):
 
        head = WWW_AUTHENTICATE.tuples('Basic realm="%s"' % self.realm)
 
        if self._rc_auth_http_code and self._rc_auth_http_code == '403':
 
            # return 403 if alternative http return code is specified in
 
            # RhodeCode config
 
            # Kallithea config
 
            return HTTPForbidden(headers=head)
 
        return HTTPUnauthorized(headers=head)
 

	
 
    def authenticate(self, environ):
 
        authorization = AUTHORIZATION(environ)
 
        if not authorization:
kallithea/lib/celerylib/__init__.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.celerylib.__init__
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
celery libs for RhodeCode
 
celery libs for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Nov 27, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/lib/celerylib/tasks.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.celerylib.tasks
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
RhodeCode task modules, containing all task that suppose to be run
 
Kallithea task modules, containing all task that suppose to be run
 
by celery daemon
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Oct 6, 2010
 
:author: marcink
 
@@ -275,13 +275,13 @@ def send_email(recipients, subject, body
 
    if not recipients:
 
        # if recipients are not defined we send to email_config + all admins
 
        admins = [u.email for u in User.query()
 
                  .filter(User.admin == True).all()]
 
        recipients = [email_config.get('email_to')] + admins
 

	
 
    mail_from = email_config.get('app_email_from', 'RhodeCode')
 
    mail_from = email_config.get('app_email_from', 'Kallithea')
 
    user = email_config.get('smtp_username')
 
    passwd = email_config.get('smtp_password')
 
    mail_server = email_config.get('smtp_server')
 
    mail_port = email_config.get('smtp_port')
 
    tls = str2bool(email_config.get('smtp_use_tls'))
 
    ssl = str2bool(email_config.get('smtp_use_ssl'))
kallithea/lib/db_manage.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.db_manage
 
~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Database creation, and setup module for RhodeCode. Used for creation
 
Database creation, and setup module for Kallithea. Used for creation
 
of database as well as for migration operations
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 10, 2010
 
:author: marcink
 
@@ -181,13 +181,13 @@ class DbManage(object):
 
            _step = step
 

	
 
        notify('upgrade to version %s successful' % _step)
 

	
 
    def fix_repo_paths(self):
 
        """
 
        Fixes a old rhodecode version path into new one without a '*'
 
        Fixes a old kallithea version path into new one without a '*'
 
        """
 

	
 
        paths = self.sa.query(Ui)\
 
                .filter(Ui.ui_key == '/')\
 
                .scalar()
 

	
 
@@ -219,13 +219,13 @@ class DbManage(object):
 
        except Exception:
 
            self.sa.rollback()
 
            raise
 

	
 
    def fix_settings(self):
 
        """
 
        Fixes rhodecode settings adds ga_code key for google analytics
 
        Fixes kallithea settings adds ga_code key for google analytics
 
        """
 

	
 
        hgsettings3 = Setting('ga_code', '')
 

	
 
        try:
 
            self.sa.add(hgsettings3)
 
@@ -485,13 +485,13 @@ class DbManage(object):
 
            retries -= 1
 
            return self.config_prompt(test_repo_path, retries)
 

	
 
        real_path = os.path.normpath(os.path.realpath(path))
 

	
 
        if real_path != os.path.normpath(path):
 
            if not ask_ok(('Path looks like a symlink, Rhodecode will store '
 
            if not ask_ok(('Path looks like a symlink, Kallithea will store '
 
                           'given path as %s ? [y/n]') % (real_path,)):
 
                log.error('Canceled by user')
 
                sys.exit(-1)
 

	
 
        return real_path
 

	
 
@@ -512,13 +512,13 @@ class DbManage(object):
 
            setattr(ui_conf, 'ui_section', section)
 
            setattr(ui_conf, 'ui_key', key)
 
            setattr(ui_conf, 'ui_value', value)
 
            self.sa.add(ui_conf)
 

	
 
        settings = [
 
            ('realm', 'RhodeCode', 'unicode'),
 
            ('realm', 'Kallithea', 'unicode'),
 
            ('title', '', 'unicode'),
 
            ('ga_code', '', 'unicode'),
 
            ('show_public_icon', True, 'bool'),
 
            ('show_private_icon', True, 'bool'),
 
            ('stylify_metatags', False, 'bool'),
 
            ('dashboard_items', 100, 'int'),
 
@@ -538,13 +538,13 @@ class DbManage(object):
 

	
 
        log.info('created ui config')
 

	
 
    def create_user(self, username, password, email='', admin=False):
 
        log.info('creating user %s' % username)
 
        UserModel().create_or_update(username, password, email,
 
                                     firstname='RhodeCode', lastname='Admin',
 
                                     firstname='Kallithea', lastname='Admin',
 
                                     active=True, admin=admin,
 
                                     extern_type="internal")
 

	
 
    def create_default_user(self):
 
        log.info('creating default user')
 
        # create default user for handling default permissions.
kallithea/lib/dbmigrate/__init__.py
Show inline comments
 
@@ -41,13 +41,13 @@ class UpgradeDb(BasePasterCommand):
 

	
 
    max_args = 1
 
    min_args = 1
 

	
 
    usage = "CONFIG_FILE"
 
    summary = "Upgrades current db to newer version"
 
    group_name = "RhodeCode"
 
    group_name = "Kallithea"
 

	
 
    parser = Command.standard_parser(verbose=True)
 

	
 
    def command(self):
 
        from pylons import config
 
        add_cache(config)
kallithea/lib/dbmigrate/schema/db_1_2_0.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.db_1_2_0
 
~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Database Models for RhodeCode <=1.2.X
 
Database Models for Kallithea <=1.2.X
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 08, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/lib/dbmigrate/schema/db_1_3_0.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.db_1_3_0
 
~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Database Models for RhodeCode <=1.3.X
 
Database Models for Kallithea <=1.3.X
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 08, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/lib/dbmigrate/schema/db_1_4_0.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.db_1_4_0
 
~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Database Models for RhodeCode <=1.4.X
 
Database Models for Kallithea <=1.4.X
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 08, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -1170,22 +1170,22 @@ class Permission(Base, BaseModel):
 

	
 
        ('group.none', _('Repositories Group no access')),
 
        ('group.read', _('Repositories Group read access')),
 
        ('group.write', _('Repositories Group write access')),
 
        ('group.admin', _('Repositories Group admin access')),
 

	
 
        ('hg.admin', _('RhodeCode Administrator')),
 
        ('hg.admin', _('Kallithea Administrator')),
 
        ('hg.create.none', _('Repository creation disabled')),
 
        ('hg.create.repository', _('Repository creation enabled')),
 
        ('hg.fork.none', _('Repository forking disabled')),
 
        ('hg.fork.repository', _('Repository forking enabled')),
 
        ('hg.register.none', _('Register disabled')),
 
        ('hg.register.manual_activate', _('Register new user with RhodeCode '
 
        ('hg.register.manual_activate', _('Register new user with Kallithea '
 
                                          'with manual activation')),
 

	
 
        ('hg.register.auto_activate', _('Register new user with RhodeCode '
 
        ('hg.register.auto_activate', _('Register new user with Kallithea '
 
                                        'with auto activation')),
 
    ]
 

	
 
    # defines which permissions are more important higher the more important
 
    PERM_WEIGHTS = {
 
        'repository.none': 0,
kallithea/lib/dbmigrate/schema/db_1_5_0.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.db_1_5_0
 
~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Database Models for RhodeCode <=1.5.2
 
Database Models for Kallithea <=1.5.2
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 08, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -1189,22 +1189,22 @@ class Permission(Base, BaseModel):
 

	
 
        ('group.none', _('Repositories Group no access')),
 
        ('group.read', _('Repositories Group read access')),
 
        ('group.write', _('Repositories Group write access')),
 
        ('group.admin', _('Repositories Group admin access')),
 

	
 
        ('hg.admin', _('RhodeCode Administrator')),
 
        ('hg.admin', _('Kallithea Administrator')),
 
        ('hg.create.none', _('Repository creation disabled')),
 
        ('hg.create.repository', _('Repository creation enabled')),
 
        ('hg.fork.none', _('Repository forking disabled')),
 
        ('hg.fork.repository', _('Repository forking enabled')),
 
        ('hg.register.none', _('Register disabled')),
 
        ('hg.register.manual_activate', _('Register new user with RhodeCode '
 
        ('hg.register.manual_activate', _('Register new user with Kallithea '
 
                                          'with manual activation')),
 

	
 
        ('hg.register.auto_activate', _('Register new user with RhodeCode '
 
        ('hg.register.auto_activate', _('Register new user with Kallithea '
 
                                        'with auto activation')),
 
    ]
 

	
 
    # defines which permissions are more important higher the more important
 
    PERM_WEIGHTS = {
 
        'repository.none': 0,
kallithea/lib/dbmigrate/schema/db_1_5_2.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.db_1_5_2
 
~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Database Models for RhodeCode <=1.5.X
 
Database Models for Kallithea <=1.5.X
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 08, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -1309,22 +1309,22 @@ class Permission(Base, BaseModel):
 

	
 
        ('group.none', _('Repositories Group no access')),
 
        ('group.read', _('Repositories Group read access')),
 
        ('group.write', _('Repositories Group write access')),
 
        ('group.admin', _('Repositories Group admin access')),
 

	
 
        ('hg.admin', _('RhodeCode Administrator')),
 
        ('hg.admin', _('Kallithea Administrator')),
 
        ('hg.create.none', _('Repository creation disabled')),
 
        ('hg.create.repository', _('Repository creation enabled')),
 
        ('hg.fork.none', _('Repository forking disabled')),
 
        ('hg.fork.repository', _('Repository forking enabled')),
 
        ('hg.register.none', _('Register disabled')),
 
        ('hg.register.manual_activate', _('Register new user with RhodeCode '
 
        ('hg.register.manual_activate', _('Register new user with Kallithea '
 
                                          'with manual activation')),
 

	
 
        ('hg.register.auto_activate', _('Register new user with RhodeCode '
 
        ('hg.register.auto_activate', _('Register new user with Kallithea '
 
                                        'with auto activation')),
 
    ]
 

	
 
    # defines which permissions are more important higher the more important
 
    PERM_WEIGHTS = {
 
        'repository.none': 0,
kallithea/lib/dbmigrate/schema/db_1_6_0.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.db_1_6_0
 
~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Database Models for RhodeCode <=1.5.X
 
Database Models for Kallithea <=1.5.X
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 08, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -1394,22 +1394,22 @@ class Permission(Base, BaseModel):
 

	
 
        ('group.none', _('Repository group no access')),
 
        ('group.read', _('Repository group read access')),
 
        ('group.write', _('Repository group write access')),
 
        ('group.admin', _('Repository group admin access')),
 

	
 
        ('hg.admin', _('RhodeCode Administrator')),
 
        ('hg.admin', _('Kallithea Administrator')),
 
        ('hg.create.none', _('Repository creation disabled')),
 
        ('hg.create.repository', _('Repository creation enabled')),
 
        ('hg.fork.none', _('Repository forking disabled')),
 
        ('hg.fork.repository', _('Repository forking enabled')),
 
        ('hg.register.none', _('Register disabled')),
 
        ('hg.register.manual_activate', _('Register new user with RhodeCode '
 
        ('hg.register.manual_activate', _('Register new user with Kallithea '
 
                                          'with manual activation')),
 

	
 
        ('hg.register.auto_activate', _('Register new user with RhodeCode '
 
        ('hg.register.auto_activate', _('Register new user with Kallithea '
 
                                        'with auto activation')),
 
    ]
 

	
 
    # defines which permissions are more important higher the more important
 
    PERM_WEIGHTS = {
 
        'repository.none': 0,
kallithea/lib/dbmigrate/schema/db_1_7_0.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.db
 
~~~~~~~~~~~~~~~~~~
 

	
 
Database Models for RhodeCode
 
Database Models for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 08, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -1402,13 +1402,13 @@ class Permission(Base, BaseModel):
 
    __table_args__ = (
 
        Index('p_perm_name_idx', 'permission_name'),
 
        {'extend_existing': True, 'mysql_engine': 'InnoDB',
 
         'mysql_charset': 'utf8'},
 
    )
 
    PERMS = [
 
        ('hg.admin', _('RhodeCode Administrator')),
 
        ('hg.admin', _('Kallithea Administrator')),
 

	
 
        ('repository.none', _('Repository no access')),
 
        ('repository.read', _('Repository read access')),
 
        ('repository.write', _('Repository write access')),
 
        ('repository.admin', _('Repository admin access')),
 

	
kallithea/lib/dbmigrate/schema/db_1_8_0.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.db
 
~~~~~~~~~~~~~~~~~~
 

	
 
Database Models for RhodeCode
 
Database Models for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 08, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -1448,13 +1448,13 @@ class Permission(Base, BaseModel):
 
    __table_args__ = (
 
        Index('p_perm_name_idx', 'permission_name'),
 
        {'extend_existing': True, 'mysql_engine': 'InnoDB',
 
         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
 
    )
 
    PERMS = [
 
        ('hg.admin', _('RhodeCode Administrator')),
 
        ('hg.admin', _('Kallithea Administrator')),
 

	
 
        ('repository.none', _('Repository no access')),
 
        ('repository.read', _('Repository read access')),
 
        ('repository.write', _('Repository write access')),
 
        ('repository.admin', _('Repository admin access')),
 

	
kallithea/lib/dbmigrate/schema/db_2_0_0.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.db
 
~~~~~~~~~~~~~~~~~~
 

	
 
Database Models for RhodeCode
 
Database Models for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 08, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -227,13 +227,13 @@ class Setting(Base, BaseModel):
 
            res = cls(key, val, type)
 
        return res
 

	
 
    @classmethod
 
    def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
 
        """
 
        Creates or updates RhodeCode setting. If updates is triggered it will only
 
        Creates or updates Kallithea setting. If updates is triggered it will only
 
        update parameters that are explicityl set Optional instance will be skipped
 

	
 
        :param key:
 
        :param val:
 
        :param type:
 
        :return:
 
@@ -1505,13 +1505,13 @@ class Permission(Base, BaseModel):
 
    __table_args__ = (
 
        Index('p_perm_name_idx', 'permission_name'),
 
        {'extend_existing': True, 'mysql_engine': 'InnoDB',
 
         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
 
    )
 
    PERMS = [
 
        ('hg.admin', _('RhodeCode Administrator')),
 
        ('hg.admin', _('Kallithea Administrator')),
 

	
 
        ('repository.none', _('Repository no access')),
 
        ('repository.read', _('Repository read access')),
 
        ('repository.write', _('Repository write access')),
 
        ('repository.admin', _('Repository admin access')),
 

	
kallithea/lib/dbmigrate/schema/db_2_0_1.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.db
 
~~~~~~~~~~~~~~~~~~
 

	
 
Database Models for RhodeCode
 
Database Models for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 08, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -230,13 +230,13 @@ class Setting(Base, BaseModel):
 
            res = cls(key, val, type)
 
        return res
 

	
 
    @classmethod
 
    def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
 
        """
 
        Creates or updates RhodeCode setting. If updates is triggered it will only
 
        Creates or updates Kallithea setting. If updates is triggered it will only
 
        update parameters that are explicityl set Optional instance will be skipped
 

	
 
        :param key:
 
        :param val:
 
        :param type:
 
        :return:
 
@@ -1506,13 +1506,13 @@ class Permission(Base, BaseModel):
 
    __table_args__ = (
 
        Index('p_perm_name_idx', 'permission_name'),
 
        {'extend_existing': True, 'mysql_engine': 'InnoDB',
 
         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
 
    )
 
    PERMS = [
 
        ('hg.admin', _('RhodeCode Administrator')),
 
        ('hg.admin', _('Kallithea Administrator')),
 

	
 
        ('repository.none', _('Repository no access')),
 
        ('repository.read', _('Repository read access')),
 
        ('repository.write', _('Repository write access')),
 
        ('repository.admin', _('Repository admin access')),
 

	
kallithea/lib/dbmigrate/schema/db_2_0_2.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.db
 
~~~~~~~~~~~~~~~~~~
 

	
 
Database Models for RhodeCode
 
Database Models for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 08, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -230,13 +230,13 @@ class Setting(Base, BaseModel):
 
            res = cls(key, val, type)
 
        return res
 

	
 
    @classmethod
 
    def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
 
        """
 
        Creates or updates RhodeCode setting. If updates is triggered it will only
 
        Creates or updates Kallithea setting. If updates is triggered it will only
 
        update parameters that are explicityl set Optional instance will be skipped
 

	
 
        :param key:
 
        :param val:
 
        :param type:
 
        :return:
 
@@ -1527,13 +1527,13 @@ class Permission(Base, BaseModel):
 
    __table_args__ = (
 
        Index('p_perm_name_idx', 'permission_name'),
 
        {'extend_existing': True, 'mysql_engine': 'InnoDB',
 
         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
 
    )
 
    PERMS = [
 
        ('hg.admin', _('RhodeCode Administrator')),
 
        ('hg.admin', _('Kallithea Administrator')),
 

	
 
        ('repository.none', _('Repository no access')),
 
        ('repository.read', _('Repository read access')),
 
        ('repository.write', _('Repository write access')),
 
        ('repository.admin', _('Repository admin access')),
 

	
kallithea/lib/dbmigrate/schema/db_2_1_0.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.db
 
~~~~~~~~~~~~~~~~~~
 

	
 
Database Models for RhodeCode
 
Database Models for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 08, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -233,13 +233,13 @@ class Setting(Base, BaseModel):
 
            res = cls(key, val, type)
 
        return res
 

	
 
    @classmethod
 
    def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
 
        """
 
        Creates or updates RhodeCode setting. If updates is triggered it will only
 
        Creates or updates Kallithea setting. If updates is triggered it will only
 
        update parameters that are explicityl set Optional instance will be skipped
 

	
 
        :param key:
 
        :param val:
 
        :param type:
 
        :return:
 
@@ -1566,13 +1566,13 @@ class Permission(Base, BaseModel):
 
    __table_args__ = (
 
        Index('p_perm_name_idx', 'permission_name'),
 
        {'extend_existing': True, 'mysql_engine': 'InnoDB',
 
         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
 
    )
 
    PERMS = [
 
        ('hg.admin', _('RhodeCode Administrator')),
 
        ('hg.admin', _('Kallithea Administrator')),
 

	
 
        ('repository.none', _('Repository no access')),
 
        ('repository.read', _('Repository read access')),
 
        ('repository.write', _('Repository write access')),
 
        ('repository.admin', _('Repository admin access')),
 

	
kallithea/lib/dbmigrate/schema/db_2_2_0.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.db
 
~~~~~~~~~~~~~~~~~~
 

	
 
Database Models for RhodeCode
 
Database Models for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 08, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -234,13 +234,13 @@ class Setting(Base, BaseModel):
 
            res = cls(key, val, type)
 
        return res
 

	
 
    @classmethod
 
    def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
 
        """
 
        Creates or updates RhodeCode setting. If updates is triggered it will only
 
        Creates or updates Kallithea setting. If updates is triggered it will only
 
        update parameters that are explicityl set Optional instance will be skipped
 

	
 
        :param key:
 
        :param val:
 
        :param type:
 
        :return:
 
@@ -1616,13 +1616,13 @@ class Permission(Base, BaseModel):
 
    __table_args__ = (
 
        Index('p_perm_name_idx', 'permission_name'),
 
        {'extend_existing': True, 'mysql_engine': 'InnoDB',
 
         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
 
    )
 
    PERMS = [
 
        ('hg.admin', _('RhodeCode Administrator')),
 
        ('hg.admin', _('Kallithea Administrator')),
 

	
 
        ('repository.none', _('Repository no access')),
 
        ('repository.read', _('Repository read access')),
 
        ('repository.write', _('Repository write access')),
 
        ('repository.admin', _('Repository admin access')),
 

	
kallithea/lib/dbmigrate/schema/db_2_2_3.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.db
 
~~~~~~~~~~~~~~~~~~
 

	
 
Database Models for RhodeCode
 
Database Models for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 08, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -234,13 +234,13 @@ class Setting(Base, BaseModel):
 
            res = cls(key, val, type)
 
        return res
 

	
 
    @classmethod
 
    def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
 
        """
 
        Creates or updates RhodeCode setting. If updates is triggered it will only
 
        Creates or updates Kallithea setting. If updates is triggered it will only
 
        update parameters that are explicityl set Optional instance will be skipped
 

	
 
        :param key:
 
        :param val:
 
        :param type:
 
        :return:
 
@@ -1643,13 +1643,13 @@ class Permission(Base, BaseModel):
 
    __table_args__ = (
 
        Index('p_perm_name_idx', 'permission_name'),
 
        {'extend_existing': True, 'mysql_engine': 'InnoDB',
 
         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
 
    )
 
    PERMS = [
 
        ('hg.admin', _('RhodeCode Administrator')),
 
        ('hg.admin', _('Kallithea Administrator')),
 

	
 
        ('repository.none', _('Repository no access')),
 
        ('repository.read', _('Repository read access')),
 
        ('repository.write', _('Repository write access')),
 
        ('repository.admin', _('Repository admin access')),
 

	
kallithea/lib/dbmigrate/versions/015_version_1_8_0.py
Show inline comments
 
@@ -69,13 +69,13 @@ def fixups(models, _SESSION):
 
            # if we don't have this option create it
 
            setting = models.Setting(name, default, type_)
 

	
 
        # fix certain key to new defaults
 
        if name in ['title', 'show_public_icon']:
 
            # change title if it's only the default
 
            if name == 'title' and setting.app_settings_value == 'RhodeCode':
 
            if name == 'title' and setting.app_settings_value == 'Kallithea':
 
                setting.app_settings_value = default
 
            else:
 
                setting.app_settings_value = default
 

	
 
        setting._app_settings_type = type_
 
        _SESSION().add(setting)
kallithea/lib/exceptions.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.exceptions
 
~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Set of custom exceptions used in RhodeCode
 
Set of custom exceptions used in Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Nov 17, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -71,13 +71,13 @@ class RepoGroupAssignmentError(Exception
 
class NonRelativePathError(Exception):
 
    pass
 

	
 

	
 
class HTTPLockedRC(HTTPClientError):
 
    """
 
    Special Exception For locked Repos in RhodeCode, the return code can
 
    Special Exception For locked Repos in Kallithea, the return code can
 
    be overwritten by _code keyword argument passed into constructors
 
    """
 
    code = 423
 
    title = explanation = 'Repository Locked'
 

	
 
    def __init__(self, reponame, username, *args, **kwargs):
kallithea/lib/helpers.py
Show inline comments
 
@@ -465,13 +465,13 @@ def is_hg(repository):
 

	
 

	
 
def email_or_none(author):
 
    # extract email from the commit string
 
    _email = email(author)
 
    if _email != '':
 
        # check it against RhodeCode database, and use the MAIN email for this
 
        # check it against Kallithea database, and use the MAIN email for this
 
        # user
 
        user = User.get_by_email(_email, case_insensitive=True, cache=True)
 
        if user is not None:
 
            return user.email
 
        return _email
 

	
 
@@ -773,13 +773,13 @@ def action_parser(user_log, feed=False, 
 
    'user_commented_pull_request': (_('[commented] on pull request for'),
 
                                    get_pull_request, 'icon-comment icon-comment-colored'),
 
    'user_closed_pull_request':    (_('[closed] pull request for'),
 
                                    get_pull_request, 'icon-check'),
 
    'push':                        (_('[pushed] into'),
 
                                    get_cs_links, 'icon-arrow-up'),
 
    'push_local':                  (_('[committed via RhodeCode] into repository'),
 
    'push_local':                  (_('[committed via Kallithea] into repository'),
 
                                    get_cs_links, 'icon-pencil icon-pencil-colored'),
 
    'push_remote':                 (_('[pulled from remote] into repository'),
 
                                    get_cs_links, 'icon-arrow-up'),
 
    'pull':                        (_('[pulled] from'),
 
                                    None, 'icon-arrow-down'),
 
    'started_following_repo':      (_('[started following] repository'),
kallithea/lib/hooks.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.hooks
 
~~~~~~~~~~~~~~~~~~~
 

	
 
Hooks runned by rhodecode
 
Hooks runned by kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Aug 6, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/lib/indexers/__init__.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.indexers.__init__
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Whoosh indexing module for RhodeCode
 
Whoosh indexing module for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Aug 17, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/lib/middleware/simplegit.py
Show inline comments
 
@@ -155,13 +155,13 @@ class SimpleGit(BaseVCSController):
 
                #check permissions for this repository
 
                perm = self._check_permission(action, user, repo_name, ip_addr)
 
                if not perm:
 
                    return HTTPForbidden()(environ, start_response)
 

	
 
        # extras are injected into UI object and later available
 
        # in hooks executed by rhodecode
 
        # in hooks executed by kallithea
 
        from kallithea import CONFIG
 
        server_url = get_server_url(environ)
 
        extras = {
 
            'ip': ip_addr,
 
            'username': username,
 
            'action': action,
kallithea/lib/middleware/simplehg.py
Show inline comments
 
@@ -159,13 +159,13 @@ class SimpleHg(BaseVCSController):
 
                #check permissions for this repository
 
                perm = self._check_permission(action, user, repo_name, ip_addr)
 
                if not perm:
 
                    return HTTPForbidden()(environ, start_response)
 

	
 
        # extras are injected into mercurial UI object and later available
 
        # in hg hooks executed by rhodecode
 
        # in hg hooks executed by kallithea
 
        from kallithea import CONFIG
 
        server_url = get_server_url(environ)
 
        extras = {
 
            'ip': ip_addr,
 
            'username': username,
 
            'action': action,
kallithea/lib/paster_commands/cache_keys.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.paster_commands.cache_keys
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
cleanup-keys paster command for RhodeCode
 
cleanup-keys paster command for Kallithea
 

	
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: mar 27, 2013
 
:author: marcink
 
@@ -47,13 +47,13 @@ log = logging.getLogger(__name__)
 
class Command(BasePasterCommand):
 

	
 
    max_args = 1
 
    min_args = 1
 

	
 
    usage = "CONFIG_FILE"
 
    group_name = "RhodeCode"
 
    group_name = "Kallithea"
 
    takes_config_file = -1
 
    parser = BasePasterCommand.standard_parser(verbose=True)
 
    summary = "Cache keys utils"
 

	
 
    def command(self):
 
        #get SqlAlchemy session
kallithea/lib/paster_commands/ishell.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.paster_commands.ishell
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
interactive shell paster command for RhodeCode
 
interactive shell paster command for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 4, 2013
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -44,13 +44,13 @@ log = logging.getLogger(__name__)
 
class Command(BasePasterCommand):
 

	
 
    max_args = 1
 
    min_args = 1
 

	
 
    usage = "CONFIG_FILE"
 
    group_name = "RhodeCode"
 
    group_name = "Kallithea"
 
    takes_config_file = -1
 
    parser = BasePasterCommand.standard_parser(verbose=True)
 
    summary = "Interactive shell"
 

	
 
    def command(self):
 
        #get SqlAlchemy session
 
@@ -66,13 +66,13 @@ class Command(BasePasterCommand):
 

	
 
        try:
 
            from IPython import embed
 
            from IPython.config.loader import Config
 
            cfg = Config()
 
            cfg.InteractiveShellEmbed.confirm_exit = False
 
            embed(config=cfg, banner1="RhodeCode IShell.")
 
            embed(config=cfg, banner1="Kallithea IShell.")
 
        except ImportError:
 
            print 'ipython installation required for ishell'
 
            sys.exit(-1)
 

	
 
    def update_parser(self):
 
        pass
kallithea/lib/paster_commands/make_index.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.paster_commands.make_index
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
make-index paster command for RhodeCode
 
make-index paster command for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Aug 17, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -47,13 +47,13 @@ sys.path.append(rc_path)
 
class Command(BasePasterCommand):
 

	
 
    max_args = 1
 
    min_args = 1
 

	
 
    usage = "CONFIG_FILE"
 
    group_name = "RhodeCode"
 
    group_name = "Kallithea"
 
    takes_config_file = -1
 
    parser = BasePasterCommand.standard_parser(verbose=True)
 
    summary = "Creates or updates full text search index"
 

	
 
    def command(self):
 
        logging.config.fileConfig(self.path_to_ini_file)
kallithea/lib/paster_commands/make_rcextensions.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.paster_commands.make_rcextensions
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
make-rcext paster command for RhodeCode
 
make-rcext paster command for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Mar 6, 2012
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -46,16 +46,16 @@ log = logging.getLogger(__name__)
 
class Command(BasePasterCommand):
 

	
 
    max_args = 1
 
    min_args = 1
 

	
 
    usage = "CONFIG_FILE"
 
    group_name = "RhodeCode"
 
    group_name = "Kallithea"
 
    takes_config_file = -1
 
    parser = BasePasterCommand.standard_parser(verbose=True)
 
    summary = "Creates additional extensions for rhodecode"
 
    summary = "Creates additional extensions for kallithea"
 

	
 
    def command(self):
 
        logging.config.fileConfig(self.path_to_ini_file)
 
        from pylons import config
 

	
 
        def _make_file(ext_file, tmpl):
kallithea/lib/paster_commands/repo_scan.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.paster_commands.make_rcextensions
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
repo-scan paster command for RhodeCode
 
repo-scan paster command for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Feb 9, 2013
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -45,13 +45,13 @@ log = logging.getLogger(__name__)
 
class Command(BasePasterCommand):
 

	
 
    max_args = 1
 
    min_args = 1
 

	
 
    usage = "CONFIG_FILE"
 
    group_name = "RhodeCode"
 
    group_name = "Kallithea"
 
    takes_config_file = -1
 
    parser = BasePasterCommand.standard_parser(verbose=True)
 
    summary = "Rescan default location for new repositories"
 

	
 
    def command(self):
 
        #get SqlAlchemy session
 
@@ -66,8 +66,8 @@ class Command(BasePasterCommand):
 

	
 
    def update_parser(self):
 
        self.parser.add_option(
 
            '--delete-obsolete',
 
            action='store_true',
 
            help="Use this flag do delete repositories that are "
 
                 "present in RhodeCode database but not on the filesystem",
 
                 "present in Kallithea database but not on the filesystem",
 
        )
kallithea/lib/paster_commands/setup_db.py
Show inline comments
 
@@ -14,17 +14,17 @@ class Command(AbstractInstallCommand):
 

	
 
    default_verbosity = 1
 
    max_args = 1
 
    min_args = 1
 
    summary = "Setup an application, given a config file"
 
    usage = "CONFIG_FILE"
 
    group_name = "RhodeCode"
 
    group_name = "Kallithea"
 

	
 
    description = """\
 

	
 
    Setup RhodeCode according to its configuration file.  This is
 
    Setup Kallithea according to its configuration file.  This is
 
    the second part of a two-phase web application installation
 
    process (the first phase is prepare-app).  The setup process
 
    consist of things like setting up databases, creating super user
 
    """
 

	
 
    parser = AbstractInstallCommand.standard_parser(
kallithea/lib/paster_commands/update_repoinfo.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.paster_commands.make_rcextensions
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
uodate-repoinfo paster command for RhodeCode
 
uodate-repoinfo paster command for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Jul 14, 2012
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -48,13 +48,13 @@ log = logging.getLogger(__name__)
 
class Command(BasePasterCommand):
 

	
 
    max_args = 1
 
    min_args = 1
 

	
 
    usage = "CONFIG_FILE"
 
    group_name = "RhodeCode"
 
    group_name = "Kallithea"
 
    takes_config_file = -1
 
    parser = BasePasterCommand.standard_parser(verbose=True)
 
    summary = "Updates repositories caches for last changeset"
 

	
 
    def command(self):
 
        #get SqlAlchemy session
kallithea/lib/rcmail/smtp_mailer.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.rcmail.smtp_mailer
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Simple smtp mailer used in RhodeCode
 
Simple smtp mailer used in Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Sep 13, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/lib/utils.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.lib.utils
 
~~~~~~~~~~~~~~~~~~~
 

	
 
Utilities library for RhodeCode
 
Utilities library for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 18, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -384,13 +384,13 @@ def make_ui(read_from='file', path=None,
 
            if ui_.ui_active:
 
                log.debug('settings ui from db: [%s] %s=%s', ui_.ui_section,
 
                          ui_.ui_key, ui_.ui_value)
 
                baseui.setconfig(safe_str(ui_.ui_section), safe_str(ui_.ui_key),
 
                                 safe_str(ui_.ui_value))
 
            if ui_.ui_key == 'push_ssl':
 
                # force set push_ssl requirement to False, rhodecode
 
                # force set push_ssl requirement to False, kallithea
 
                # handles that
 
                baseui.setconfig(safe_str(ui_.ui_section), safe_str(ui_.ui_key),
 
                                 False)
 
        if clear_session:
 
            meta.Session.remove()
 
    return baseui
 
@@ -407,13 +407,13 @@ def set_app_settings(config):
 
    for k, v in hgsettings.items():
 
        config[k] = v
 

	
 

	
 
def set_vcs_config(config):
 
    """
 
    Patch VCS config with some RhodeCode specific stuff
 
    Patch VCS config with some Kallithea specific stuff
 

	
 
    :param config: kallithea.CONFIG
 
    """
 
    import kallithea
 
    from kallithea.lib.vcs import conf
 
    from kallithea.lib.utils2 import aslist
 
@@ -496,13 +496,13 @@ def repo2db_mapper(initial_repo_list, re
 
    private = defs.get('repo_private')
 

	
 
    for name, repo in initial_repo_list.items():
 
        group = map_groups(name)
 
        unicode_name = safe_unicode(name)
 
        db_repo = repo_model.get_by_repo_name(unicode_name)
 
        # found repo that is on filesystem not in RhodeCode database
 
        # found repo that is on filesystem not in Kallithea database
 
        if not db_repo:
 
            log.info('repository %s not found, creating now' % name)
 
            added.append(name)
 
            desc = (repo.description
 
                    if repo.description != 'unknown'
 
                    else '%s repository' % name)
 
@@ -792,13 +792,13 @@ class BasePasterCommand(Command):
 
        init_model(engine)
 

	
 

	
 
def check_git_version():
 
    """
 
    Checks what version of git is installed in system, and issues a warning
 
    if it's too old for RhodeCode to properly work.
 
    if it's too old for Kallithea to properly work.
 
    """
 
    from kallithea import BACKENDS
 
    from kallithea.lib.vcs.backends.git.repository import GitRepository
 
    from kallithea.lib.vcs.conf import settings
 
    from distutils.version import StrictVersion
 

	
 
@@ -823,13 +823,13 @@ def check_git_version():
 
    if 'git' in BACKENDS:
 
        log.debug('GIT executable: "%s" version detected: %s'
 
                  % (settings.GIT_EXECUTABLE_PATH, stdout))
 
        if stderr:
 
            log.warning('Unable to detect git version, org error was: %r' % stderr)
 
        elif to_old_git:
 
            log.warning('RhodeCode detected git version %s, which is too old '
 
            log.warning('Kallithea detected git version %s, which is too old '
 
                        'for the system to function properly. Make sure '
 
                        'its version is at least %s' % (ver, req_ver))
 
    return _ver
 

	
 

	
 
@decorator.decorator
kallithea/lib/utils2.py
Show inline comments
 
@@ -672,13 +672,13 @@ def suuid(url=None, truncate_to=22, alph
 
        unique_id = int(unique_id / alphabet_length)
 
    return "".join(output)[:truncate_to]
 

	
 

	
 
def get_current_authuser():
 
    """
 
    Gets rhodecode user from threadlocal tmpl_context variable if it's
 
    Gets kallithea user from threadlocal tmpl_context variable if it's
 
    defined, else returns None.
 
    """
 
    from pylons import tmpl_context
 
    if hasattr(tmpl_context, 'authuser'):
 
        return tmpl_context.authuser
 

	
kallithea/model/__init__.py
Show inline comments
 
@@ -63,13 +63,13 @@ def init_model(engine):
 
    log.info("initializing db for %s" % engine_str)
 
    meta.Base.metadata.bind = engine
 

	
 

	
 
class BaseModel(object):
 
    """
 
    Base Model for all RhodeCode models, it adds sql alchemy session
 
    Base Model for all Kallithea models, it adds sql alchemy session
 
    into instance of model
 

	
 
    :param sa: If passed it reuses this session instead of creating a new one
 
    """
 

	
 
    cls = None  # override in child class
kallithea/model/api_key.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.api_key
 
~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
api key model for RhodeCode
 
api key model for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Sep 8, 2013
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/model/comment.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.comment
 
~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
comments model for RhodeCode
 
comments model for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Nov 11, 2011
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -94,13 +94,13 @@ class ChangesetCommentsModel(BaseModel):
 
                          _url)
 
            )
 
            email_subject = '%s commented on changeset %s' % \
 
                (user.username, h.short_id(revision))
 
            # get the current participants of this changeset
 
            recipients = ChangesetComment.get_users(revision=revision)
 
            # add changeset author if it's in rhodecode system
 
            # add changeset author if it's in kallithea system
 
            cs_author = User.get_from_cs_author(cs.author)
 
            if not cs_author:
 
                #use repo owner if we cannot extract the author correctly
 
                cs_author = repo.user
 
            recipients += [cs_author]
 
            email_kwargs = {
kallithea/model/db.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.db
 
~~~~~~~~~~~~~~~~~~
 

	
 
Database Models for RhodeCode
 
Database Models for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 08, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -234,13 +234,13 @@ class Setting(Base, BaseModel):
 
            res = cls(key, val, type)
 
        return res
 

	
 
    @classmethod
 
    def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
 
        """
 
        Creates or updates RhodeCode setting. If updates is triggered it will only
 
        Creates or updates Kallithea setting. If updates is triggered it will only
 
        update parameters that are explicityl set Optional instance will be skipped
 

	
 
        :param key:
 
        :param val:
 
        :param type:
 
        :return:
 
@@ -1653,13 +1653,13 @@ class Permission(Base, BaseModel):
 
    __table_args__ = (
 
        Index('p_perm_name_idx', 'permission_name'),
 
        {'extend_existing': True, 'mysql_engine': 'InnoDB',
 
         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
 
    )
 
    PERMS = [
 
        ('hg.admin', _('RhodeCode Administrator')),
 
        ('hg.admin', _('Kallithea Administrator')),
 

	
 
        ('repository.none', _('Repository no access')),
 
        ('repository.read', _('Repository read access')),
 
        ('repository.write', _('Repository write access')),
 
        ('repository.admin', _('Repository admin access')),
 

	
kallithea/model/gist.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.gist
 
~~~~~~~~~~~~~~~~~~~~
 

	
 
gist model for RhodeCode
 
gist model for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: May 9, 2013
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -155,13 +155,13 @@ class GistModel(BaseModel):
 

	
 
        # now create single multifile commit
 
        message = 'added file'
 
        message += 's: ' if len(processed_mapping) > 1 else ': '
 
        message += ', '.join([x for x in processed_mapping])
 

	
 
        #fake RhodeCode Repository object
 
        #fake Kallithea Repository object
 
        fake_repo = AttributeDict(dict(
 
            repo_name=gist_repo_path,
 
            scm_instance_no_cache=lambda: repo,
 
        ))
 
        ScmModel().create_nodes(
 
            user=owner.user_id, repo=fake_repo,
 
@@ -219,13 +219,13 @@ class GistModel(BaseModel):
 
        self.sa.flush()
 

	
 
        message = 'updated file'
 
        message += 's: ' if len(gist_mapping) > 1 else ': '
 
        message += ', '.join([x for x in gist_mapping])
 

	
 
        #fake RhodeCode Repository object
 
        #fake Kallithea Repository object
 
        fake_repo = AttributeDict(dict(
 
            repo_name=gist_repo.path,
 
            scm_instance_no_cache=lambda: gist_repo,
 
        ))
 

	
 
        self._store_metadata(gist_repo, gist.gist_id, gist.gist_access_id,
kallithea/model/notification.py
Show inline comments
 
@@ -228,13 +228,13 @@ class NotificationModel(BaseModel):
 
        #alias
 
        _n = notification
 
        _map = {
 
            _n.TYPE_CHANGESET_COMMENT: _('%(user)s commented on changeset at %(when)s'),
 
            _n.TYPE_MESSAGE: _('%(user)s sent message at %(when)s'),
 
            _n.TYPE_MENTION: _('%(user)s mentioned you at %(when)s'),
 
            _n.TYPE_REGISTRATION: _('%(user)s registered in RhodeCode at %(when)s'),
 
            _n.TYPE_REGISTRATION: _('%(user)s registered in Kallithea at %(when)s'),
 
            _n.TYPE_PULL_REQUEST: _('%(user)s opened new pull request at %(when)s'),
 
            _n.TYPE_PULL_REQUEST_COMMENT: _('%(user)s commented on pull request at %(when)s')
 
        }
 
        tmpl = _map[notification.type_]
 

	
 
        if show_age:
kallithea/model/permission.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.permission
 
~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
permissions model for RhodeCode
 
permissions model for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Aug 20, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -38,13 +38,13 @@ from kallithea.lib.utils2 import str2boo
 

	
 
log = logging.getLogger(__name__)
 

	
 

	
 
class PermissionModel(BaseModel):
 
    """
 
    Permissions model for RhodeCode
 
    Permissions model for Kallithea
 
    """
 

	
 
    cls = Permission
 

	
 
    def create_permissions(self):
 
        """
kallithea/model/pull_request.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.pull_request
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
pull request model for RhodeCode
 
pull request model for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Jun 6, 2012
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/model/repo.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.repo
 
~~~~~~~~~~~~~~~~~~~~
 

	
 
Repository model for rhodecode
 
Repository model for kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Jun 5, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -731,13 +731,13 @@ class RepoModel(BaseModel):
 
            for k, v in baseui.configitems('hooks'):
 
                baseui.setconfig('hooks', k, None)
 

	
 
            repo = backend(repo_path, create=True, src_url=clone_uri, baseui=baseui)
 
        elif repo_type == 'git':
 
            repo = backend(repo_path, create=True, src_url=clone_uri, bare=True)
 
            # add rhodecode hook into this repo
 
            # add kallithea hook into this repo
 
            ScmModel().install_git_hook(repo=repo)
 
        else:
 
            raise Exception('Not supported repo_type %s expected hg/git' % repo_type)
 

	
 
        log.debug('Created repo %s with %s backend'
 
                  % (safe_unicode(repo_name), safe_unicode(repo_type)))
 
@@ -761,13 +761,13 @@ class RepoModel(BaseModel):
 
        shutil.move(old_path, new_path)
 

	
 
    def _delete_filesystem_repo(self, repo):
 
        """
 
        removes repo from filesystem, the removal is acctually made by
 
        added rm__ prefix into dir, and rename internat .hg/.git dirs so this
 
        repository is no longer valid for rhodecode, can be undeleted later on
 
        repository is no longer valid for kallithea, can be undeleted later on
 
        by reverting the renames on this repository
 

	
 
        :param repo: repo object
 
        """
 
        rm_path = os.path.join(self.repos_path, repo.repo_name)
 
        log.info("Removing repository %s" % (rm_path,))
kallithea/model/repo_group.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.user_group
 
~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
repo group model for RhodeCode
 
repo group model for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Jan 25, 2011
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/model/repo_permission.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.users_group
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
repository permission model for RhodeCode
 
repository permission model for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Oct 1, 2011
 
:author: nvinot, marcink
 
"""
kallithea/model/scm.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.scm
 
~~~~~~~~~~~~~~~~~~~
 

	
 
Scm model for RhodeCode
 
Scm model for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 9, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -277,13 +277,13 @@ class ScmModel(BaseModel):
 

	
 
        baseui = make_ui('db')
 
        repos = {}
 

	
 
        for name, path in get_filesystem_repos(repos_path, recursive=True):
 
            # name need to be decomposed and put back together using the /
 
            # since this is internal storage separator for rhodecode
 
            # since this is internal storage separator for kallithea
 
            name = Repository.normalize_repo_name(name)
 

	
 
            try:
 
                if name in repos:
 
                    raise RepositoryError('Duplicate repository name %s '
 
                                          'found in %s' % (name, path))
 
@@ -610,14 +610,14 @@ class ScmModel(BaseModel):
 

	
 
    def create_nodes(self, user, repo, message, nodes, parent_cs=None,
 
                     author=None, trigger_push_hook=True):
 
        """
 
        Commits given multiple nodes into repo
 

	
 
        :param user: RhodeCode User object or user_id, the commiter
 
        :param repo: RhodeCode Repository object
 
        :param user: Kallithea User object or user_id, the commiter
 
        :param repo: Kallithea Repository object
 
        :param message: commit message
 
        :param nodes: mapping {filename:{'content':content},...}
 
        :param parent_cs: parent changeset, can be empty than it's initial commit
 
        :param author: author of commit, cna be different that commiter only for git
 
        :param trigger_push_hook: trigger push hooks
 

	
 
@@ -735,14 +735,14 @@ class ScmModel(BaseModel):
 

	
 
    def delete_nodes(self, user, repo, message, nodes, parent_cs=None,
 
                     author=None, trigger_push_hook=True):
 
        """
 
        Deletes given multiple nodes into repo
 

	
 
        :param user: RhodeCode User object or user_id, the commiter
 
        :param repo: RhodeCode Repository object
 
        :param user: Kallithea User object or user_id, the commiter
 
        :param repo: Kallithea Repository object
 
        :param message: commit message
 
        :param nodes: mapping {filename:{'content':content},...}
 
        :param parent_cs: parent changeset, can be empty than it's initial commit
 
        :param author: author of commit, cna be different that commiter only for git
 
        :param trigger_push_hook: trigger push hooks
 

	
 
@@ -831,13 +831,13 @@ class ScmModel(BaseModel):
 
        choices.extend([x[0] for x in tags_group[0]])
 

	
 
        return choices, hist_l
 

	
 
    def install_git_hook(self, repo, force_create=False):
 
        """
 
        Creates a rhodecode hook inside a git repository
 
        Creates a kallithea hook inside a git repository
 

	
 
        :param repo: Instance of VCS repo
 
        :param force_create: Create even if same name hook exists
 
        """
 

	
 
        loc = jn(repo.path, 'hooks')
 
@@ -855,22 +855,22 @@ class ScmModel(BaseModel):
 

	
 
        for h_type, tmpl in [('pre', tmpl_pre), ('post', tmpl_post)]:
 
            _hook_file = jn(loc, '%s-receive' % h_type)
 
            has_hook = False
 
            log.debug('Installing git hook in repo %s' % repo)
 
            if os.path.exists(_hook_file):
 
                # let's take a look at this hook, maybe it's rhodecode ?
 
                log.debug('hook exists, checking if it is from rhodecode')
 
                # let's take a look at this hook, maybe it's kallithea ?
 
                log.debug('hook exists, checking if it is from kallithea')
 
                with open(_hook_file, 'rb') as f:
 
                    data = f.read()
 
                    matches = re.compile(r'(?:%s)\s*=\s*(.*)'
 
                                         % 'KALLITHEA_HOOK_VER').search(data)
 
                    if matches:
 
                        try:
 
                            ver = matches.groups()[0]
 
                            log.debug('got %s it is rhodecode' % (ver))
 
                            log.debug('got %s it is kallithea' % (ver))
 
                            has_hook = True
 
                        except Exception:
 
                            log.error(traceback.format_exc())
 
            else:
 
                # there is no hook in this dir, so we want to create one
 
                has_hook = True
kallithea/model/user.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.user
 
~~~~~~~~~~~~~~~~~~~~
 

	
 
users model for RhodeCode
 
users model for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Apr 9, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -138,13 +138,13 @@ class UserModel(BaseModel):
 
            'email': email, 'firstname': firstname, 'lastname': lastname,
 
            'active': active, 'admin': admin
 
        }
 
        # raises UserCreationError if it's not allowed
 
        check_allowed_create_user(user_data, cur_user)
 

	
 
        log.debug('Checking for %s account in RhodeCode database' % username)
 
        log.debug('Checking for %s account in Kallithea database' % username)
 
        user = User.get_by_username(username, case_insensitive=True)
 
        if user is None:
 
            log.debug('creating new user %s' % username)
 
            new_user = User()
 
            edit = False
 
        else:
 
@@ -328,13 +328,13 @@ class UserModel(BaseModel):
 
            if new_passwd is None:
 
                raise Exception('unable to generate new password')
 

	
 
            pre_db = False
 
            run_task(tasks.send_email, user_email,
 
                     _('Your new password'),
 
                     _('Your new RhodeCode password:%s') % (new_passwd,))
 
                     _('Your new Kallithea password:%s') % (new_passwd,))
 
            log.info('send new password mail to %s' % user_email)
 

	
 
        except Exception:
 
            log.error('Failed to update user password')
 
            log.error(traceback.format_exc())
 
            if pre_db:
kallithea/model/user_group.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.model.users_group
 
~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
user group model for RhodeCode
 
user group model for Kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Oct 1, 2011
 
:author: nvinot, marcink
 
"""
kallithea/public/js/base.js
Show inline comments
 
/**
 
RhodeCode JS Files
 
Kallithea JS Files
 
**/
 

	
 
if (typeof console == "undefined" || typeof console.log == "undefined"){
 
    console = { log: function() {} }
 
}
 

	
kallithea/templates/admin/auth/auth_settings.html
Show inline comments
 
@@ -30,13 +30,13 @@
 
    ## enabled auth plugins
 
    <h1>${_('Authentication Plugins')}</h1>
 
    <div class="fields">
 
       <div class="field">
 
           <div class="label"><label for="auth_plugins">${_("Enabled Plugins")}</label></div>
 
           <div class="input">${h.text("auth_plugins", class_='large')}
 
           <span class="help-block">${_('Comma separated list of plugins. Order of plugins is also order in which RhodeCode will try to authenticate user')}</span>
 
           <span class="help-block">${_('Comma separated list of plugins. Order of plugins is also order in which Kallithea will try to authenticate user')}</span>
 
               <div style="padding:10px 0px 10px 0px;font-weight: bold">${_('Available built-in plugins')}</div>
 
               <ul>
 
               %for plugin_path in c.available_plugins:
 
                    <li>
 
                      <div style="padding:3px 0px 3px 0px">
 
                          <span style="margin: 0px 10px 0px 0px" plugin_id="${plugin_path}" class="toggle-plugin btn btn-mini ${'btn-success' if plugin_path in c.enabled_plugins else ''}">
kallithea/templates/admin/permissions/permissions_globals.html
Show inline comments
 
@@ -7,13 +7,13 @@ ${h.form(url('admin_permissions'), metho
 
                    <label for="anonymous">${_('Anonymous access')}:</label>
 
                </div>
 
                <div class="checkboxes">
 
                    <div class="checkbox">
 
                        ${h.checkbox('anonymous',True)}
 
                    </div>
 
                     <span class="help-block">${h.literal(_('Allow access to RhodeCode without need to log in. Anonymous users use %s user permissions' % (h.link_to('*default*',h.url('admin_permissions_perms')))))}</span>
 
                     <span class="help-block">${h.literal(_('Allow access to Kallithea without need to log in. Anonymous users use %s user permissions' % (h.link_to('*default*',h.url('admin_permissions_perms')))))}</span>
 
                </div>
 
            </div>
 
            <div class="field">
 
                <div class="label">
 
                    <label for="default_repo_perm">${_('Repository')}:</label>
 
                </div>
kallithea/templates/admin/repos/repo_creating.html
Show inline comments
 
@@ -36,13 +36,13 @@
 
               aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">
 
          </div>
 
        </div>
 
    </div>
 
    <div id="progress_error" style="display: none;">
 
        <div style="font-weight: bold; color:#aa1111">
 
        ${_("We're sorry but error occured during this operation. Please check your RhodeCode server logs, or contact administrator.")}
 
        ${_("We're sorry but error occured during this operation. Please check your Kallithea server logs, or contact administrator.")}
 
        </div>
 
    </div>
 
</div>
 
</%def>
 

	
 
<script>
kallithea/templates/admin/repos/repo_edit_advanced.html
Show inline comments
 
@@ -88,10 +88,10 @@ ${h.form(url('repo', repo_name=c.repo_na
 
        ${ungettext('this repository has %s fork', 'this repository has %s forks', c.repo_info.forks.count()) % c.repo_info.forks.count()}
 
        <input type="radio" name="forks" value="detach_forks" checked="checked"/> <label for="forks">${_('Detach forks')}</label>
 
        <input type="radio" name="forks" value="delete_forks" /> <label for="forks">${_('Delete forks')}</label>
 
    %endif
 
    <div class="field" style="border:none;color:#888">
 
        <ul>
 
        <li>${_('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')}</li>
 
        <li>${_('This repository will be renamed in a special way in order to be unaccesible for Kallithea and VCS systems. If you need to fully delete it from file system please do it manually')}</li>
 
        </ul>
 
    </div>
 
${h.end_form()}
kallithea/templates/admin/settings/settings_email.html
Show inline comments
 
<dl class="dl-horizontal">
 
<%
 
 elems = [
 
    (_('Email prefix'), c.rhodecode_ini.get('email_prefix'), ''),
 
    (_('RhodeCode email from'), c.rhodecode_ini.get('app_email_from'), ''),
 
    (_('Kallithea email from'), c.rhodecode_ini.get('app_email_from'), ''),
 
    (_('Error email from'), c.rhodecode_ini.get('error_email_from'), ''),
 
    (_('Error email recipients'), c.rhodecode_ini.get('email_to'), ''),
 

	
 
    (_('SMTP server'), c.rhodecode_ini.get('smtp_server'), ''),
 
    (_('SMTP username'), c.rhodecode_ini.get('smtp_username'), ''),
 
    (_('SMTP password'), '%s chars' % len(c.rhodecode_ini.get('smtp_password', '')), ''),
kallithea/templates/admin/settings/settings_global.html
Show inline comments
 
@@ -6,13 +6,13 @@ ${h.form(url('admin_settings_global'), m
 
             <div class="field">
 
                <div class="label">
 
                    <label for="rhodecode_title">${_('Site branding')}:</label>
 
                </div>
 
                <div class="input">
 
                    ${h.text('rhodecode_title',size=30)}
 
                    <span class="help-block">${_('Set a custom title for your RhodeCode Service.')}</span>
 
                    <span class="help-block">${_('Set a custom title for your Kallithea Service.')}</span>
 
                </div>
 
             </div>
 

	
 
            <div class="field">
 
                <div class="label">
 
                    <label for="rhodecode_realm">${_('HTTP authentication realm')}:</label>
kallithea/templates/admin/settings/settings_mapping.html
Show inline comments
 
@@ -19,13 +19,13 @@ ${h.form(url('admin_settings_mapping'), 
 
                    <span class="help-block">${_('Each cache data for repositories will be cleaned with this option selected. Use this to reload data and clear cache keys.')}</span>
 

	
 
                    <div class="checkbox">
 
                        ${h.checkbox('hooks',True)}
 
                        <label for="hooks"> ${_('Install GIT hooks')} </label>
 
                    </div>
 
                    <span class="help-block">${_('Verify if RhodeCodes GIT hooks are installed for each repository. Current hooks will be updated to latest version')}</span>
 
                    <span class="help-block">${_('Verify if Kallitheas GIT hooks are installed for each repository. Current hooks will be updated to latest version')}</span>
 
                </div>
 

	
 
                </div>
 
            </div>
 

	
 
            <div class="buttons">
kallithea/templates/admin/settings/settings_search.html
Show inline comments
 
@@ -9,13 +9,13 @@ ${h.form(url('admin_settings_search'), m
 
                <div class="checkboxes">
 
                    <div class="checkbox">
 
                        ${h.checkbox('full_index',True)}
 
                        <label for="full_index">${_('Build from scratch')}</label>
 

	
 
                    </div>
 
                    <span class="help-block">${_('This option completely reindex all the files within RhodeCode for proper fulltext search capabilities.')}</span>
 
                    <span class="help-block">${_('This option completely reindex all the files within Kallithea for proper fulltext search capabilities.')}</span>
 

	
 
                </div>
 
            </div>
 

	
 
            <div class="buttons">
 
            ${h.submit('reindex',_('Reindex'),class_="btn")}
kallithea/templates/admin/settings/settings_system.html
Show inline comments
 
<dl class="dl-horizontal">
 
<%
 
 elems = [
 
    (_('RhodeCode version'), h.literal('%s <b><span style="color:#036185; text-decoration: underline;cursor: pointer" id="check_for_update" >%s</span></b>' % (c.kallithea_version, _('check for updates'))), ''),
 
    (_('Kallithea version'), h.literal('%s <b><span style="color:#036185; text-decoration: underline;cursor: pointer" id="check_for_update" >%s</span></b>' % (c.kallithea_version, _('check for updates'))), ''),
 
    (_('Python version'), c.py_version, ''),
 
    (_('Platform'), c.platform, ''),
 
    (_('GIT version'), c.git_version, ''),
 
    (_('GIT path'), c.rhodecode_ini.get('git_path'), ''),
 
    (_('Upgrade info endpoint'), h.literal('%s <br/><span style="color:#999999">%s.</span>' % (c.rhodecode_update_url, _('Note: please make sure this server can access this url'))), ''),
 
 ]
kallithea/templates/admin/settings/settings_vcs.html
Show inline comments
 
@@ -7,13 +7,13 @@ ${h.form(url('admin_settings'), method='
 
                </div>
 
                <div class="checkboxes">
 
                    <div class="checkbox">
 
                        ${h.checkbox('web_push_ssl', 'True')}
 
                        <label for="web_push_ssl">${_('Require SSL for vcs operations')}</label>
 
                    </div>
 
                    <span class="help-block">${_('Activate to set RhodeCode to require SSL for pushing or pulling. If SSL certificate is missing it will return a HTTP Error 406: Not Acceptable.')}</span>
 
                    <span class="help-block">${_('Activate to set Kallithea to require SSL for pushing or pulling. If SSL certificate is missing it will return a HTTP Error 406: Not Acceptable.')}</span>
 
                </div>
 
             </div>
 

	
 
             <div class="field">
 
                <div class="label label-checkbox">
 
                    <label>${_('Hooks')}:</label>
 
@@ -63,13 +63,13 @@ ${h.form(url('admin_settings'), method='
 
                <div class="label">
 
                    <label for="paths_root_path">${_('Repositories location')}:</label>
 
                </div>
 
                <div class="input">
 
                    ${h.text('paths_root_path',size=60,readonly="readonly", class_="disabled")}
 
                    <span id="path_unlock" class="tooltip" style="cursor: pointer"
 
                            title="${h.tooltip(_('Click to unlock. You must restart RhodeCode in order to make this setting take effect.'))}">
 
                            title="${h.tooltip(_('Click to unlock. You must restart Kallithea in order to make this setting take effect.'))}">
 
                        <div class="btn btn-small"><i id="path_unlock_icon" class="icon-lock"></i></div>
 
                    </span>
 
                    <span class="help-block">${_('Filesystem location where repositories should be stored. After changing this value a restart and rescan of the repository folder are required.')}</span>
 
                </div>
 
            </div>
 
            %else:
kallithea/templates/admin/settings/settings_visual.html
Show inline comments
 
@@ -12,40 +12,40 @@ ${h.form(url('admin_settings_visual'), m
 
                        ${h.checkbox('rhodecode_repository_fields','True')}
 
                        <label for="rhodecode_repository_fields">${_('Use repository extra fields')}</label>
 
                    </div>
 
                    <span class="help-block">${_('Allows storing additional customized fields per repository.')}</span>
 
                    <div class="checkbox">
 
                        ${h.checkbox('rhodecode_show_version','True')}
 
                        <label for="rhodecode_show_version">${_('Show RhodeCode version')}</label>
 
                        <label for="rhodecode_show_version">${_('Show Kallithea version')}</label>
 
                    </div>
 
                    <span class="help-block">${_('Shows or hides a version number of RhodeCode displayed in the footer.')}</span>
 
                    <span class="help-block">${_('Shows or hides a version number of Kallithea displayed in the footer.')}</span>
 

	
 
                    <div class="checkbox">
 
                        ${h.checkbox('rhodecode_use_gravatar','True')}
 
                        <label for="rhodecode_use_gravatar">${_('Use Gravatars in RhodeCode')}</label>
 
                        <label for="rhodecode_use_gravatar">${_('Use Gravatars in Kallithea')}</label>
 
                    </div>
 
                </div>
 
                <div class="field">
 
                    <div class="input">
 
                        ${h.text('rhodecode_gravatar_url', size=80)}
 
                        <span class="help-block">${_('''Gravatar url allows you to use other avatar server application.
 
                                                        Following variables of the URL will be replaced accordingly.
 
                                                        {scheme}    'http' or 'https' sent from running RhodeCode server,
 
                                                        {scheme}    'http' or 'https' sent from running Kallithea server,
 
                                                        {email}     user email,
 
                                                        {md5email}  md5 hash of the user email (like at gravatar.com),
 
                                                        {size}      size of the image that is expected from the server application,
 
                                                        {netloc}    network location/server host of running RhodeCode server''')}</span>
 
                                                        {netloc}    network location/server host of running Kallithea server''')}</span>
 
                    </div>
 
                </div>
 
                <div class="field">
 
                    <div class="input">
 
                        ${h.text('rhodecode_clone_uri_tmpl', size=80)}
 
                        <span class="help-block">${_('''Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:
 
                                                        {scheme} 'http' or 'https' sent from running RhodeCode server,
 
                                                        {scheme} 'http' or 'https' sent from running Kallithea server,
 
                                                        {user}   current user username,
 
                                                        {netloc} network location/server host of running RhodeCode server,
 
                                                        {netloc} network location/server host of running Kallithea server,
 
                                                        {repo}   full repository name,
 
                                                        {repoid} ID of repository, can be used to contruct clone-by-id''')}</span>
 
                    </div>
 
                </div>
 
             </div>
 

	
kallithea/templates/base/base.html
Show inline comments
 
@@ -3,13 +3,13 @@
 

	
 
<!-- HEADER -->
 
<div id="header">
 
    <div id="header-inner" class="title">
 
        <div id="logo">
 
            <div class="header">
 
                <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
 
                <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="Kallithea"/></a>
 
            </div>
 
            %if c.site_name:
 
             <div class="branding">- ${c.site_name}</div>
 
            %endif
 
        </div>
 
        <!-- MENU -->
kallithea/templates/changelog/changelog_summary_data.html
Show inline comments
 
@@ -80,13 +80,13 @@
 
<div class="pagination-wh pagination-left">
 
${c.repo_changesets.pager('$link_previous ~2~ $link_next')}
 
</div>
 
%else:
 

	
 
%if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
 
<h4>${_('Add or upload files directly via RhodeCode')}</h4>
 
<h4>${_('Add or upload files directly via Kallithea')}</h4>
 
<div style="margin: 20px 30px;">
 
  <div id="add_node_id" class="add_node">
 
      <a class="btn btn-mini" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='', anchor='edit')}">${_('Add New File')}</a>
 
  </div>
 
</div>
 
%endif
kallithea/templates/changeset/changeset_file_comment.html
Show inline comments
 
@@ -63,13 +63,13 @@
 
    <div class="overlay"><div class="overlay-text">${_('Submitting...')}</div></div>
 
      ${h.form('#', class_='inline-form')}
 
      <div id="edit-container_{1}" class="clearfix">
 
          <div class="comment-help">${_('Commenting on line {1}.')}
 
          ${(_('Comments parsed using %s syntax with %s support.') % (
 
                 ('<a href="%s">RST</a>' % h.url('rst_help')),
 
                   ('<span style="color:#003367" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user'))
 
                   ('<span style="color:#003367" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this Kallithea user'))
 
               )
 
            )|n
 
           }
 
          <div id="preview-btn_{1}" class="preview-btn btn btn-mini">${_('Preview')}</div>
 
          </div>
 
            <div class="mentions-container" id="mentions_container_{1}"></div>
 
@@ -149,13 +149,13 @@
 
    <div class="comment-form ac">
 
        ${h.form(post_url)}
 
        <div id="edit-container" class="clearfix">
 
            <div class="comment-help">
 
                ${(_('Comments parsed using %s syntax with %s support.') % (('<a href="%s">RST</a>' % h.url('rst_help')),
 
                  '<span style="color:#003367" class="tooltip" title="%s">@mention</span>' %
 
                  _('Use @username inside this text to send notification to this RhodeCode user')))|n}
 
                  _('Use @username inside this text to send notification to this Kallithea user')))|n}
 
              %if change_status:
 
                | <a id="show_changeset_link" onClick="change_status_show();">
 
                  %if is_pr:
 
                    ${_('Vote for pull request status')}
 
                  %else:
 
                    ${_('Change changeset status')}
kallithea/templates/email_templates/main.html
Show inline comments
 
@@ -2,8 +2,8 @@ ${self.body()}
 

	
 

	
 
<div>
 
--
 
<br/>
 
<br/>
 
<b>${_('This is a notification from RhodeCode.')}</b>
 
<b>${_('This is a notification from Kallithea.')}</b>
 
</div>
kallithea/templates/login.html
Show inline comments
 
@@ -10,13 +10,13 @@
 

	
 

	
 
<div id="header">
 
    <div id="header-inner" class="title">
 
        <div id="logo">
 
            <div class="header">
 
                <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
 
                <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="Kallithea"/></a>
 
            </div>
 
            %if c.site_name:
 
             <div class="branding">- ${c.site_name}</div>
 
            %endif
 
        </div>
 
    </div>
kallithea/templates/password_reset.html
Show inline comments
 
@@ -10,13 +10,13 @@
 

	
 

	
 
<div id="header">
 
    <div id="header-inner" class="title">
 
        <div id="logo">
 
            <div class="header">
 
                <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
 
                <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="Kallithea"/></a>
 
            </div>
 
            %if c.site_name:
 
             <div class="branding">- ${c.site_name}</div>
 
            %endif
 
        </div>
 
    </div>
kallithea/templates/register.html
Show inline comments
 
@@ -8,13 +8,13 @@
 
    %endif
 
</%def>
 
<div id="header">
 
    <div id="header-inner" class="title">
 
        <div id="logo">
 
            <div class="header">
 
                <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
 
                <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="Kallithea"/></a>
 
            </div>
 
            %if c.site_name:
 
             <div class="branding">- ${c.site_name}</div>
 
            %endif
 
        </div>
 
    </div>
kallithea/tests/api/api_base.py
Show inline comments
 
@@ -1073,13 +1073,13 @@ class BaseTestApi(object):
 
        id_, params = _build_data(self.apikey_regular, 'create_repo',
 
                                  repo_name=repo_name,
 
                                  repo_type=self.REPO_TYPE,
 
                                  owner=owner)
 
        response = api_call(self, params)
 

	
 
        expected = 'Only RhodeCode admin can specify `owner` param'
 
        expected = 'Only Kallithea admin can specify `owner` param'
 
        self._compare_error(id_, expected, given=response.body)
 
        fixture.destroy_repo(repo_name)
 

	
 
    def test_api_create_repo_exists(self):
 
        repo_name = self.REPO
 
        id_, params = _build_data(self.apikey, 'create_repo',
 
@@ -1282,13 +1282,13 @@ class BaseTestApi(object):
 
        id_, params = _build_data(self.apikey_regular, 'fork_repo',
 
                                  repoid=self.REPO,
 
                                  fork_name=fork_name,
 
                                  owner=TEST_USER_ADMIN_LOGIN,
 
        )
 
        response = api_call(self, params)
 
        expected = 'Only RhodeCode admin can specify `owner` param'
 
        expected = 'Only Kallithea admin can specify `owner` param'
 
        self._compare_error(id_, expected, given=response.body)
 
        fixture.destroy_repo(fork_name)
 

	
 
    def test_api_fork_repo_non_admin_no_permission_to_fork(self):
 
        RepoModel().grant_user_permission(repo=self.REPO,
 
                                          user=self.TEST_USER_LOGIN,
kallithea/tests/functional/test_admin_gists.py
Show inline comments
 
@@ -148,13 +148,13 @@ class TestGistsController(TestController
 
        response = self.app.delete(url('gist', gist_id=gist.gist_id), status=403)
 

	
 
    def test_show(self):
 
        gist = _create_gist('gist-show-me')
 
        response = self.app.get(url('gist', gist_id=gist.gist_access_id))
 
        response.mustcontain('added file: gist-show-me<')
 
        response.mustcontain('test_admin (RhodeCode Admin) - created')
 
        response.mustcontain('test_admin (Kallithea Admin) - created')
 
        response.mustcontain('gist-desc')
 
        response.mustcontain('<div class="btn btn-mini btn-success disabled">Public Gist</div>')
 

	
 
    def test_show_as_raw(self):
 
        gist = _create_gist('gist-show-me', content='GIST CONTENT')
 
        response = self.app.get(url('formatted_gist',
kallithea/tests/functional/test_admin_settings.py
Show inline comments
 
@@ -73,14 +73,14 @@ class TestAdminSettingsController(TestCo
 
    def test_index_system(self):
 
        self.log_user()
 
        response = self.app.get(url('admin_settings_system'))
 

	
 
    def test_ga_code_active(self):
 
        self.log_user()
 
        old_title = 'RhodeCode'
 
        old_realm = 'RhodeCode authentication'
 
        old_title = 'Kallithea'
 
        old_realm = 'Kallithea authentication'
 
        new_ga_code = 'ga-test-123456789'
 
        response = self.app.post(url('admin_settings_global'),
 
                        params=dict(rhodecode_title=old_title,
 
                                 rhodecode_realm=old_realm,
 
                                 rhodecode_ga_code=new_ga_code,
 
                                 rhodecode_captcha_private_key='',
 
@@ -94,14 +94,14 @@ class TestAdminSettingsController(TestCo
 

	
 
        response = response.follow()
 
        response.mustcontain("""_gaq.push(['_setAccount', '%s']);""" % new_ga_code)
 

	
 
    def test_ga_code_inactive(self):
 
        self.log_user()
 
        old_title = 'RhodeCode'
 
        old_realm = 'RhodeCode authentication'
 
        old_title = 'Kallithea'
 
        old_realm = 'Kallithea authentication'
 
        new_ga_code = ''
 
        response = self.app.post(url('admin_settings_global'),
 
                        params=dict(rhodecode_title=old_title,
 
                                 rhodecode_realm=old_realm,
 
                                 rhodecode_ga_code=new_ga_code,
 
                                 rhodecode_captcha_private_key='',
 
@@ -114,14 +114,14 @@ class TestAdminSettingsController(TestCo
 

	
 
        response = response.follow()
 
        response.mustcontain(no=["_gaq.push(['_setAccount', '%s']);" % new_ga_code])
 

	
 
    def test_captcha_activate(self):
 
        self.log_user()
 
        old_title = 'RhodeCode'
 
        old_realm = 'RhodeCode authentication'
 
        old_title = 'Kallithea'
 
        old_realm = 'Kallithea authentication'
 
        new_ga_code = ''
 
        response = self.app.post(url('admin_settings_global'),
 
                        params=dict(rhodecode_title=old_title,
 
                                 rhodecode_realm=old_realm,
 
                                 rhodecode_ga_code=new_ga_code,
 
                                 rhodecode_captcha_private_key='1234567890',
 
@@ -134,14 +134,14 @@ class TestAdminSettingsController(TestCo
 

	
 
        response = self.app.get(url('register'))
 
        response.mustcontain('captcha')
 

	
 
    def test_captcha_deactivate(self):
 
        self.log_user()
 
        old_title = 'RhodeCode'
 
        old_realm = 'RhodeCode authentication'
 
        old_title = 'Kallithea'
 
        old_realm = 'Kallithea authentication'
 
        new_ga_code = ''
 
        response = self.app.post(url('admin_settings_global'),
 
                        params=dict(rhodecode_title=old_title,
 
                                 rhodecode_realm=old_realm,
 
                                 rhodecode_ga_code=new_ga_code,
 
                                 rhodecode_captcha_private_key='',
 
@@ -154,15 +154,15 @@ class TestAdminSettingsController(TestCo
 

	
 
        response = self.app.get(url('register'))
 
        response.mustcontain(no=['captcha'])
 

	
 
    def test_title_change(self):
 
        self.log_user()
 
        old_title = 'RhodeCode'
 
        old_title = 'Kallithea'
 
        new_title = old_title + '_changed'
 
        old_realm = 'RhodeCode authentication'
 
        old_realm = 'Kallithea authentication'
 

	
 
        for new_title in ['Changed', 'Żółwik', old_title]:
 
            response = self.app.post(url('admin_settings_global'),
 
                        params=dict(rhodecode_title=new_title,
 
                                 rhodecode_realm=old_realm,
 
                                 rhodecode_ga_code='',
kallithea/tests/functional/test_login.py
Show inline comments
 
@@ -218,13 +218,13 @@ class TestLoginController(TestController
 
                                             'password_confirmation': password,
 
                                             'email': email,
 
                                             'firstname': name,
 
                                             'lastname': lastname,
 
                                             'admin': True})  # This should be overriden
 
        self.assertEqual(response.status, '302 Found')
 
        self.checkSessionFlash(response, 'You have successfully registered into RhodeCode')
 
        self.checkSessionFlash(response, 'You have successfully registered into Kallithea')
 

	
 
        ret = Session().query(User).filter(User.username == 'test_regular4').one()
 
        self.assertEqual(ret.username, username)
 
        self.assertEqual(check_password(password, ret.password), True)
 
        self.assertEqual(ret.email, email)
 
        self.assertEqual(ret.name, name)
kallithea/tests/other/test_libs.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.tests.test_libs
 
~~~~~~~~~~~~~~~~~~~~~~~~~
 

	
 
Package for testing various lib/helper functions in rhodecode
 
Package for testing various lib/helper functions in kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Jun 9, 2011
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
kallithea/tests/vcs/conf.py
Show inline comments
 
@@ -58,8 +58,8 @@ def get_new_dir(title):
 
PACKAGE_DIR = os.path.abspath(os.path.join(
 
    os.path.dirname(__file__), '..'))
 
_dest = jn(TEST_TMP_PATH, 'aconfig')
 
shutil.copy(jn(THIS, 'aconfig'), _dest)
 
TEST_USER_CONFIG_FILE = _dest
 

	
 
#overide default configurations with rhodecode ones
 
#overide default configurations with kallithea ones
 
from kallithea.tests import *
kallithea/websetup.py
Show inline comments
 
@@ -12,13 +12,13 @@
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
"""
 
kallithea.websetup
 
~~~~~~~~~~~~~~~~~~
 

	
 
Weboperations and setup for rhodecode
 
Weboperations and setup for kallithea
 

	
 
This file was forked by the Kallithea project in July 2014.
 
Original author and date, and relevant copyright and licensing information is below:
 
:created_on: Dec 11, 2010
 
:author: marcink
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
@@ -33,13 +33,13 @@ from kallithea.model.meta import Session
 

	
 

	
 
log = logging.getLogger(__name__)
 

	
 

	
 
def setup_app(command, conf, vars):
 
    """Place any commands to setup rhodecode here"""
 
    """Place any commands to setup kallithea here"""
 
    dbconf = conf['sqlalchemy.db1.url']
 
    dbmanage = DbManage(log_sql=True, dbconf=dbconf, root=conf['here'],
 
                        tests=False, cli_args=command.options.__dict__)
 
    dbmanage.create_tables(override=True)
 
    dbmanage.set_db_version()
 
    opts = dbmanage.config_prompt(None)
production.ini
Show inline comments
 
################################################################################
 
################################################################################
 
# RhodeCode - Pylons environment configuration                                 #
 
# Kallithea - Pylons environment configuration                                 #
 
#                                                                              #
 
# The %(here)s variable will be replaced with the parent directory of this file#
 
################################################################################
 

	
 
[DEFAULT]
 
debug = true
 
pdebug = false
 
################################################################################
 
## Uncomment and replace with the address which should receive                ##
 
## any error reports after application crash                                  ##
 
## Additionally those settings will be used by RhodeCode mailing system       ##
 
## Additionally those settings will be used by Kallithea mailing system       ##
 
################################################################################
 
#email_to = admin@localhost
 
#error_email_from = paste_error@localhost
 
#app_email_from = kallithea-noreply@localhost
 
#error_message =
 
#email_prefix = [RhodeCode]
 
#email_prefix = [Kallithea]
 

	
 
#smtp_server = mail.server.com
 
#smtp_username =
 
#smtp_password =
 
#smtp_port =
 
#smtp_use_tls = false
 
@@ -158,13 +158,13 @@ app_instance_uuid = rc-production
 
## cut off limit for large diffs (size in bytes)
 
cut_off_limit = 256000
 

	
 
## use cache version of scm repo everywhere
 
vcs_full_cache = true
 

	
 
## force https in RhodeCode, fixes https redirects, assumes it's always https
 
## force https in Kallithea, fixes https redirects, assumes it's always https
 
force_https = false
 

	
 
## use Strict-Transport-Security headers
 
use_htsts = false
 

	
 
## number of commits stats will parse on each iteration
 
@@ -189,13 +189,13 @@ 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.kallithea.server/{gistid}. Empty means use the internal
 
## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid>
 
## Kallithea url, ie. http[s]://your.kallithea.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
 
@@ -209,14 +209,14 @@ 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
 
## {email}        user email
 
## {md5email}     md5 hash of the user email (like at gravatar.com)
 
## {size}         size of the image that is expected from the server application
 
## {scheme}       http/https from RhodeCode server
 
## {netloc}       network location from RhodeCode server
 
## {scheme}       http/https from Kallithea server
 
## {netloc}       network location from Kallithea server
 
#alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
 
#alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
 

	
 

	
 
## container auth options
 
container_auth_enabled = false
 
@@ -233,13 +233,13 @@ default_encoding = utf8
 
## pass - password
 
## netloc - network location
 
## path - usually repo_name
 

	
 
#clone_uri = {scheme}://{user}{pass}{netloc}{path}
 

	
 
## issue tracker for RhodeCode (leave blank to disable, absent for default)
 
## issue tracker for Kallithea (leave blank to disable, absent for default)
 
#bugtracker = https://bitbucket.org/conservancy/kallithea/issues
 

	
 
## issue tracking mapping for commits messages
 
## comment out issue_pat, issue_server, issue_prefix to enable
 

	
 
## pattern to get the issues from commit messages
 
@@ -397,13 +397,13 @@ beaker.session.auto = False
 
############################
 

	
 
####################
 
### [errormator] ###
 
####################
 

	
 
## Errormator is tailored to work with RhodeCode, see
 
## Errormator is tailored to work with Kallithea, see
 
## http://errormator.com for details how to obtain an account
 
## you must install python package `errormator_client` to make it work
 

	
 
## errormator enabled
 
errormator = false
 

	
setup.py
Show inline comments
 
# -*- coding: utf-8 -*-
 
import os
 
import sys
 
import platform
 

	
 
if sys.version_info < (2, 5):
 
    raise Exception('RhodeCode requires python 2.5 or later')
 
    raise Exception('Kallithea requires python 2.5 or later')
 

	
 

	
 
here = os.path.abspath(os.path.dirname(__file__))
 

	
 

	
 
def _get_meta_var(name, data, callback_handler=None):
 
@@ -94,13 +94,13 @@ classifiers = [
 
# relative to sys.prefix
 
data_files = []
 

	
 
# additional files that goes into package itself
 
package_data = {'kallithea': ['i18n/*/LC_MESSAGES/*.mo', ], }
 

	
 
description = ('RhodeCode is a fast and powerful management tool '
 
description = ('Kallithea is a fast and powerful management tool '
 
               'for Mercurial and GIT with a built in push/pull server, '
 
               'full text search and code-review.')
 

	
 
keywords = ' '.join([
 
    'kallithea', 'mercurial', 'git', 'code review',
 
    'repo groups', 'ldap', 'repository management', 'hgweb replacement',
 
@@ -128,13 +128,13 @@ except ImportError:
 
    use_setuptools()
 
    from setuptools import setup, find_packages
 
# packages
 
packages = find_packages(exclude=['ez_setup'])
 

	
 
setup(
 
    name='RhodeCode',
 
    name='Kallithea',
 
    version=__version__,
 
    description=description,
 
    long_description=long_description,
 
    keywords=keywords,
 
    license=__license__,
 
    author=__author__,
test.ini
Show inline comments
 
################################################################################
 
################################################################################
 
# RhodeCode - Pylons environment configuration                                 #
 
# Kallithea - Pylons environment configuration                                 #
 
#                                                                              #
 
# The %(here)s variable will be replaced with the parent directory of this file#
 
################################################################################
 

	
 
[DEFAULT]
 
debug = true
 
pdebug = false
 
################################################################################
 
## Uncomment and replace with the address which should receive                ##
 
## any error reports after application crash                                  ##
 
## Additionally those settings will be used by RhodeCode mailing system       ##
 
## Additionally those settings will be used by Kallithea mailing system       ##
 
################################################################################
 
#email_to = admin@localhost
 
#error_email_from = paste_error@localhost
 
#app_email_from = kallithea-noreply@localhost
 
#error_message =
 
#email_prefix = [RhodeCode]
 
#email_prefix = [Kallithea]
 

	
 
#smtp_server = mail.server.com
 
#smtp_username =
 
#smtp_password =
 
#smtp_port =
 
#smtp_use_tls = false
 
@@ -81,13 +81,13 @@ app_instance_uuid = rc-production
 
## cut off limit for large diffs (size in bytes)
 
cut_off_limit = 256000
 

	
 
## use cache version of scm repo everywhere
 
vcs_full_cache = false
 

	
 
## force https in RhodeCode, fixes https redirects, assumes it's always https
 
## force https in Kallithea, fixes https redirects, assumes it's always https
 
force_https = false
 

	
 
## use Strict-Transport-Security headers
 
use_htsts = false
 

	
 
## number of commits stats will parse on each iteration
 
@@ -118,14 +118,14 @@ show_revision_number = true
 

	
 
## alternative_gravatar_url allows you to use your own avatar server application
 
## the following parts of the URL will be replaced
 
## {email}        user email
 
## {md5email}     md5 hash of the user email (like at gravatar.com)
 
## {size}         size of the image that is expected from the server application
 
## {scheme}       http/https from RhodeCode server
 
## {netloc}       network location from RhodeCode server
 
## {scheme}       http/https from Kallithea server
 
## {netloc}       network location from Kallithea server
 
#alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
 
#alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
 

	
 

	
 
## container auth options
 
container_auth_enabled = false
 
@@ -295,13 +295,13 @@ beaker.session.auto = False
 
############################
 

	
 
####################
 
### [errormator] ###
 
####################
 

	
 
## Errormator is tailored to work with RhodeCode, see
 
## Errormator is tailored to work with Kallithea, see
 
## http://errormator.com for details how to obtain an account
 
## you must install python package `errormator_client` to make it work
 

	
 
## errormator enabled
 
errormator = false
 

	
0 comments (0 inline, 0 general)