diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -20,7 +20,7 @@ syntax: regexp ^\.coverage$ ^kallithea\.db$ ^test\.db$ -^RhodeCode\.egg-info$ +^Kallithea\.egg-info$ ^rc.*\.ini$ ^fabfile.py ^\.idea$ diff --git a/CONTRIBUTORS b/CONTRIBUTORS --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,4 +1,4 @@ -List of contributors to RhodeCode project: +List of contributors to Kallithea project: Marcin Kuźmiński Lukasz Balcerzak Jason Harris @@ -42,6 +42,6 @@ List of contributors to RhodeCode projec Jelmer Vernooij larikale SteveCohen - RhodeCode GmbH + Kallithea GmbH Sebastian Kreutzberger thomas diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -1,29 +1,29 @@ ========= -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 `_ +Kallithea uses `PEP386 versioning `_ Installation ------------ -Stable releases of RhodeCode are best installed via:: +Stable releases of Kallithea are best installed via:: easy_install kallithea @@ -51,7 +51,7 @@ https://bitbucket.org/conservancy/kallit -RhodeCode Features +Kallithea Features ------------------ - Has its own middleware to handle mercurial_ and git_ protocol requests. @@ -68,7 +68,7 @@ RhodeCode Features - 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. @@ -113,7 +113,7 @@ Incoming / Plans License ------- -``RhodeCode`` is released under the GPLv3 license. +``Kallithea`` is released under the GPLv3 license. Getting help @@ -137,7 +137,7 @@ You can follow this project on Twitter, 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/ diff --git a/development.ini b/development.ini --- a/development.ini +++ b/development.ini @@ -1,6 +1,6 @@ ################################################################################ ################################################################################ -# RhodeCode - Pylons environment configuration # +# Kallithea - Pylons environment configuration # # # # The %(here)s variable will be replaced with the parent directory of this file# ################################################################################ @@ -11,13 +11,13 @@ 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 = @@ -161,7 +161,7 @@ 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 @@ -192,7 +192,7 @@ 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/. ## example: http://gist.kallithea.server/{gistid}. Empty means use the internal -## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/ +## Kallithea url, ie. http[s]://your.kallithea.server/_admin/gists/ gist_alias_url = ## white list of API enabled controllers. This allows to add list of @@ -212,8 +212,8 @@ api_access_controllers_whitelist = ## {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} @@ -236,7 +236,7 @@ default_encoding = utf8 #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 @@ -400,7 +400,7 @@ 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 diff --git a/init.d/celeryd-upstart.conf b/init.d/celeryd-upstart.conf --- a/init.d/celeryd-upstart.conf +++ b/init.d/celeryd-upstart.conf @@ -2,7 +2,7 @@ # 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 --apihost=http://your.kallithea.server --save-config" ) - parser = argparse.ArgumentParser(description='RhodeCode API cli', + parser = argparse.ArgumentParser(description='Kallithea API cli', usage=usage) ## config diff --git a/kallithea/bin/kallithea_config.py b/kallithea/bin/kallithea_config.py --- a/kallithea/bin/kallithea_config.py +++ b/kallithea/bin/kallithea_config.py @@ -15,7 +15,7 @@ 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: @@ -44,7 +44,7 @@ def argparser(argv): ) parser = argparse.ArgumentParser( - description='RhodeCode CONFIG generator with variable replacement', + description='Kallithea CONFIG generator with variable replacement', usage=usage ) diff --git a/kallithea/bin/kallithea_gist.py b/kallithea/bin/kallithea_gist.py --- a/kallithea/bin/kallithea_gist.py +++ b/kallithea/bin/kallithea_gist.py @@ -15,7 +15,7 @@ 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: @@ -43,7 +43,7 @@ def argparser(argv): "Create config file: kallithea-gist --apikey= --apihost=http://your.kallithea.server --save-config" ) - parser = argparse.ArgumentParser(description='RhodeCode Gist cli', + parser = argparse.ArgumentParser(description='Kallithea Gist cli', usage=usage) ## config diff --git a/kallithea/bin/ldap_sync.py b/kallithea/bin/ldap_sync.py --- a/kallithea/bin/ldap_sync.py +++ b/kallithea/bin/ldap_sync.py @@ -75,7 +75,7 @@ class API(object): } 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. @@ -99,7 +99,7 @@ class API(object): 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) @@ -208,7 +208,7 @@ class LdapSync(object): 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: diff --git a/kallithea/bin/template.ini.mako b/kallithea/bin/template.ini.mako --- a/kallithea/bin/template.ini.mako +++ b/kallithea/bin/template.ini.mako @@ -2,7 +2,7 @@ <%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 # @@ -15,14 +15,14 @@ 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 = @@ -170,7 +170,7 @@ cut_off_limit = 256000 <%text>## use cache version of scm repo everywhere vcs_full_cache = true -<%text>## force https in RhodeCode, fixes https redirects, assumes it's always https +<%text>## force https in Kallithea, fixes https redirects, assumes it's always https force_https = false <%text>## use Strict-Transport-Security headers @@ -201,7 +201,7 @@ show_revision_number = true <%text>## gist URL alias, used to create nicer urls for gist. This should be an <%text>## url that does rewrites to _admin/gists/. <%text>## example: http://gist.kallithea.server/{gistid}. Empty means use the internal -<%text>## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/ +<%text>## Kallithea url, ie. http[s]://your.kallithea.server/_admin/gists/ gist_alias_url = <%text>## white list of API enabled controllers. This allows to add list of @@ -216,8 +216,8 @@ api_access_controllers_whitelist = <%text>## {email} user email <%text>## {md5email} md5 hash of the user email (like at gravatar.com) <%text>## {size} size of the image that is expected from the server application -<%text>## {scheme} http/https from RhodeCode server -<%text>## {netloc} network location from RhodeCode server +<%text>## {scheme} http/https from Kallithea server +<%text>## {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} @@ -240,7 +240,7 @@ default_encoding = utf8 #clone_uri = {scheme}://{user}{pass}{netloc}{path} -<%text>## issue tracker for RhodeCode (leave blank to disable, absent for default) +<%text>## issue tracker for Kallithea (leave blank to disable, absent for default) #bugtracker = https://bitbucket.org/conservancy/kallithea/issues <%text>## issue tracking mapping for commits messages @@ -407,7 +407,7 @@ 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 diff --git a/kallithea/config/conf.py b/kallithea/config/conf.py --- a/kallithea/config/conf.py +++ b/kallithea/config/conf.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/config/deployment.ini_tmpl b/kallithea/config/deployment.ini_tmpl --- a/kallithea/config/deployment.ini_tmpl +++ b/kallithea/config/deployment.ini_tmpl @@ -1,6 +1,6 @@ ################################################################################ ################################################################################ -# RhodeCode - Pylons environment configuration # +# Kallithea - Pylons environment configuration # # # # The %(here)s variable will be replaced with the parent directory of this file# ################################################################################ @@ -11,13 +11,13 @@ 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 = @@ -161,7 +161,7 @@ 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 @@ -192,7 +192,7 @@ 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/. ## example: http://gist.kallithea.server/{gistid}. Empty means use the internal -## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/ +## Kallithea url, ie. http[s]://your.kallithea.server/_admin/gists/ gist_alias_url = ## white list of API enabled controllers. This allows to add list of @@ -212,8 +212,8 @@ api_access_controllers_whitelist = ## {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} @@ -236,7 +236,7 @@ default_encoding = utf8 #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 @@ -400,7 +400,7 @@ 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 diff --git a/kallithea/config/environment.py b/kallithea/config/environment.py --- a/kallithea/config/environment.py +++ b/kallithea/config/environment.py @@ -63,7 +63,7 @@ def load_environment(global_conf, app_co # 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')) diff --git a/kallithea/config/post_receive_tmpl.py b/kallithea/config/post_receive_tmpl.py --- a/kallithea/config/post_receive_tmpl.py +++ b/kallithea/config/post_receive_tmpl.py @@ -16,16 +16,16 @@ except ImportError: 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) diff --git a/kallithea/config/pre_receive_tmpl.py b/kallithea/config/pre_receive_tmpl.py --- a/kallithea/config/pre_receive_tmpl.py +++ b/kallithea/config/pre_receive_tmpl.py @@ -16,16 +16,16 @@ except ImportError: 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) diff --git a/kallithea/config/rcextensions/__init__.py b/kallithea/config/rcextensions/__init__.py --- a/kallithea/config/rcextensions/__init__.py +++ b/kallithea/config/rcextensions/__init__.py @@ -173,7 +173,7 @@ DELETE_USER_HOOK = _dluserhook #============================================================================== # 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 @@ -197,7 +197,7 @@ PUSH_HOOK = _pushhook #============================================================================== # 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 diff --git a/kallithea/controllers/admin/admin.py b/kallithea/controllers/admin/admin.py --- a/kallithea/controllers/admin/admin.py +++ b/kallithea/controllers/admin/admin.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/admin/auth_settings.py b/kallithea/controllers/admin/auth_settings.py --- a/kallithea/controllers/admin/auth_settings.py +++ b/kallithea/controllers/admin/auth_settings.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/admin/defaults.py b/kallithea/controllers/admin/defaults.py --- a/kallithea/controllers/admin/defaults.py +++ b/kallithea/controllers/admin/defaults.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/admin/gists.py b/kallithea/controllers/admin/gists.py --- a/kallithea/controllers/admin/gists.py +++ b/kallithea/controllers/admin/gists.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/admin/my_account.py b/kallithea/controllers/admin/my_account.py --- a/kallithea/controllers/admin/my_account.py +++ b/kallithea/controllers/admin/my_account.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/admin/notifications.py b/kallithea/controllers/admin/notifications.py --- a/kallithea/controllers/admin/notifications.py +++ b/kallithea/controllers/admin/notifications.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/admin/permissions.py b/kallithea/controllers/admin/permissions.py --- a/kallithea/controllers/admin/permissions.py +++ b/kallithea/controllers/admin/permissions.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/admin/repo_groups.py b/kallithea/controllers/admin/repo_groups.py --- a/kallithea/controllers/admin/repo_groups.py +++ b/kallithea/controllers/admin/repo_groups.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/admin/repos.py b/kallithea/controllers/admin/repos.py --- a/kallithea/controllers/admin/repos.py +++ b/kallithea/controllers/admin/repos.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/admin/settings.py b/kallithea/controllers/admin/settings.py --- a/kallithea/controllers/admin/settings.py +++ b/kallithea/controllers/admin/settings.py @@ -15,7 +15,7 @@ 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: @@ -351,9 +351,9 @@ class SettingsController(BaseController) 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')) @@ -494,7 +494,7 @@ class SettingsController(BaseController) 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) diff --git a/kallithea/controllers/admin/users.py b/kallithea/controllers/admin/users.py --- a/kallithea/controllers/admin/users.py +++ b/kallithea/controllers/admin/users.py @@ -123,7 +123,7 @@ class UsersController(BaseController): 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: @@ -153,7 +153,7 @@ class UsersController(BaseController): 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): diff --git a/kallithea/controllers/api/api.py b/kallithea/controllers/api/api.py --- a/kallithea/controllers/api/api.py +++ b/kallithea/controllers/api/api.py @@ -15,7 +15,7 @@ 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: @@ -473,7 +473,7 @@ class ApiController(JSONRPCController): @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 @@ -514,7 +514,7 @@ class ApiController(JSONRPCController): @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 @@ -526,7 +526,7 @@ class ApiController(JSONRPCController): 'modules': [,...] 'py_version': , 'platform': , - 'kallithea_version': + 'kallithea_version': } error : null """ @@ -1456,7 +1456,7 @@ class ApiController(JSONRPCController): 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 @@ -1650,7 +1650,7 @@ class ApiController(JSONRPCController): 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,)) diff --git a/kallithea/controllers/bookmarks.py b/kallithea/controllers/bookmarks.py --- a/kallithea/controllers/bookmarks.py +++ b/kallithea/controllers/bookmarks.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/branches.py b/kallithea/controllers/branches.py --- a/kallithea/controllers/branches.py +++ b/kallithea/controllers/branches.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/changelog.py b/kallithea/controllers/changelog.py --- a/kallithea/controllers/changelog.py +++ b/kallithea/controllers/changelog.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/error.py b/kallithea/controllers/error.py --- a/kallithea/controllers/error.py +++ b/kallithea/controllers/error.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/feed.py b/kallithea/controllers/feed.py --- a/kallithea/controllers/feed.py +++ b/kallithea/controllers/feed.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/files.py b/kallithea/controllers/files.py --- a/kallithea/controllers/files.py +++ b/kallithea/controllers/files.py @@ -15,7 +15,7 @@ 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: @@ -321,7 +321,7 @@ 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) - 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 @@ -384,7 +384,7 @@ class FilesController(BaseRepoController 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: @@ -437,7 +437,7 @@ class FilesController(BaseRepoController 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: diff --git a/kallithea/controllers/followers.py b/kallithea/controllers/followers.py --- a/kallithea/controllers/followers.py +++ b/kallithea/controllers/followers.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/forks.py b/kallithea/controllers/forks.py --- a/kallithea/controllers/forks.py +++ b/kallithea/controllers/forks.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/home.py b/kallithea/controllers/home.py --- a/kallithea/controllers/home.py +++ b/kallithea/controllers/home.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/login.py b/kallithea/controllers/login.py --- a/kallithea/controllers/login.py +++ b/kallithea/controllers/login.py @@ -15,7 +15,7 @@ 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: @@ -190,7 +190,7 @@ class LoginController(BaseController): 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')) diff --git a/kallithea/controllers/pullrequests.py b/kallithea/controllers/pullrequests.py --- a/kallithea/controllers/pullrequests.py +++ b/kallithea/controllers/pullrequests.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/search.py b/kallithea/controllers/search.py --- a/kallithea/controllers/search.py +++ b/kallithea/controllers/search.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/summary.py b/kallithea/controllers/summary.py --- a/kallithea/controllers/summary.py +++ b/kallithea/controllers/summary.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/controllers/tags.py b/kallithea/controllers/tags.py --- a/kallithea/controllers/tags.py +++ b/kallithea/controllers/tags.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/i18n/de/LC_MESSAGES/kallithea.po b/kallithea/i18n/de/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po @@ -1,16 +1,16 @@ -# 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 , 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 \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" @@ -138,7 +138,7 @@ 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 @@ -157,7 +157,7 @@ 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 @@ -170,7 +170,7 @@ 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 @@ -275,7 +275,7 @@ 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 @@ -1102,7 +1102,7 @@ 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 @@ -1319,8 +1319,8 @@ msgstr "Repository Gruppe hat Administra #: 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 @@ -1393,15 +1393,15 @@ msgstr "Registrierung deaktiviert" #: 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 @@ -1704,7 +1704,7 @@ 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 @@ -1755,7 +1755,7 @@ 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 @@ -2321,7 +2321,7 @@ 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 @@ -2929,7 +2929,7 @@ 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 "" @@ -3298,7 +3298,7 @@ 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 @@ -3417,7 +3417,7 @@ 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 "" @@ -3630,7 +3630,7 @@ 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 @@ -3682,7 +3682,7 @@ 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 @@ -3742,7 +3742,7 @@ 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 @@ -3778,7 +3778,7 @@ 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 @@ -3817,7 +3817,7 @@ 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 "" @@ -3835,7 +3835,7 @@ 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 "" @@ -3889,7 +3889,7 @@ 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 "" @@ -3933,7 +3933,7 @@ 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 "" @@ -3956,34 +3956,34 @@ msgid "Allows storing additional customi 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 "" @@ -4698,7 +4698,7 @@ 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 @@ -4844,7 +4844,7 @@ 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 @@ -5009,7 +5009,7 @@ msgid "The changeset status was changed 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 diff --git a/kallithea/i18n/en/LC_MESSAGES/kallithea.po b/kallithea/i18n/en/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/en/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/en/LC_MESSAGES/kallithea.po @@ -1,11 +1,11 @@ -# 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 , 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" @@ -122,7 +122,7 @@ 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 @@ -139,7 +139,7 @@ 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 @@ -212,7 +212,7 @@ 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 @@ -969,7 +969,7 @@ 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 @@ -1156,7 +1156,7 @@ msgstr "" #: 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 @@ -1202,14 +1202,14 @@ msgstr "" #: 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 @@ -1357,7 +1357,7 @@ 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 @@ -1408,7 +1408,7 @@ 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 @@ -2604,7 +2604,7 @@ 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 "" @@ -2919,11 +2919,11 @@ msgid "Allows storing additional customi 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 @@ -2974,7 +2974,7 @@ 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 "" @@ -3026,7 +3026,7 @@ 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 "" @@ -3697,7 +3697,7 @@ 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 @@ -3828,7 +3828,7 @@ 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 @@ -3990,7 +3990,7 @@ msgid "The changeset status was changed 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 diff --git a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po @@ -1,16 +1,16 @@ -# 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 , 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 \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" @@ -138,7 +138,7 @@ 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 @@ -157,8 +157,8 @@ 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" @@ -170,8 +170,8 @@ 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" @@ -275,8 +275,8 @@ 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" @@ -1102,8 +1102,8 @@ 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" @@ -1319,8 +1319,8 @@ msgstr "Accès administrateur au groupe de dépôts" #: 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 @@ -1393,15 +1393,15 @@ msgstr "Enregistrement désactivé" #: 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 @@ -1704,7 +1704,7 @@ 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 @@ -1755,7 +1755,7 @@ 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 @@ -2321,7 +2321,7 @@ 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 @@ -2929,7 +2929,7 @@ 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 "" @@ -3298,7 +3298,7 @@ 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 @@ -3417,7 +3417,7 @@ 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 "" @@ -3630,7 +3630,7 @@ 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 @@ -3682,7 +3682,7 @@ 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 @@ -3742,7 +3742,7 @@ 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 @@ -3778,7 +3778,7 @@ 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 @@ -3817,7 +3817,7 @@ 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 "" @@ -3835,7 +3835,7 @@ 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 "" @@ -3889,7 +3889,7 @@ 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 "" @@ -3933,7 +3933,7 @@ 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 "" @@ -3956,34 +3956,34 @@ msgid "Allows storing additional customi 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 "" @@ -4698,8 +4698,8 @@ 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 @@ -4844,8 +4844,8 @@ 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 @@ -5009,7 +5009,7 @@ msgid "The changeset status was changed 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 diff --git a/kallithea/i18n/how_to b/kallithea/i18n/how_to --- a/kallithea/i18n/how_to +++ b/kallithea/i18n/how_to @@ -4,14 +4,14 @@ 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 @@ -62,6 +62,6 @@ Edit test.ini file and set lang attribut lang= -Run RhodeCode tests by executing:: +Run Kallithea tests by executing:: nosetests diff --git a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po @@ -1,6 +1,6 @@ -# 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 @@ -12,12 +12,12 @@ # whosaysni , 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 \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" @@ -145,8 +145,8 @@ 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 @@ -164,8 +164,8 @@ 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" @@ -177,8 +177,8 @@ 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" @@ -282,8 +282,8 @@ 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" @@ -1109,8 +1109,8 @@ 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" @@ -1320,8 +1320,8 @@ msgstr "リポジトリグループに管理権限でアクセス" #: 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 @@ -1394,15 +1394,15 @@ msgstr "新規登録を無効にする" #: 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 @@ -1705,8 +1705,8 @@ 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 @@ -1756,8 +1756,8 @@ 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" @@ -2321,8 +2321,8 @@ 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" @@ -2929,9 +2929,9 @@ 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 "" @@ -3297,8 +3297,8 @@ 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 @@ -3415,9 +3415,9 @@ 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" @@ -3628,8 +3628,8 @@ 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" @@ -3680,8 +3680,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" @@ -3740,8 +3740,8 @@ 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" @@ -3776,8 +3776,8 @@ 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 "" @@ -3815,9 +3815,9 @@ 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" @@ -3833,9 +3833,9 @@ 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" @@ -3887,7 +3887,7 @@ 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を返します。" @@ -3931,9 +3931,9 @@ 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 "" @@ -3954,37 +3954,37 @@ msgid "Allows storing additional customi 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" @@ -4695,8 +4695,8 @@ 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 @@ -4837,8 +4837,8 @@ 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 @@ -5001,8 +5001,8 @@ msgid "The changeset status was changed 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 diff --git a/kallithea/i18n/kallithea.pot b/kallithea/i18n/kallithea.pot --- a/kallithea/i18n/kallithea.pot +++ b/kallithea/i18n/kallithea.pot @@ -1,11 +1,11 @@ -# 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 , 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" @@ -131,7 +131,7 @@ 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 @@ -150,7 +150,7 @@ 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 @@ -163,7 +163,7 @@ 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 @@ -266,7 +266,7 @@ 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 @@ -1081,7 +1081,7 @@ 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 @@ -1296,7 +1296,7 @@ msgstr "" #: 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 @@ -1370,14 +1370,14 @@ msgstr "" #: 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 @@ -1679,7 +1679,7 @@ 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 @@ -1728,7 +1728,7 @@ 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 @@ -2284,7 +2284,7 @@ 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 @@ -2885,7 +2885,7 @@ 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 @@ -3230,7 +3230,7 @@ msgid "Repository \"%(repo_name)s\" is b 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 @@ -3342,7 +3342,7 @@ 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 @@ -3552,7 +3552,7 @@ 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 @@ -3604,7 +3604,7 @@ 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 @@ -3660,7 +3660,7 @@ 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 @@ -3696,7 +3696,7 @@ 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 @@ -3728,7 +3728,7 @@ 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 @@ -3744,7 +3744,7 @@ 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 @@ -3796,7 +3796,7 @@ 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 @@ -3836,7 +3836,7 @@ 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 @@ -3856,34 +3856,34 @@ msgid "Allows storing additional customi 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 "" @@ -4588,7 +4588,7 @@ 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 @@ -4733,7 +4733,7 @@ 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 @@ -4898,7 +4898,7 @@ msgid "The changeset status was changed 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 diff --git a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po @@ -1,6 +1,6 @@ -# 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 , 2013 # FIRST AUTHOR , 2010 @@ -9,12 +9,12 @@ # Nemcio , 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 \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" @@ -142,7 +142,7 @@ 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 @@ -161,8 +161,8 @@ 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" @@ -174,8 +174,8 @@ 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" @@ -279,7 +279,7 @@ 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 @@ -1106,8 +1106,8 @@ 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" @@ -1329,7 +1329,7 @@ msgstr "Repozytoria Grupy dostęp administratora" #: 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 @@ -1403,14 +1403,14 @@ msgstr "Rejestracja wyłączona" #: 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 @@ -1714,7 +1714,7 @@ 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 @@ -1765,7 +1765,7 @@ 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 @@ -2332,7 +2332,7 @@ 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 @@ -2940,7 +2940,7 @@ 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 "" @@ -3310,7 +3310,7 @@ 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 @@ -3430,7 +3430,7 @@ 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" @@ -3643,7 +3643,7 @@ 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 @@ -3695,7 +3695,7 @@ 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 @@ -3755,7 +3755,7 @@ 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 @@ -3791,7 +3791,7 @@ 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 @@ -3830,7 +3830,7 @@ 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 "" @@ -3848,7 +3848,7 @@ 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 "" @@ -3902,7 +3902,7 @@ 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 "" @@ -3946,9 +3946,9 @@ 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 "" @@ -3969,34 +3969,34 @@ msgid "Allows storing additional customi 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 "" @@ -4712,7 +4712,7 @@ 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 @@ -4862,7 +4862,7 @@ 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 @@ -5028,7 +5028,7 @@ msgid "The changeset status was changed 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 diff --git a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po @@ -1,17 +1,17 @@ -# 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 , 2012 # gnustavo , 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 \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" @@ -139,7 +139,7 @@ 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 @@ -158,8 +158,8 @@ 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" @@ -171,8 +171,8 @@ 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" @@ -276,8 +276,8 @@ 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" @@ -1103,8 +1103,8 @@ 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" @@ -1320,8 +1320,8 @@ msgstr "Acesso administrativo ao Grupo de Repositórios" #: 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 @@ -1394,15 +1394,15 @@ msgstr "Registro desabilitado" #: 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 @@ -1705,8 +1705,8 @@ 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 @@ -1756,8 +1756,8 @@ 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" @@ -2322,7 +2322,7 @@ 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 @@ -2930,7 +2930,7 @@ 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 "" @@ -3299,7 +3299,7 @@ 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 @@ -3418,9 +3418,9 @@ 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" @@ -3631,7 +3631,7 @@ 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 @@ -3683,7 +3683,7 @@ 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 @@ -3743,7 +3743,7 @@ 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 @@ -3779,7 +3779,7 @@ 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 @@ -3818,7 +3818,7 @@ 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 "" @@ -3836,7 +3836,7 @@ 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 "" @@ -3890,7 +3890,7 @@ 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 "" @@ -3934,9 +3934,9 @@ 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 "" @@ -3957,34 +3957,34 @@ msgid "Allows storing additional customi 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 "" @@ -4699,8 +4699,8 @@ 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 @@ -4845,8 +4845,8 @@ 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 @@ -5010,8 +5010,8 @@ msgid "The changeset status was changed 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 diff --git a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po @@ -1,6 +1,6 @@ -# 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 , 2013 # mokeev1995 , 2013 @@ -22,12 +22,12 @@ # Mikhail Zholobov , 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 \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" @@ -155,7 +155,7 @@ 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 @@ -174,8 +174,8 @@ 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" @@ -187,8 +187,8 @@ 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" @@ -292,8 +292,8 @@ 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" @@ -1119,8 +1119,8 @@ 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" @@ -1342,8 +1342,8 @@ msgstr "Группа Репозиториев - администрирование" #: 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 @@ -1416,15 +1416,15 @@ msgstr "Регистрация отключена" #: 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 @@ -1727,8 +1727,8 @@ 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 @@ -1778,8 +1778,8 @@ 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" @@ -2345,8 +2345,8 @@ 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" @@ -2953,7 +2953,7 @@ 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 "" @@ -3323,7 +3323,7 @@ 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 @@ -3443,9 +3443,9 @@ 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" @@ -3656,7 +3656,7 @@ 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 @@ -3708,7 +3708,7 @@ 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 @@ -3768,7 +3768,7 @@ 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 @@ -3804,7 +3804,7 @@ 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 @@ -3843,7 +3843,7 @@ 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 "" @@ -3861,7 +3861,7 @@ 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 "" @@ -3915,7 +3915,7 @@ 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 "" @@ -3959,9 +3959,9 @@ 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 "" @@ -3982,34 +3982,34 @@ msgid "Allows storing additional customi 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 "" @@ -4725,8 +4725,8 @@ 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 @@ -4875,8 +4875,8 @@ 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 @@ -5041,8 +5041,8 @@ msgid "The changeset status was changed 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 diff --git a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po @@ -1,18 +1,18 @@ -# 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 , 2011 # mikespook , 2012 # xpol , 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 \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" @@ -140,7 +140,7 @@ 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 @@ -159,7 +159,7 @@ 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 @@ -172,7 +172,7 @@ 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 @@ -277,7 +277,7 @@ 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 @@ -1104,8 +1104,8 @@ 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" @@ -1157,7 +1157,7 @@ msgstr "" 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 @@ -1315,8 +1315,8 @@ msgstr "版本库组管理权限" #: 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 @@ -1389,14 +1389,14 @@ msgstr "禁用注册" #: 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 @@ -1700,7 +1700,7 @@ 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 @@ -1751,7 +1751,7 @@ 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 @@ -2316,7 +2316,7 @@ 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 @@ -2924,7 +2924,7 @@ 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 "" @@ -3292,7 +3292,7 @@ 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 @@ -3410,7 +3410,7 @@ 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 "" @@ -3623,7 +3623,7 @@ 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 @@ -3675,7 +3675,7 @@ 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 @@ -3735,7 +3735,7 @@ 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 @@ -3771,7 +3771,7 @@ 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 @@ -3810,7 +3810,7 @@ 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 "" @@ -3828,7 +3828,7 @@ 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 "" @@ -3882,7 +3882,7 @@ 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 "" @@ -3926,7 +3926,7 @@ 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 "" @@ -3949,34 +3949,34 @@ msgid "Allows storing additional customi 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 "" @@ -4690,8 +4690,8 @@ 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 @@ -4832,8 +4832,8 @@ 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 @@ -4996,8 +4996,8 @@ msgid "The changeset status was changed 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 diff --git a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po @@ -1,16 +1,16 @@ -# 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 , 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 \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" @@ -138,7 +138,7 @@ 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 @@ -157,7 +157,7 @@ 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 @@ -170,7 +170,7 @@ 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 @@ -275,7 +275,7 @@ 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 @@ -1102,7 +1102,7 @@ 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 @@ -1313,7 +1313,7 @@ msgstr "" #: 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 @@ -1387,14 +1387,14 @@ msgstr "" #: 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 @@ -1698,7 +1698,7 @@ 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 @@ -1749,7 +1749,7 @@ 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 @@ -2314,7 +2314,7 @@ 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 @@ -2922,7 +2922,7 @@ 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 "" @@ -3290,7 +3290,7 @@ 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 @@ -3408,7 +3408,7 @@ 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 "" @@ -3621,7 +3621,7 @@ 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 @@ -3673,7 +3673,7 @@ 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 @@ -3733,7 +3733,7 @@ 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 @@ -3769,7 +3769,7 @@ 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 @@ -3808,7 +3808,7 @@ 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 "" @@ -3826,7 +3826,7 @@ 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 "" @@ -3880,7 +3880,7 @@ 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 "" @@ -3924,7 +3924,7 @@ 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 "" @@ -3947,34 +3947,34 @@ msgid "Allows storing additional customi 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 "" @@ -4688,7 +4688,7 @@ 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 @@ -4830,7 +4830,7 @@ 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 @@ -4994,7 +4994,7 @@ msgid "The changeset status was changed 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 diff --git a/kallithea/lib/__init__.py b/kallithea/lib/__init__.py --- a/kallithea/lib/__init__.py +++ b/kallithea/lib/__init__.py @@ -15,7 +15,7 @@ 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: @@ -47,7 +47,7 @@ def get_current_revision(quiet=False): 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 diff --git a/kallithea/lib/annotate.py b/kallithea/lib/annotate.py --- a/kallithea/lib/annotate.py +++ b/kallithea/lib/annotate.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/lib/auth.py b/kallithea/lib/auth.py --- a/kallithea/lib/auth.py +++ b/kallithea/lib/auth.py @@ -476,7 +476,7 @@ def allowed_api_access(controller_name, 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 diff --git a/kallithea/lib/auth_modules/__init__.py b/kallithea/lib/auth_modules/__init__.py --- a/kallithea/lib/auth_modules/__init__.py +++ b/kallithea/lib/auth_modules/__init__.py @@ -45,7 +45,7 @@ class LazyFormencode(object): return formencode_obj(*self.args, **self.kwargs) -class RhodeCodeAuthPluginBase(object): +class KallitheaAuthPluginBase(object): auth_func_attrs = { "username": "unique username", "firstname": "first name", @@ -54,16 +54,16 @@ class RhodeCodeAuthPluginBase(object): "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. @@ -136,7 +136,7 @@ class RhodeCodeAuthPluginBase(object): :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) @@ -175,7 +175,7 @@ class RhodeCodeAuthPluginBase(object): '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") @@ -216,7 +216,7 @@ class RhodeCodeAuthPluginBase(object): 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") @@ -244,7 +244,7 @@ class RhodeCodeAuthPluginBase(object): 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 @@ -256,14 +256,14 @@ class RhodeCodeExternalAuthPlugin(RhodeC 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: @@ -306,15 +306,15 @@ 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): @@ -327,9 +327,9 @@ def importplugin(plugin): % (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 @@ -340,8 +340,8 @@ def loadplugin(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 @@ -367,7 +367,7 @@ def authenticate(username, password, env 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(): @@ -395,9 +395,9 @@ def authenticate(username, password, env 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, diff --git a/kallithea/lib/auth_modules/auth_container.py b/kallithea/lib/auth_modules/auth_container.py --- a/kallithea/lib/auth_modules/auth_container.py +++ b/kallithea/lib/auth_modules/auth_container.py @@ -15,7 +15,7 @@ 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: @@ -34,7 +34,7 @@ from kallithea.model.db import User log = logging.getLogger(__name__) -class RhodeCodeAuthPlugin(auth_modules.RhodeCodeExternalAuthPlugin): +class KallitheaAuthPlugin(auth_modules.KallitheaExternalAuthPlugin): def __init__(self): pass @@ -127,7 +127,7 @@ class RhodeCodeAuthPlugin(auth_modules.R 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): """ @@ -138,7 +138,7 @@ class RhodeCodeAuthPlugin(auth_modules.R 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: @@ -169,7 +169,7 @@ class RhodeCodeAuthPlugin(auth_modules.R 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', '') diff --git a/kallithea/lib/auth_modules/auth_crowd.py b/kallithea/lib/auth_modules/auth_crowd.py --- a/kallithea/lib/auth_modules/auth_crowd.py +++ b/kallithea/lib/auth_modules/auth_crowd.py @@ -15,7 +15,7 @@ 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: @@ -130,7 +130,7 @@ class CrowdServer(object): return self._request(url) -class RhodeCodeAuthPlugin(auth_modules.RhodeCodeExternalAuthPlugin): +class KallitheaAuthPlugin(auth_modules.KallitheaExternalAuthPlugin): @hybrid_property def name(self): @@ -174,7 +174,7 @@ class RhodeCodeAuthPlugin(auth_modules.R "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" } ] @@ -195,7 +195,7 @@ class RhodeCodeAuthPlugin(auth_modules.R 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: @@ -214,7 +214,7 @@ class RhodeCodeAuthPlugin(auth_modules.R 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', '') diff --git a/kallithea/lib/auth_modules/auth_internal.py b/kallithea/lib/auth_modules/auth_internal.py --- a/kallithea/lib/auth_modules/auth_internal.py +++ b/kallithea/lib/auth_modules/auth_internal.py @@ -15,7 +15,7 @@ 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: @@ -35,7 +35,7 @@ from kallithea.model.db import User log = logging.getLogger(__name__) -class RhodeCodeAuthPlugin(auth_modules.RhodeCodeAuthPluginBase): +class KallitheaAuthPlugin(auth_modules.KallitheaAuthPluginBase): def __init__(self): pass @@ -55,7 +55,7 @@ class RhodeCodeAuthPlugin(auth_modules.R 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): @@ -83,7 +83,7 @@ class RhodeCodeAuthPlugin(auth_modules.R 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) diff --git a/kallithea/lib/auth_modules/auth_ldap.py b/kallithea/lib/auth_modules/auth_ldap.py --- a/kallithea/lib/auth_modules/auth_ldap.py +++ b/kallithea/lib/auth_modules/auth_ldap.py @@ -15,7 +15,7 @@ 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: @@ -170,7 +170,7 @@ class AuthLdap(object): 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"] @@ -297,7 +297,7 @@ class RhodeCodeAuthPlugin(auth_modules.R 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 """ @@ -332,7 +332,7 @@ class RhodeCodeAuthPlugin(auth_modules.R 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', '') diff --git a/kallithea/lib/auth_modules/auth_pam.py b/kallithea/lib/auth_modules/auth_pam.py --- a/kallithea/lib/auth_modules/auth_pam.py +++ b/kallithea/lib/auth_modules/auth_pam.py @@ -15,7 +15,7 @@ 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: @@ -42,7 +42,7 @@ log = logging.getLogger(__name__) _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 @@ -52,7 +52,7 @@ class RhodeCodeAuthPlugin(auth_modules.R 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 @@ -103,7 +103,7 @@ class RhodeCodeAuthPlugin(auth_modules.R 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()) diff --git a/kallithea/lib/base.py b/kallithea/lib/base.py --- a/kallithea/lib/base.py +++ b/kallithea/lib/base.py @@ -111,7 +111,7 @@ class BasicAuth(AuthBasicAuthenticator): 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) diff --git a/kallithea/lib/celerylib/__init__.py b/kallithea/lib/celerylib/__init__.py --- a/kallithea/lib/celerylib/__init__.py +++ b/kallithea/lib/celerylib/__init__.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/lib/celerylib/tasks.py b/kallithea/lib/celerylib/tasks.py --- a/kallithea/lib/celerylib/tasks.py +++ b/kallithea/lib/celerylib/tasks.py @@ -15,7 +15,7 @@ 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. @@ -278,7 +278,7 @@ def send_email(recipients, subject, body .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') diff --git a/kallithea/lib/db_manage.py b/kallithea/lib/db_manage.py --- a/kallithea/lib/db_manage.py +++ b/kallithea/lib/db_manage.py @@ -15,7 +15,7 @@ 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. @@ -184,7 +184,7 @@ class DbManage(object): 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)\ @@ -222,7 +222,7 @@ class DbManage(object): 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', '') @@ -488,7 +488,7 @@ class DbManage(object): 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) @@ -515,7 +515,7 @@ class DbManage(object): self.sa.add(ui_conf) settings = [ - ('realm', 'RhodeCode', 'unicode'), + ('realm', 'Kallithea', 'unicode'), ('title', '', 'unicode'), ('ga_code', '', 'unicode'), ('show_public_icon', True, 'bool'), @@ -541,7 +541,7 @@ class DbManage(object): 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") diff --git a/kallithea/lib/dbmigrate/__init__.py b/kallithea/lib/dbmigrate/__init__.py --- a/kallithea/lib/dbmigrate/__init__.py +++ b/kallithea/lib/dbmigrate/__init__.py @@ -44,7 +44,7 @@ class UpgradeDb(BasePasterCommand): usage = "CONFIG_FILE" summary = "Upgrades current db to newer version" - group_name = "RhodeCode" + group_name = "Kallithea" parser = Command.standard_parser(verbose=True) diff --git a/kallithea/lib/dbmigrate/schema/db_1_2_0.py b/kallithea/lib/dbmigrate/schema/db_1_2_0.py --- a/kallithea/lib/dbmigrate/schema/db_1_2_0.py +++ b/kallithea/lib/dbmigrate/schema/db_1_2_0.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/lib/dbmigrate/schema/db_1_3_0.py b/kallithea/lib/dbmigrate/schema/db_1_3_0.py --- a/kallithea/lib/dbmigrate/schema/db_1_3_0.py +++ b/kallithea/lib/dbmigrate/schema/db_1_3_0.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/lib/dbmigrate/schema/db_1_4_0.py b/kallithea/lib/dbmigrate/schema/db_1_4_0.py --- a/kallithea/lib/dbmigrate/schema/db_1_4_0.py +++ b/kallithea/lib/dbmigrate/schema/db_1_4_0.py @@ -15,7 +15,7 @@ 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: @@ -1173,16 +1173,16 @@ class Permission(Base, BaseModel): ('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')), ] diff --git a/kallithea/lib/dbmigrate/schema/db_1_5_0.py b/kallithea/lib/dbmigrate/schema/db_1_5_0.py --- a/kallithea/lib/dbmigrate/schema/db_1_5_0.py +++ b/kallithea/lib/dbmigrate/schema/db_1_5_0.py @@ -15,7 +15,7 @@ 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: @@ -1192,16 +1192,16 @@ class Permission(Base, BaseModel): ('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')), ] diff --git a/kallithea/lib/dbmigrate/schema/db_1_5_2.py b/kallithea/lib/dbmigrate/schema/db_1_5_2.py --- a/kallithea/lib/dbmigrate/schema/db_1_5_2.py +++ b/kallithea/lib/dbmigrate/schema/db_1_5_2.py @@ -15,7 +15,7 @@ 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: @@ -1312,16 +1312,16 @@ class Permission(Base, BaseModel): ('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')), ] diff --git a/kallithea/lib/dbmigrate/schema/db_1_6_0.py b/kallithea/lib/dbmigrate/schema/db_1_6_0.py --- a/kallithea/lib/dbmigrate/schema/db_1_6_0.py +++ b/kallithea/lib/dbmigrate/schema/db_1_6_0.py @@ -15,7 +15,7 @@ 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: @@ -1397,16 +1397,16 @@ class Permission(Base, BaseModel): ('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')), ] diff --git a/kallithea/lib/dbmigrate/schema/db_1_7_0.py b/kallithea/lib/dbmigrate/schema/db_1_7_0.py --- a/kallithea/lib/dbmigrate/schema/db_1_7_0.py +++ b/kallithea/lib/dbmigrate/schema/db_1_7_0.py @@ -15,7 +15,7 @@ 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: @@ -1405,7 +1405,7 @@ class Permission(Base, BaseModel): 'mysql_charset': 'utf8'}, ) PERMS = [ - ('hg.admin', _('RhodeCode Administrator')), + ('hg.admin', _('Kallithea Administrator')), ('repository.none', _('Repository no access')), ('repository.read', _('Repository read access')), diff --git a/kallithea/lib/dbmigrate/schema/db_1_8_0.py b/kallithea/lib/dbmigrate/schema/db_1_8_0.py --- a/kallithea/lib/dbmigrate/schema/db_1_8_0.py +++ b/kallithea/lib/dbmigrate/schema/db_1_8_0.py @@ -15,7 +15,7 @@ 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: @@ -1451,7 +1451,7 @@ class Permission(Base, BaseModel): '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')), diff --git a/kallithea/lib/dbmigrate/schema/db_2_0_0.py b/kallithea/lib/dbmigrate/schema/db_2_0_0.py --- a/kallithea/lib/dbmigrate/schema/db_2_0_0.py +++ b/kallithea/lib/dbmigrate/schema/db_2_0_0.py @@ -15,7 +15,7 @@ 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: @@ -230,7 +230,7 @@ class Setting(Base, BaseModel): @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: @@ -1508,7 +1508,7 @@ class Permission(Base, BaseModel): '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')), diff --git a/kallithea/lib/dbmigrate/schema/db_2_0_1.py b/kallithea/lib/dbmigrate/schema/db_2_0_1.py --- a/kallithea/lib/dbmigrate/schema/db_2_0_1.py +++ b/kallithea/lib/dbmigrate/schema/db_2_0_1.py @@ -15,7 +15,7 @@ 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: @@ -233,7 +233,7 @@ class Setting(Base, BaseModel): @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: @@ -1509,7 +1509,7 @@ class Permission(Base, BaseModel): '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')), diff --git a/kallithea/lib/dbmigrate/schema/db_2_0_2.py b/kallithea/lib/dbmigrate/schema/db_2_0_2.py --- a/kallithea/lib/dbmigrate/schema/db_2_0_2.py +++ b/kallithea/lib/dbmigrate/schema/db_2_0_2.py @@ -15,7 +15,7 @@ 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: @@ -233,7 +233,7 @@ class Setting(Base, BaseModel): @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: @@ -1530,7 +1530,7 @@ class Permission(Base, BaseModel): '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')), diff --git a/kallithea/lib/dbmigrate/schema/db_2_1_0.py b/kallithea/lib/dbmigrate/schema/db_2_1_0.py --- a/kallithea/lib/dbmigrate/schema/db_2_1_0.py +++ b/kallithea/lib/dbmigrate/schema/db_2_1_0.py @@ -15,7 +15,7 @@ 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: @@ -236,7 +236,7 @@ class Setting(Base, BaseModel): @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: @@ -1569,7 +1569,7 @@ class Permission(Base, BaseModel): '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')), diff --git a/kallithea/lib/dbmigrate/schema/db_2_2_0.py b/kallithea/lib/dbmigrate/schema/db_2_2_0.py --- a/kallithea/lib/dbmigrate/schema/db_2_2_0.py +++ b/kallithea/lib/dbmigrate/schema/db_2_2_0.py @@ -15,7 +15,7 @@ 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: @@ -237,7 +237,7 @@ class Setting(Base, BaseModel): @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: @@ -1619,7 +1619,7 @@ class Permission(Base, BaseModel): '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')), diff --git a/kallithea/lib/dbmigrate/schema/db_2_2_3.py b/kallithea/lib/dbmigrate/schema/db_2_2_3.py --- a/kallithea/lib/dbmigrate/schema/db_2_2_3.py +++ b/kallithea/lib/dbmigrate/schema/db_2_2_3.py @@ -15,7 +15,7 @@ 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: @@ -237,7 +237,7 @@ class Setting(Base, BaseModel): @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: @@ -1646,7 +1646,7 @@ class Permission(Base, BaseModel): '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')), diff --git a/kallithea/lib/dbmigrate/versions/015_version_1_8_0.py b/kallithea/lib/dbmigrate/versions/015_version_1_8_0.py --- a/kallithea/lib/dbmigrate/versions/015_version_1_8_0.py +++ b/kallithea/lib/dbmigrate/versions/015_version_1_8_0.py @@ -72,7 +72,7 @@ def fixups(models, _SESSION): # 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 diff --git a/kallithea/lib/exceptions.py b/kallithea/lib/exceptions.py --- a/kallithea/lib/exceptions.py +++ b/kallithea/lib/exceptions.py @@ -15,7 +15,7 @@ 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: @@ -74,7 +74,7 @@ class NonRelativePathError(Exception): 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 diff --git a/kallithea/lib/helpers.py b/kallithea/lib/helpers.py --- a/kallithea/lib/helpers.py +++ b/kallithea/lib/helpers.py @@ -468,7 +468,7 @@ 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: @@ -776,7 +776,7 @@ def action_parser(user_log, feed=False, 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'), diff --git a/kallithea/lib/hooks.py b/kallithea/lib/hooks.py --- a/kallithea/lib/hooks.py +++ b/kallithea/lib/hooks.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/lib/indexers/__init__.py b/kallithea/lib/indexers/__init__.py --- a/kallithea/lib/indexers/__init__.py +++ b/kallithea/lib/indexers/__init__.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/lib/middleware/simplegit.py b/kallithea/lib/middleware/simplegit.py --- a/kallithea/lib/middleware/simplegit.py +++ b/kallithea/lib/middleware/simplegit.py @@ -158,7 +158,7 @@ class SimpleGit(BaseVCSController): 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 = { diff --git a/kallithea/lib/middleware/simplehg.py b/kallithea/lib/middleware/simplehg.py --- a/kallithea/lib/middleware/simplehg.py +++ b/kallithea/lib/middleware/simplehg.py @@ -162,7 +162,7 @@ class SimpleHg(BaseVCSController): 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 = { diff --git a/kallithea/lib/paster_commands/cache_keys.py b/kallithea/lib/paster_commands/cache_keys.py --- a/kallithea/lib/paster_commands/cache_keys.py +++ b/kallithea/lib/paster_commands/cache_keys.py @@ -15,7 +15,7 @@ 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. @@ -50,7 +50,7 @@ class Command(BasePasterCommand): 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" diff --git a/kallithea/lib/paster_commands/ishell.py b/kallithea/lib/paster_commands/ishell.py --- a/kallithea/lib/paster_commands/ishell.py +++ b/kallithea/lib/paster_commands/ishell.py @@ -15,7 +15,7 @@ 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: @@ -47,7 +47,7 @@ class Command(BasePasterCommand): 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" @@ -69,7 +69,7 @@ class Command(BasePasterCommand): 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) diff --git a/kallithea/lib/paster_commands/make_index.py b/kallithea/lib/paster_commands/make_index.py --- a/kallithea/lib/paster_commands/make_index.py +++ b/kallithea/lib/paster_commands/make_index.py @@ -15,7 +15,7 @@ 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: @@ -50,7 +50,7 @@ class Command(BasePasterCommand): 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" diff --git a/kallithea/lib/paster_commands/make_rcextensions.py b/kallithea/lib/paster_commands/make_rcextensions.py --- a/kallithea/lib/paster_commands/make_rcextensions.py +++ b/kallithea/lib/paster_commands/make_rcextensions.py @@ -15,7 +15,7 @@ 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: @@ -49,10 +49,10 @@ class Command(BasePasterCommand): 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) diff --git a/kallithea/lib/paster_commands/repo_scan.py b/kallithea/lib/paster_commands/repo_scan.py --- a/kallithea/lib/paster_commands/repo_scan.py +++ b/kallithea/lib/paster_commands/repo_scan.py @@ -15,7 +15,7 @@ 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: @@ -48,7 +48,7 @@ class Command(BasePasterCommand): 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" @@ -69,5 +69,5 @@ class Command(BasePasterCommand): '--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", ) diff --git a/kallithea/lib/paster_commands/setup_db.py b/kallithea/lib/paster_commands/setup_db.py --- a/kallithea/lib/paster_commands/setup_db.py +++ b/kallithea/lib/paster_commands/setup_db.py @@ -17,11 +17,11 @@ class Command(AbstractInstallCommand): 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 diff --git a/kallithea/lib/paster_commands/update_repoinfo.py b/kallithea/lib/paster_commands/update_repoinfo.py --- a/kallithea/lib/paster_commands/update_repoinfo.py +++ b/kallithea/lib/paster_commands/update_repoinfo.py @@ -15,7 +15,7 @@ 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: @@ -51,7 +51,7 @@ class Command(BasePasterCommand): 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" diff --git a/kallithea/lib/rcmail/smtp_mailer.py b/kallithea/lib/rcmail/smtp_mailer.py --- a/kallithea/lib/rcmail/smtp_mailer.py +++ b/kallithea/lib/rcmail/smtp_mailer.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/lib/utils.py b/kallithea/lib/utils.py --- a/kallithea/lib/utils.py +++ b/kallithea/lib/utils.py @@ -15,7 +15,7 @@ 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: @@ -387,7 +387,7 @@ def make_ui(read_from='file', path=None, 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) @@ -410,7 +410,7 @@ def set_app_settings(config): 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 """ @@ -499,7 +499,7 @@ def repo2db_mapper(initial_repo_list, re 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) @@ -795,7 +795,7 @@ class BasePasterCommand(Command): 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 @@ -826,7 +826,7 @@ def check_git_version(): 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 diff --git a/kallithea/lib/utils2.py b/kallithea/lib/utils2.py --- a/kallithea/lib/utils2.py +++ b/kallithea/lib/utils2.py @@ -675,7 +675,7 @@ def suuid(url=None, truncate_to=22, alph 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 diff --git a/kallithea/model/__init__.py b/kallithea/model/__init__.py --- a/kallithea/model/__init__.py +++ b/kallithea/model/__init__.py @@ -66,7 +66,7 @@ def init_model(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 diff --git a/kallithea/model/api_key.py b/kallithea/model/api_key.py --- a/kallithea/model/api_key.py +++ b/kallithea/model/api_key.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/model/comment.py b/kallithea/model/comment.py --- a/kallithea/model/comment.py +++ b/kallithea/model/comment.py @@ -15,7 +15,7 @@ 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: @@ -97,7 +97,7 @@ class ChangesetCommentsModel(BaseModel): (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 diff --git a/kallithea/model/db.py b/kallithea/model/db.py --- a/kallithea/model/db.py +++ b/kallithea/model/db.py @@ -15,7 +15,7 @@ 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: @@ -237,7 +237,7 @@ class Setting(Base, BaseModel): @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: @@ -1656,7 +1656,7 @@ class Permission(Base, BaseModel): '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')), diff --git a/kallithea/model/gist.py b/kallithea/model/gist.py --- a/kallithea/model/gist.py +++ b/kallithea/model/gist.py @@ -15,7 +15,7 @@ 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: @@ -158,7 +158,7 @@ class GistModel(BaseModel): 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, @@ -222,7 +222,7 @@ class GistModel(BaseModel): 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, diff --git a/kallithea/model/notification.py b/kallithea/model/notification.py --- a/kallithea/model/notification.py +++ b/kallithea/model/notification.py @@ -231,7 +231,7 @@ class NotificationModel(BaseModel): _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') } diff --git a/kallithea/model/permission.py b/kallithea/model/permission.py --- a/kallithea/model/permission.py +++ b/kallithea/model/permission.py @@ -15,7 +15,7 @@ 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: @@ -41,7 +41,7 @@ log = logging.getLogger(__name__) class PermissionModel(BaseModel): """ - Permissions model for RhodeCode + Permissions model for Kallithea """ cls = Permission diff --git a/kallithea/model/pull_request.py b/kallithea/model/pull_request.py --- a/kallithea/model/pull_request.py +++ b/kallithea/model/pull_request.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/model/repo.py b/kallithea/model/repo.py --- a/kallithea/model/repo.py +++ b/kallithea/model/repo.py @@ -15,7 +15,7 @@ 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: @@ -734,7 +734,7 @@ class RepoModel(BaseModel): 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) @@ -764,7 +764,7 @@ class RepoModel(BaseModel): """ 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 diff --git a/kallithea/model/repo_group.py b/kallithea/model/repo_group.py --- a/kallithea/model/repo_group.py +++ b/kallithea/model/repo_group.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/model/repo_permission.py b/kallithea/model/repo_permission.py --- a/kallithea/model/repo_permission.py +++ b/kallithea/model/repo_permission.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/model/scm.py b/kallithea/model/scm.py --- a/kallithea/model/scm.py +++ b/kallithea/model/scm.py @@ -15,7 +15,7 @@ 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: @@ -280,7 +280,7 @@ class ScmModel(BaseModel): 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: @@ -613,8 +613,8 @@ class ScmModel(BaseModel): """ 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 @@ -738,8 +738,8 @@ class ScmModel(BaseModel): """ 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 @@ -834,7 +834,7 @@ class ScmModel(BaseModel): 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 @@ -858,8 +858,8 @@ class ScmModel(BaseModel): 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*(.*)' @@ -867,7 +867,7 @@ class ScmModel(BaseModel): 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()) diff --git a/kallithea/model/user.py b/kallithea/model/user.py --- a/kallithea/model/user.py +++ b/kallithea/model/user.py @@ -15,7 +15,7 @@ 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: @@ -141,7 +141,7 @@ class UserModel(BaseModel): # 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) @@ -331,7 +331,7 @@ class UserModel(BaseModel): 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: diff --git a/kallithea/model/user_group.py b/kallithea/model/user_group.py --- a/kallithea/model/user_group.py +++ b/kallithea/model/user_group.py @@ -15,7 +15,7 @@ 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: diff --git a/kallithea/public/js/base.js b/kallithea/public/js/base.js --- a/kallithea/public/js/base.js +++ b/kallithea/public/js/base.js @@ -1,5 +1,5 @@ /** -RhodeCode JS Files +Kallithea JS Files **/ if (typeof console == "undefined" || typeof console.log == "undefined"){ diff --git a/kallithea/templates/admin/auth/auth_settings.html b/kallithea/templates/admin/auth/auth_settings.html --- a/kallithea/templates/admin/auth/auth_settings.html +++ b/kallithea/templates/admin/auth/auth_settings.html @@ -33,7 +33,7 @@
${h.text("auth_plugins", class_='large')} - ${_('Comma separated list of plugins. Order of plugins is also order in which RhodeCode will try to authenticate user')} + ${_('Comma separated list of plugins. Order of plugins is also order in which Kallithea will try to authenticate user')}
${_('Available built-in plugins')}
    %for plugin_path in c.available_plugins: diff --git a/kallithea/templates/admin/permissions/permissions_globals.html b/kallithea/templates/admin/permissions/permissions_globals.html --- a/kallithea/templates/admin/permissions/permissions_globals.html +++ b/kallithea/templates/admin/permissions/permissions_globals.html @@ -10,7 +10,7 @@
    ${h.checkbox('anonymous',True)}
    - ${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')))))} + ${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')))))}
diff --git a/kallithea/templates/admin/repos/repo_creating.html b/kallithea/templates/admin/repos/repo_creating.html --- a/kallithea/templates/admin/repos/repo_creating.html +++ b/kallithea/templates/admin/repos/repo_creating.html @@ -39,7 +39,7 @@
diff --git a/kallithea/templates/admin/repos/repo_edit_advanced.html b/kallithea/templates/admin/repos/repo_edit_advanced.html --- a/kallithea/templates/admin/repos/repo_edit_advanced.html +++ b/kallithea/templates/admin/repos/repo_edit_advanced.html @@ -91,7 +91,7 @@ %endif
    -
  • ${_('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')}
    • +
  • ${_('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')}
${h.end_form()} diff --git a/kallithea/templates/admin/settings/settings_email.html b/kallithea/templates/admin/settings/settings_email.html --- a/kallithea/templates/admin/settings/settings_email.html +++ b/kallithea/templates/admin/settings/settings_email.html @@ -2,7 +2,7 @@ <% 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'), ''), diff --git a/kallithea/templates/admin/settings/settings_global.html b/kallithea/templates/admin/settings/settings_global.html --- a/kallithea/templates/admin/settings/settings_global.html +++ b/kallithea/templates/admin/settings/settings_global.html @@ -9,7 +9,7 @@
${h.text('rhodecode_title',size=30)} - ${_('Set a custom title for your RhodeCode Service.')} + ${_('Set a custom title for your Kallithea Service.')}
diff --git a/kallithea/templates/admin/settings/settings_mapping.html b/kallithea/templates/admin/settings/settings_mapping.html --- a/kallithea/templates/admin/settings/settings_mapping.html +++ b/kallithea/templates/admin/settings/settings_mapping.html @@ -22,7 +22,7 @@ ${h.checkbox('hooks',True)} - ${_('Verify if RhodeCodes GIT hooks are installed for each repository. Current hooks will be updated to latest version')} + ${_('Verify if Kallitheas GIT hooks are installed for each repository. Current hooks will be updated to latest version')} diff --git a/kallithea/templates/admin/settings/settings_search.html b/kallithea/templates/admin/settings/settings_search.html --- a/kallithea/templates/admin/settings/settings_search.html +++ b/kallithea/templates/admin/settings/settings_search.html @@ -12,7 +12,7 @@ - ${_('This option completely reindex all the files within RhodeCode for proper fulltext search capabilities.')} + ${_('This option completely reindex all the files within Kallithea for proper fulltext search capabilities.')} diff --git a/kallithea/templates/admin/settings/settings_system.html b/kallithea/templates/admin/settings/settings_system.html --- a/kallithea/templates/admin/settings/settings_system.html +++ b/kallithea/templates/admin/settings/settings_system.html @@ -1,7 +1,7 @@
<% elems = [ - (_('RhodeCode version'), h.literal('%s %s' % (c.kallithea_version, _('check for updates'))), ''), + (_('Kallithea version'), h.literal('%s %s' % (c.kallithea_version, _('check for updates'))), ''), (_('Python version'), c.py_version, ''), (_('Platform'), c.platform, ''), (_('GIT version'), c.git_version, ''), diff --git a/kallithea/templates/admin/settings/settings_vcs.html b/kallithea/templates/admin/settings/settings_vcs.html --- a/kallithea/templates/admin/settings/settings_vcs.html +++ b/kallithea/templates/admin/settings/settings_vcs.html @@ -10,7 +10,7 @@ ${h.checkbox('web_push_ssl', 'True')} - ${_('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.')} + ${_('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.')} @@ -66,7 +66,7 @@
${h.text('paths_root_path',size=60,readonly="readonly", class_="disabled")} + title="${h.tooltip(_('Click to unlock. You must restart Kallithea in order to make this setting take effect.'))}">
${_('Filesystem location where repositories should be stored. After changing this value a restart and rescan of the repository folder are required.')} diff --git a/kallithea/templates/admin/settings/settings_visual.html b/kallithea/templates/admin/settings/settings_visual.html --- a/kallithea/templates/admin/settings/settings_visual.html +++ b/kallithea/templates/admin/settings/settings_visual.html @@ -15,13 +15,13 @@ ${_('Allows storing additional customized fields per repository.')}
${h.checkbox('rhodecode_show_version','True')} - +
- ${_('Shows or hides a version number of RhodeCode displayed in the footer.')} + ${_('Shows or hides a version number of Kallithea displayed in the footer.')}
${h.checkbox('rhodecode_use_gravatar','True')} - +
@@ -29,20 +29,20 @@ ${h.text('rhodecode_gravatar_url', size=80)} ${_('''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''')} + {netloc} network location/server host of running Kallithea server''')}
${h.text('rhodecode_clone_uri_tmpl', size=80)} ${_('''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''')}
diff --git a/kallithea/templates/base/base.html b/kallithea/templates/base/base.html --- a/kallithea/templates/base/base.html +++ b/kallithea/templates/base/base.html @@ -6,7 +6,7 @@