##// END OF EJS Templates
General renaming to Kallithea
Bradley M. Kuhn -
r4212:24c0d584 kallithea-2.2.5-r...
parent child Browse files
Show More
@@ -20,7 +20,7 b' syntax: regexp'
20 ^\.coverage$
20 ^\.coverage$
21 ^kallithea\.db$
21 ^kallithea\.db$
22 ^test\.db$
22 ^test\.db$
23 ^RhodeCode\.egg-info$
23 ^Kallithea\.egg-info$
24 ^rc.*\.ini$
24 ^rc.*\.ini$
25 ^fabfile.py
25 ^fabfile.py
26 ^\.idea$
26 ^\.idea$
@@ -1,4 +1,4 b''
1 List of contributors to RhodeCode project:
1 List of contributors to Kallithea project:
2 Marcin Kuźmiński <marcin@python-works.com>
2 Marcin Kuźmiński <marcin@python-works.com>
3 Lukasz Balcerzak <lukaszbalcerzak@gmail.com>
3 Lukasz Balcerzak <lukaszbalcerzak@gmail.com>
4 Jason Harris <jason@jasonfharris.com>
4 Jason Harris <jason@jasonfharris.com>
@@ -42,6 +42,6 b' List of contributors to RhodeCode projec'
42 Jelmer Vernooij <jelmer@samba.org>
42 Jelmer Vernooij <jelmer@samba.org>
43 larikale
43 larikale
44 SteveCohen
44 SteveCohen
45 RhodeCode GmbH
45 Kallithea GmbH
46 Sebastian Kreutzberger <sebastian@rhodecode.com>
46 Sebastian Kreutzberger <sebastian@rhodecode.com>
47 thomas <thomas@rhodecode.com>
47 thomas <thomas@rhodecode.com>
@@ -1,29 +1,29 b''
1 =========
1 =========
2 RhodeCode
2 Kallithea
3 =========
3 =========
4
4
5 About
5 About
6 -----
6 -----
7
7
8 ``RhodeCode`` is a fast and powerful management tool for Mercurial_ and GIT_
8 ``Kallithea`` is a fast and powerful management tool for Mercurial_ and GIT_
9 with a built in push/pull server, full text search and code-review.
9 with a built in push/pull server, full text search and code-review.
10 It works on http/https and has a built in permission/authentication system with
10 It works on http/https and has a built in permission/authentication system with
11 the ability to authenticate via LDAP or ActiveDirectory. RhodeCode also provides
11 the ability to authenticate via LDAP or ActiveDirectory. Kallithea also provides
12 simple API so it's easy integrable with existing external systems.
12 simple API so it's easy integrable with existing external systems.
13
13
14 RhodeCode is similar in some respects to github_ or bitbucket_,
14 Kallithea is similar in some respects to github_ or bitbucket_,
15 however RhodeCode can be run as standalone hosted application on your own server.
15 however Kallithea can be run as standalone hosted application on your own server.
16 It is open source and donation ware and focuses more on providing a customized,
16 It is open source and donation ware and focuses more on providing a customized,
17 self administered interface for Mercurial_ and GIT_ repositories.
17 self administered interface for Mercurial_ and GIT_ repositories.
18 RhodeCode works on \*nix systems and Windows it is powered by a vcs_ library
18 Kallithea works on \*nix systems and Windows it is powered by a vcs_ library
19 that Lukasz Balcerzak and Marcin Kuzminski created to handle multiple
19 that Lukasz Balcerzak and Marcin Kuzminski created to handle multiple
20 different version control systems.
20 different version control systems.
21
21
22 RhodeCode uses `PEP386 versioning <http://www.python.org/dev/peps/pep-0386/>`_
22 Kallithea uses `PEP386 versioning <http://www.python.org/dev/peps/pep-0386/>`_
23
23
24 Installation
24 Installation
25 ------------
25 ------------
26 Stable releases of RhodeCode are best installed via::
26 Stable releases of Kallithea are best installed via::
27
27
28 easy_install kallithea
28 easy_install kallithea
29
29
@@ -51,7 +51,7 b' https://bitbucket.org/conservancy/kallit'
51
51
52
52
53
53
54 RhodeCode Features
54 Kallithea Features
55 ------------------
55 ------------------
56
56
57 - Has its own middleware to handle mercurial_ and git_ protocol requests.
57 - Has its own middleware to handle mercurial_ and git_ protocol requests.
@@ -68,7 +68,7 b' RhodeCode Features'
68 - Built in Gist functionality for sharing code snippets.
68 - Built in Gist functionality for sharing code snippets.
69 - Integrates easily with other systems, with custom created mappers you can connect it to almost
69 - Integrates easily with other systems, with custom created mappers you can connect it to almost
70 any issue tracker, and with an JSON-RPC API you can make much more
70 any issue tracker, and with an JSON-RPC API you can make much more
71 - Build in commit-api let's you add, edit and commit files right from RhodeCode
71 - Build in commit-api let's you add, edit and commit files right from Kallithea
72 web interface using simple editor or upload binary files using simple form.
72 web interface using simple editor or upload binary files using simple form.
73 - Powerfull pull-request driven review system with inline commenting,
73 - Powerfull pull-request driven review system with inline commenting,
74 changeset statuses, and notification system.
74 changeset statuses, and notification system.
@@ -113,7 +113,7 b' Incoming / Plans'
113 License
113 License
114 -------
114 -------
115
115
116 ``RhodeCode`` is released under the GPLv3 license.
116 ``Kallithea`` is released under the GPLv3 license.
117
117
118
118
119 Getting help
119 Getting help
@@ -137,7 +137,7 b' You can follow this project on Twitter, '
137 Online documentation
137 Online documentation
138 --------------------
138 --------------------
139
139
140 Online documentation for the current version of RhodeCode is available at
140 Online documentation for the current version of Kallithea is available at
141 - http://packages.python.org/Kallithea/
141 - http://packages.python.org/Kallithea/
142 - http://kallithea.readthedocs.org/
142 - http://kallithea.readthedocs.org/
143
143
@@ -1,6 +1,6 b''
1 ################################################################################
1 ################################################################################
2 ################################################################################
2 ################################################################################
3 # RhodeCode - Pylons environment configuration #
3 # Kallithea - Pylons environment configuration #
4 # #
4 # #
5 # The %(here)s variable will be replaced with the parent directory of this file#
5 # The %(here)s variable will be replaced with the parent directory of this file#
6 ################################################################################
6 ################################################################################
@@ -11,13 +11,13 b' pdebug = false'
11 ################################################################################
11 ################################################################################
12 ## Uncomment and replace with the address which should receive ##
12 ## Uncomment and replace with the address which should receive ##
13 ## any error reports after application crash ##
13 ## any error reports after application crash ##
14 ## Additionally those settings will be used by RhodeCode mailing system ##
14 ## Additionally those settings will be used by Kallithea mailing system ##
15 ################################################################################
15 ################################################################################
16 #email_to = admin@localhost
16 #email_to = admin@localhost
17 #error_email_from = paste_error@localhost
17 #error_email_from = paste_error@localhost
18 #app_email_from = kallithea-noreply@localhost
18 #app_email_from = kallithea-noreply@localhost
19 #error_message =
19 #error_message =
20 #email_prefix = [RhodeCode]
20 #email_prefix = [Kallithea]
21
21
22 #smtp_server = mail.server.com
22 #smtp_server = mail.server.com
23 #smtp_username =
23 #smtp_username =
@@ -161,7 +161,7 b' cut_off_limit = 256000'
161 ## use cache version of scm repo everywhere
161 ## use cache version of scm repo everywhere
162 vcs_full_cache = true
162 vcs_full_cache = true
163
163
164 ## force https in RhodeCode, fixes https redirects, assumes it's always https
164 ## force https in Kallithea, fixes https redirects, assumes it's always https
165 force_https = false
165 force_https = false
166
166
167 ## use Strict-Transport-Security headers
167 ## use Strict-Transport-Security headers
@@ -192,7 +192,7 b' show_revision_number = true'
192 ## gist URL alias, used to create nicer urls for gist. This should be an
192 ## gist URL alias, used to create nicer urls for gist. This should be an
193 ## url that does rewrites to _admin/gists/<gistid>.
193 ## url that does rewrites to _admin/gists/<gistid>.
194 ## example: http://gist.kallithea.server/{gistid}. Empty means use the internal
194 ## example: http://gist.kallithea.server/{gistid}. Empty means use the internal
195 ## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid>
195 ## Kallithea url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid>
196 gist_alias_url =
196 gist_alias_url =
197
197
198 ## white list of API enabled controllers. This allows to add list of
198 ## white list of API enabled controllers. This allows to add list of
@@ -212,8 +212,8 b' api_access_controllers_whitelist ='
212 ## {email} user email
212 ## {email} user email
213 ## {md5email} md5 hash of the user email (like at gravatar.com)
213 ## {md5email} md5 hash of the user email (like at gravatar.com)
214 ## {size} size of the image that is expected from the server application
214 ## {size} size of the image that is expected from the server application
215 ## {scheme} http/https from RhodeCode server
215 ## {scheme} http/https from Kallithea server
216 ## {netloc} network location from RhodeCode server
216 ## {netloc} network location from Kallithea server
217 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
217 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
218 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
218 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
219
219
@@ -236,7 +236,7 b' default_encoding = utf8'
236
236
237 #clone_uri = {scheme}://{user}{pass}{netloc}{path}
237 #clone_uri = {scheme}://{user}{pass}{netloc}{path}
238
238
239 ## issue tracker for RhodeCode (leave blank to disable, absent for default)
239 ## issue tracker for Kallithea (leave blank to disable, absent for default)
240 #bugtracker = https://bitbucket.org/conservancy/kallithea/issues
240 #bugtracker = https://bitbucket.org/conservancy/kallithea/issues
241
241
242 ## issue tracking mapping for commits messages
242 ## issue tracking mapping for commits messages
@@ -400,7 +400,7 b' beaker.session.auto = False'
400 ### [errormator] ###
400 ### [errormator] ###
401 ####################
401 ####################
402
402
403 ## Errormator is tailored to work with RhodeCode, see
403 ## Errormator is tailored to work with Kallithea, see
404 ## http://errormator.com for details how to obtain an account
404 ## http://errormator.com for details how to obtain an account
405 ## you must install python package `errormator_client` to make it work
405 ## you must install python package `errormator_client` to make it work
406
406
@@ -2,7 +2,7 b''
2 # Change variables/paths as necessary and place file /etc/init/celeryd.conf
2 # Change variables/paths as necessary and place file /etc/init/celeryd.conf
3 # start/stop/restart as normal upstart job (ie: $ start celeryd)
3 # start/stop/restart as normal upstart job (ie: $ start celeryd)
4
4
5 description "Celery for RhodeCode Mercurial Server"
5 description "Celery for Kallithea Mercurial Server"
6 author "Matt Zuba <matt.zuba@goodwillaz.org"
6 author "Matt Zuba <matt.zuba@goodwillaz.org"
7
7
8 start on starting kallithea
8 start on starting kallithea
@@ -5,7 +5,7 b''
5
5
6 ##################################################
6 ##################################################
7 #
7 #
8 # RhodeCode server startup script
8 # Kallithea server startup script
9 # Recommended default-startup: 2 3 4 5
9 # Recommended default-startup: 2 3 4 5
10 # Recommended default-stop: 0 1 6
10 # Recommended default-stop: 0 1 6
11 #
11 #
@@ -26,7 +26,7 b' PID_PATH="/var/run/kallithea/pid"'
26 LOG_PATH="/var/log/kallithea/kallithea.log"
26 LOG_PATH="/var/log/kallithea/kallithea.log"
27
27
28 # replace this with the path to the virtual environment you
28 # replace this with the path to the virtual environment you
29 # made for RhodeCode
29 # made for Kallithea
30 PYTHON_PATH="/opt/python_virtualenvironments/kallithea-venv"
30 PYTHON_PATH="/opt/python_virtualenvironments/kallithea-venv"
31
31
32 RUN_AS="kallithea"
32 RUN_AS="kallithea"
@@ -113,9 +113,9 b' case "$1" in'
113 status_kallithea
113 status_kallithea
114 RETVAL=$?
114 RETVAL=$?
115 if [ ! $RETVAL -eq 0 ]; then
115 if [ ! $RETVAL -eq 0 ]; then
116 echo "RhodeCode server is running..."
116 echo "Kallithea server is running..."
117 else
117 else
118 echo "RhodeCode server is stopped."
118 echo "Kallithea server is stopped."
119 fi
119 fi
120 ;;
120 ;;
121 restart)
121 restart)
@@ -2,7 +2,7 b''
2 # Change variables/paths as necessary and place file /etc/init/kallithea.conf
2 # Change variables/paths as necessary and place file /etc/init/kallithea.conf
3 # start/stop/restart as normal upstart job (ie: $ start kallithea)
3 # start/stop/restart as normal upstart job (ie: $ start kallithea)
4
4
5 description "RhodeCode Mercurial Server"
5 description "Kallithea Mercurial Server"
6 author "Matt Zuba <matt.zuba@goodwillaz.org"
6 author "Matt Zuba <matt.zuba@goodwillaz.org"
7
7
8 start on (local-filesystems and runlevel [2345])
8 start on (local-filesystems and runlevel [2345])
@@ -1,4 +1,4 b''
1 ; RhodeCode Supervisord
1 ; Kallithea Supervisord
2 ; ##########################
2 ; ##########################
3 ; for help see http://supervisord.org/configuration.html
3 ; for help see http://supervisord.org/configuration.html
4 ; ##########################
4 ; ##########################
@@ -15,7 +15,7 b''
15 kallithea.__init__
15 kallithea.__init__
16 ~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~
17
17
18 RhodeCode, a web based repository management based on pylons
18 Kallithea, a web based repository management based on pylons
19 versioning implementation: http://www.python.org/dev/peps/pep-0386/
19 versioning implementation: http://www.python.org/dev/peps/pep-0386/
20
20
21 This file was forked by the Kallithea project in July 2014.
21 This file was forked by the Kallithea project in July 2014.
@@ -15,7 +15,7 b''
15 kallithea.bin.__init__
15 kallithea.bin.__init__
16 ~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Binary scripts for RhodeCode
18 Binary scripts for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -46,7 +46,7 b" FORMAT_JSON = 'json'"
46
46
47 def api_call(apikey, apihost, method=None, **kw):
47 def api_call(apikey, apihost, method=None, **kw):
48 """
48 """
49 Api_call wrapper for RhodeCode.
49 Api_call wrapper for Kallithea.
50
50
51 :param apikey:
51 :param apikey:
52 :param apihost:
52 :param apihost:
@@ -91,7 +91,7 b' def api_call(apikey, apihost, method=Non'
91
91
92 class RcConf(object):
92 class RcConf(object):
93 """
93 """
94 RhodeCode config for API
94 Kallithea config for API
95
95
96 conf = RcConf()
96 conf = RcConf()
97 conf['key']
97 conf['key']
@@ -15,7 +15,7 b''
15 kallithea.bin.api
15 kallithea.bin.api
16 ~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~
17
17
18 Api CLI client for RhodeCode
18 Api CLI client for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -40,7 +40,7 b' def argparser(argv):'
40 "Create config file: kallithea-api --apikey=<key> --apihost=http://your.kallithea.server --save-config"
40 "Create config file: kallithea-api --apikey=<key> --apihost=http://your.kallithea.server --save-config"
41 )
41 )
42
42
43 parser = argparse.ArgumentParser(description='RhodeCode API cli',
43 parser = argparse.ArgumentParser(description='Kallithea API cli',
44 usage=usage)
44 usage=usage)
45
45
46 ## config
46 ## config
@@ -15,7 +15,7 b''
15 kallithea.bin.kallithea_config
15 kallithea.bin.kallithea_config
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 configuration generator for RhodeCode
18 configuration generator for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -44,7 +44,7 b' def argparser(argv):'
44 )
44 )
45
45
46 parser = argparse.ArgumentParser(
46 parser = argparse.ArgumentParser(
47 description='RhodeCode CONFIG generator with variable replacement',
47 description='Kallithea CONFIG generator with variable replacement',
48 usage=usage
48 usage=usage
49 )
49 )
50
50
@@ -15,7 +15,7 b''
15 kallithea.bin.kallithea_gist
15 kallithea.bin.kallithea_gist
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Gist CLI client for RhodeCode
18 Gist CLI client for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -43,7 +43,7 b' def argparser(argv):'
43 "Create config file: kallithea-gist --apikey=<key> --apihost=http://your.kallithea.server --save-config"
43 "Create config file: kallithea-gist --apikey=<key> --apihost=http://your.kallithea.server --save-config"
44 )
44 )
45
45
46 parser = argparse.ArgumentParser(description='RhodeCode Gist cli',
46 parser = argparse.ArgumentParser(description='Kallithea Gist cli',
47 usage=usage)
47 usage=usage)
48
48
49 ## config
49 ## config
@@ -75,7 +75,7 b' class API(object):'
75 }
75 }
76
76
77 def post(self, method, args):
77 def post(self, method, args):
78 """Send a generic API post to Rhodecode.
78 """Send a generic API post to Kallithea.
79
79
80 This will generate the UUID for validation check after the
80 This will generate the UUID for validation check after the
81 response is returned. Handle errors and get the result back.
81 response is returned. Handle errors and get the result back.
@@ -99,7 +99,7 b' class API(object):'
99 return response["result"]
99 return response["result"]
100
100
101 def create_group(self, name, active=True):
101 def create_group(self, name, active=True):
102 """Create the Rhodecode user group."""
102 """Create the Kallithea user group."""
103 args = {
103 args = {
104 "group_name": name,
104 "group_name": name,
105 "active": str(active)
105 "active": str(active)
@@ -208,7 +208,7 b' class LdapSync(object):'
208 config.get("default", "api_key"))
208 config.get("default", "api_key"))
209
209
210 def update_groups_from_ldap(self):
210 def update_groups_from_ldap(self):
211 """Add all the groups from LDAP to Rhodecode."""
211 """Add all the groups from LDAP to Kallithea."""
212 added = existing = 0
212 added = existing = 0
213 groups = self.ldap_client.get_groups()
213 groups = self.ldap_client.get_groups()
214 for group in groups:
214 for group in groups:
@@ -2,7 +2,7 b''
2 <%text>
2 <%text>
3 ################################################################################
3 ################################################################################
4 ################################################################################
4 ################################################################################
5 # RhodeCode - Example config #
5 # Kallithea - Example config #
6 # Built-in functions and variables #
6 # Built-in functions and variables #
7 # The ${here} variable will be replaced with the parent directory of this file #
7 # The ${here} variable will be replaced with the parent directory of this file #
8 # ${uuid()} function will generate a unique hash #
8 # ${uuid()} function will generate a unique hash #
@@ -15,14 +15,14 b' pdebug = false'
15 ################################################################################
15 ################################################################################
16 ## Uncomment and replace with the address which should receive ##
16 ## Uncomment and replace with the address which should receive ##
17 ## any error reports after application crash ##
17 ## any error reports after application crash ##
18 ## Additionally those settings will be used by RhodeCode mailing system ##
18 ## Additionally those settings will be used by Kallithea mailing system ##
19 ################################################################################
19 ################################################################################
20 </%text>
20 </%text>
21 #email_to = admin@localhost
21 #email_to = admin@localhost
22 #error_email_from = paste_error@localhost
22 #error_email_from = paste_error@localhost
23 #app_email_from = kallithea-noreply@localhost
23 #app_email_from = kallithea-noreply@localhost
24 #error_message =
24 #error_message =
25 #email_prefix = [RhodeCode]
25 #email_prefix = [Kallithea]
26
26
27 #smtp_server = mail.server.com
27 #smtp_server = mail.server.com
28 #smtp_username =
28 #smtp_username =
@@ -170,7 +170,7 b' cut_off_limit = 256000'
170 <%text>## use cache version of scm repo everywhere</%text>
170 <%text>## use cache version of scm repo everywhere</%text>
171 vcs_full_cache = true
171 vcs_full_cache = true
172
172
173 <%text>## force https in RhodeCode, fixes https redirects, assumes it's always https</%text>
173 <%text>## force https in Kallithea, fixes https redirects, assumes it's always https</%text>
174 force_https = false
174 force_https = false
175
175
176 <%text>## use Strict-Transport-Security headers</%text>
176 <%text>## use Strict-Transport-Security headers</%text>
@@ -201,7 +201,7 b' show_revision_number = true'
201 <%text>## gist URL alias, used to create nicer urls for gist. This should be an</%text>
201 <%text>## gist URL alias, used to create nicer urls for gist. This should be an</%text>
202 <%text>## url that does rewrites to _admin/gists/<gistid>.</%text>
202 <%text>## url that does rewrites to _admin/gists/<gistid>.</%text>
203 <%text>## example: http://gist.kallithea.server/{gistid}. Empty means use the internal</%text>
203 <%text>## example: http://gist.kallithea.server/{gistid}. Empty means use the internal</%text>
204 <%text>## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid></%text>
204 <%text>## Kallithea url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid></%text>
205 gist_alias_url =
205 gist_alias_url =
206
206
207 <%text>## white list of API enabled controllers. This allows to add list of</%text>
207 <%text>## white list of API enabled controllers. This allows to add list of</%text>
@@ -216,8 +216,8 b' api_access_controllers_whitelist ='
216 <%text>## {email} user email</%text>
216 <%text>## {email} user email</%text>
217 <%text>## {md5email} md5 hash of the user email (like at gravatar.com)</%text>
217 <%text>## {md5email} md5 hash of the user email (like at gravatar.com)</%text>
218 <%text>## {size} size of the image that is expected from the server application</%text>
218 <%text>## {size} size of the image that is expected from the server application</%text>
219 <%text>## {scheme} http/https from RhodeCode server</%text>
219 <%text>## {scheme} http/https from Kallithea server</%text>
220 <%text>## {netloc} network location from RhodeCode server</%text>
220 <%text>## {netloc} network location from Kallithea server</%text>
221 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
221 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
222 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
222 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
223
223
@@ -240,7 +240,7 b' default_encoding = utf8'
240
240
241 #clone_uri = {scheme}://{user}{pass}{netloc}{path}
241 #clone_uri = {scheme}://{user}{pass}{netloc}{path}
242
242
243 <%text>## issue tracker for RhodeCode (leave blank to disable, absent for default)</%text>
243 <%text>## issue tracker for Kallithea (leave blank to disable, absent for default)</%text>
244 #bugtracker = https://bitbucket.org/conservancy/kallithea/issues
244 #bugtracker = https://bitbucket.org/conservancy/kallithea/issues
245
245
246 <%text>## issue tracking mapping for commits messages</%text>
246 <%text>## issue tracking mapping for commits messages</%text>
@@ -407,7 +407,7 b' beaker.session.auto = False'
407 ### [errormator] ###
407 ### [errormator] ###
408 ####################
408 ####################
409
409
410 ## Errormator is tailored to work with RhodeCode, see
410 ## Errormator is tailored to work with Kallithea, see
411 ## http://errormator.com for details how to obtain an account
411 ## http://errormator.com for details how to obtain an account
412 ## you must install python package `errormator_client` to make it work
412 ## you must install python package `errormator_client` to make it work
413 </%text>
413 </%text>
@@ -15,7 +15,7 b''
15 kallithea.config.conf
15 kallithea.config.conf
16 ~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~
17
17
18 Various config settings for RhodeCode
18 Various config settings for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -1,6 +1,6 b''
1 ################################################################################
1 ################################################################################
2 ################################################################################
2 ################################################################################
3 # RhodeCode - Pylons environment configuration #
3 # Kallithea - Pylons environment configuration #
4 # #
4 # #
5 # The %(here)s variable will be replaced with the parent directory of this file#
5 # The %(here)s variable will be replaced with the parent directory of this file#
6 ################################################################################
6 ################################################################################
@@ -11,13 +11,13 b' pdebug = false'
11 ################################################################################
11 ################################################################################
12 ## Uncomment and replace with the address which should receive ##
12 ## Uncomment and replace with the address which should receive ##
13 ## any error reports after application crash ##
13 ## any error reports after application crash ##
14 ## Additionally those settings will be used by RhodeCode mailing system ##
14 ## Additionally those settings will be used by Kallithea mailing system ##
15 ################################################################################
15 ################################################################################
16 #email_to = admin@localhost
16 #email_to = admin@localhost
17 #error_email_from = paste_error@localhost
17 #error_email_from = paste_error@localhost
18 #app_email_from = kallithea-noreply@localhost
18 #app_email_from = kallithea-noreply@localhost
19 #error_message =
19 #error_message =
20 #email_prefix = [RhodeCode]
20 #email_prefix = [Kallithea]
21
21
22 #smtp_server = mail.server.com
22 #smtp_server = mail.server.com
23 #smtp_username =
23 #smtp_username =
@@ -161,7 +161,7 b' cut_off_limit = 256000'
161 ## use cache version of scm repo everywhere
161 ## use cache version of scm repo everywhere
162 vcs_full_cache = true
162 vcs_full_cache = true
163
163
164 ## force https in RhodeCode, fixes https redirects, assumes it's always https
164 ## force https in Kallithea, fixes https redirects, assumes it's always https
165 force_https = false
165 force_https = false
166
166
167 ## use Strict-Transport-Security headers
167 ## use Strict-Transport-Security headers
@@ -192,7 +192,7 b' show_revision_number = true'
192 ## gist URL alias, used to create nicer urls for gist. This should be an
192 ## gist URL alias, used to create nicer urls for gist. This should be an
193 ## url that does rewrites to _admin/gists/<gistid>.
193 ## url that does rewrites to _admin/gists/<gistid>.
194 ## example: http://gist.kallithea.server/{gistid}. Empty means use the internal
194 ## example: http://gist.kallithea.server/{gistid}. Empty means use the internal
195 ## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid>
195 ## Kallithea url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid>
196 gist_alias_url =
196 gist_alias_url =
197
197
198 ## white list of API enabled controllers. This allows to add list of
198 ## white list of API enabled controllers. This allows to add list of
@@ -212,8 +212,8 b' api_access_controllers_whitelist ='
212 ## {email} user email
212 ## {email} user email
213 ## {md5email} md5 hash of the user email (like at gravatar.com)
213 ## {md5email} md5 hash of the user email (like at gravatar.com)
214 ## {size} size of the image that is expected from the server application
214 ## {size} size of the image that is expected from the server application
215 ## {scheme} http/https from RhodeCode server
215 ## {scheme} http/https from Kallithea server
216 ## {netloc} network location from RhodeCode server
216 ## {netloc} network location from Kallithea server
217 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
217 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
218 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
218 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
219
219
@@ -236,7 +236,7 b' default_encoding = utf8'
236
236
237 #clone_uri = {scheme}://{user}{pass}{netloc}{path}
237 #clone_uri = {scheme}://{user}{pass}{netloc}{path}
238
238
239 ## issue tracker for RhodeCode (leave blank to disable, absent for default)
239 ## issue tracker for Kallithea (leave blank to disable, absent for default)
240 #bugtracker = https://bitbucket.org/conservancy/kallithea/issues
240 #bugtracker = https://bitbucket.org/conservancy/kallithea/issues
241
241
242 ## issue tracking mapping for commits messages
242 ## issue tracking mapping for commits messages
@@ -400,7 +400,7 b' beaker.session.auto = False'
400 ### [errormator] ###
400 ### [errormator] ###
401 ####################
401 ####################
402
402
403 ## Errormator is tailored to work with RhodeCode, see
403 ## Errormator is tailored to work with Kallithea, see
404 ## http://errormator.com for details how to obtain an account
404 ## http://errormator.com for details how to obtain an account
405 ## you must install python package `errormator_client` to make it work
405 ## you must install python package `errormator_client` to make it work
406
406
@@ -63,7 +63,7 b' def load_environment(global_conf, app_co'
63 # Initialize config with the basic options
63 # Initialize config with the basic options
64 config.init_app(global_conf, app_conf, package='kallithea', paths=paths)
64 config.init_app(global_conf, app_conf, package='kallithea', paths=paths)
65
65
66 # store some globals into rhodecode
66 # store some globals into kallithea
67 kallithea.CELERY_ON = str2bool(config['app_conf'].get('use_celery'))
67 kallithea.CELERY_ON = str2bool(config['app_conf'].get('use_celery'))
68 kallithea.CELERY_EAGER = str2bool(config['app_conf'].get('celery.always.eager'))
68 kallithea.CELERY_EAGER = str2bool(config['app_conf'].get('celery.always.eager'))
69
69
@@ -16,16 +16,16 b' except ImportError:'
16
16
17 def main():
17 def main():
18 if kallithea is None:
18 if kallithea is None:
19 # exit with success if we cannot import rhodecode !!
19 # exit with success if we cannot import kallithea !!
20 # this allows simply push to this repo even without
20 # this allows simply push to this repo even without
21 # rhodecode
21 # kallithea
22 sys.exit(0)
22 sys.exit(0)
23
23
24 repo_path = os.path.abspath('.')
24 repo_path = os.path.abspath('.')
25 push_data = sys.stdin.readlines()
25 push_data = sys.stdin.readlines()
26 # os.environ is modified here by a subprocess call that
26 # os.environ is modified here by a subprocess call that
27 # runs git and later git executes this hook.
27 # runs git and later git executes this hook.
28 # Environ gets some additional info from rhodecode system
28 # Environ gets some additional info from kallithea system
29 # like IP or username from basic-auth
29 # like IP or username from basic-auth
30 _handler(repo_path, push_data, os.environ)
30 _handler(repo_path, push_data, os.environ)
31 sys.exit(0)
31 sys.exit(0)
@@ -16,16 +16,16 b' except ImportError:'
16
16
17 def main():
17 def main():
18 if kallithea is None:
18 if kallithea is None:
19 # exit with success if we cannot import rhodecode !!
19 # exit with success if we cannot import kallithea !!
20 # this allows simply push to this repo even without
20 # this allows simply push to this repo even without
21 # rhodecode
21 # kallithea
22 sys.exit(0)
22 sys.exit(0)
23
23
24 repo_path = os.path.abspath('.')
24 repo_path = os.path.abspath('.')
25 push_data = sys.stdin.readlines()
25 push_data = sys.stdin.readlines()
26 # os.environ is modified here by a subprocess call that
26 # os.environ is modified here by a subprocess call that
27 # runs git and later git executes this hook.
27 # runs git and later git executes this hook.
28 # Environ gets some additional info from rhodecode system
28 # Environ gets some additional info from kallithea system
29 # like IP or username from basic-auth
29 # like IP or username from basic-auth
30 _handler(repo_path, push_data, os.environ)
30 _handler(repo_path, push_data, os.environ)
31 sys.exit(0)
31 sys.exit(0)
@@ -173,7 +173,7 b' DELETE_USER_HOOK = _dluserhook'
173 #==============================================================================
173 #==============================================================================
174
174
175 # this function will be executed after each push it's executed after the
175 # this function will be executed after each push it's executed after the
176 # build-in hook that RhodeCode uses for logging pushes
176 # build-in hook that Kallithea uses for logging pushes
177 def _pushhook(*args, **kwargs):
177 def _pushhook(*args, **kwargs):
178 """
178 """
179 Post push hook
179 Post push hook
@@ -197,7 +197,7 b' PUSH_HOOK = _pushhook'
197 #==============================================================================
197 #==============================================================================
198
198
199 # this function will be executed after each push it's executed after the
199 # this function will be executed after each push it's executed after the
200 # build-in hook that RhodeCode uses for logging pulls
200 # build-in hook that Kallithea uses for logging pulls
201 def _pullhook(*args, **kwargs):
201 def _pullhook(*args, **kwargs):
202 """
202 """
203 Post pull hook
203 Post pull hook
@@ -15,7 +15,7 b''
15 kallithea.controllers.admin.admin
15 kallithea.controllers.admin.admin
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Controller for Admin panel of Rhodecode
18 Controller for Admin panel of Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.admin.auth_settings
15 kallithea.controllers.admin.auth_settings
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 pluggable authentication controller for RhodeCode
18 pluggable authentication controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.admin.defaults
15 kallithea.controllers.admin.defaults
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 default settings controller for Rhodecode
18 default settings controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.admin.gist
15 kallithea.controllers.admin.gist
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 gist controller for RhodeCode
18 gist controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.admin.my_account
15 kallithea.controllers.admin.my_account
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 my account controller for rhodecode admin
18 my account controller for Kallithea admin
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.admin.notifications
15 kallithea.controllers.admin.notifications
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 notifications controller for RhodeCode
18 notifications controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.admin.permissions
15 kallithea.controllers.admin.permissions
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 permissions controller for Rhodecode
18 permissions controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.admin.repo_groups
15 kallithea.controllers.admin.repo_groups
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Repository groups controller for RhodeCode
18 Repository groups controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.admin.repos
15 kallithea.controllers.admin.repos
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Repositories controller for RhodeCode
18 Repositories controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.admin.settings
15 kallithea.controllers.admin.settings
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 settings controller for rhodecode admin
18 settings controller for Kallithea admin
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -351,9 +351,9 b' class SettingsController(BaseController)'
351 c.active = 'email'
351 c.active = 'email'
352 if request.POST:
352 if request.POST:
353 test_email = request.POST.get('test_email')
353 test_email = request.POST.get('test_email')
354 test_email_subj = 'RhodeCode test email'
354 test_email_subj = 'Kallithea test email'
355 test_email_body = ('RhodeCode Email test, '
355 test_email_body = ('Kallithea Email test, '
356 'RhodeCode version: %s' % c.kallithea_version)
356 'Kallithea version: %s' % c.kallithea_version)
357 if not test_email:
357 if not test_email:
358 h.flash(_('Please enter email address'), category='error')
358 h.flash(_('Please enter email address'), category='error')
359 return redirect(url('admin_settings_email'))
359 return redirect(url('admin_settings_email'))
@@ -494,7 +494,7 b' class SettingsController(BaseController)'
494 ver = kallithea.__version__
494 ver = kallithea.__version__
495 log.debug('Checking for upgrade on `%s` server' % _update_url)
495 log.debug('Checking for upgrade on `%s` server' % _update_url)
496 opener = urllib2.build_opener()
496 opener = urllib2.build_opener()
497 opener.addheaders = [('User-agent', 'RhodeCode-SCM/%s' % ver)]
497 opener.addheaders = [('User-agent', 'Kallithea-SCM/%s' % ver)]
498 response = opener.open(_update_url)
498 response = opener.open(_update_url)
499 response_data = response.read()
499 response_data = response.read()
500 data = json.loads(response_data)
500 data = json.loads(response_data)
@@ -123,7 +123,7 b' class UsersController(BaseController):'
123 def create(self):
123 def create(self):
124 """POST /users: Create a new item"""
124 """POST /users: Create a new item"""
125 # url('users')
125 # url('users')
126 c.default_extern_type = auth_modules.auth_internal.RhodeCodeAuthPlugin.name
126 c.default_extern_type = auth_modules.auth_internal.KallitheaAuthPlugin.name
127 user_model = UserModel()
127 user_model = UserModel()
128 user_form = UserForm()()
128 user_form = UserForm()()
129 try:
129 try:
@@ -153,7 +153,7 b' class UsersController(BaseController):'
153 def new(self, format='html'):
153 def new(self, format='html'):
154 """GET /users/new: Form to create a new item"""
154 """GET /users/new: Form to create a new item"""
155 # url('new_user')
155 # url('new_user')
156 c.default_extern_type = auth_modules.auth_internal.RhodeCodeAuthPlugin.name
156 c.default_extern_type = auth_modules.auth_internal.KallitheaAuthPlugin.name
157 return render('admin/users/user_add.html')
157 return render('admin/users/user_add.html')
158
158
159 def update(self, id):
159 def update(self, id):
@@ -15,7 +15,7 b''
15 kallithea.controllers.api
15 kallithea.controllers.api
16 ~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 API controller for RhodeCode
18 API controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -473,7 +473,7 b' class ApiController(JSONRPCController):'
473 @HasPermissionAllDecorator('hg.admin')
473 @HasPermissionAllDecorator('hg.admin')
474 def get_ip(self, apiuser, userid=Optional(OAttr('apiuser'))):
474 def get_ip(self, apiuser, userid=Optional(OAttr('apiuser'))):
475 """
475 """
476 Shows IP address as seen from RhodeCode server, together with all
476 Shows IP address as seen from Kallithea server, together with all
477 defined IP addresses for given user. If userid is not passed data is
477 defined IP addresses for given user. If userid is not passed data is
478 returned for user who's calling this function.
478 returned for user who's calling this function.
479 This command can be executed only using api_key belonging to user with
479 This command can be executed only using api_key belonging to user with
@@ -514,7 +514,7 b' class ApiController(JSONRPCController):'
514 @HasPermissionAllDecorator('hg.admin')
514 @HasPermissionAllDecorator('hg.admin')
515 def get_server_info(self, apiuser):
515 def get_server_info(self, apiuser):
516 """
516 """
517 return server info, including RhodeCode version and installed packages
517 return server info, including Kallithea version and installed packages
518
518
519 :param apiuser: filled automatically from apikey
519 :param apiuser: filled automatically from apikey
520 :type apiuser: AuthUser
520 :type apiuser: AuthUser
@@ -526,7 +526,7 b' class ApiController(JSONRPCController):'
526 'modules': [<module name>,...]
526 'modules': [<module name>,...]
527 'py_version': <python version>,
527 'py_version': <python version>,
528 'platform': <platform type>,
528 'platform': <platform type>,
529 'kallithea_version': <rhodecode version>
529 'kallithea_version': <kallithea version>
530 }
530 }
531 error : null
531 error : null
532 """
532 """
@@ -1456,7 +1456,7 b' class ApiController(JSONRPCController):'
1456 if not isinstance(owner, Optional):
1456 if not isinstance(owner, Optional):
1457 #forbid setting owner for non-admins
1457 #forbid setting owner for non-admins
1458 raise JSONRPCError(
1458 raise JSONRPCError(
1459 'Only RhodeCode admin can specify `owner` param'
1459 'Only Kallithea admin can specify `owner` param'
1460 )
1460 )
1461 if isinstance(owner, Optional):
1461 if isinstance(owner, Optional):
1462 owner = apiuser.user_id
1462 owner = apiuser.user_id
@@ -1650,7 +1650,7 b' class ApiController(JSONRPCController):'
1650 if not isinstance(owner, Optional):
1650 if not isinstance(owner, Optional):
1651 #forbid setting owner for non-admins
1651 #forbid setting owner for non-admins
1652 raise JSONRPCError(
1652 raise JSONRPCError(
1653 'Only RhodeCode admin can specify `owner` param'
1653 'Only Kallithea admin can specify `owner` param'
1654 )
1654 )
1655 else:
1655 else:
1656 raise JSONRPCError('repository `%s` does not exist' % (repoid,))
1656 raise JSONRPCError('repository `%s` does not exist' % (repoid,))
@@ -15,7 +15,7 b''
15 kallithea.controllers.bookmarks
15 kallithea.controllers.bookmarks
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Bookmarks controller for rhodecode
18 Bookmarks controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.branches
15 kallithea.controllers.branches
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 branches controller for rhodecode
18 branches controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.changelog
15 kallithea.controllers.changelog
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 changelog controller for rhodecode
18 changelog controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.error
15 kallithea.controllers.error
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 RhodeCode error controller
18 Kallithea error controller
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.feed
15 kallithea.controllers.feed
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Feed controller for rhodecode
18 Feed controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.files
15 kallithea.controllers.files
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Files controller for RhodeCode
18 Files controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -321,7 +321,7 b' class FilesController(BaseRepoController'
321 c.cs = self.__get_cs_or_redirect(revision, repo_name)
321 c.cs = self.__get_cs_or_redirect(revision, repo_name)
322 c.file = self.__get_filenode_or_redirect(repo_name, c.cs, f_path)
322 c.file = self.__get_filenode_or_redirect(repo_name, c.cs, f_path)
323
323
324 c.default_message = _('Deleted file %s via RhodeCode') % (f_path)
324 c.default_message = _('Deleted file %s via Kallithea') % (f_path)
325 c.f_path = f_path
325 c.f_path = f_path
326 node_path = f_path
326 node_path = f_path
327 author = self.authuser.full_contact
327 author = self.authuser.full_contact
@@ -384,7 +384,7 b' class FilesController(BaseRepoController'
384 if c.file.is_binary:
384 if c.file.is_binary:
385 return redirect(url('files_home', repo_name=c.repo_name,
385 return redirect(url('files_home', repo_name=c.repo_name,
386 revision=c.cs.raw_id, f_path=f_path))
386 revision=c.cs.raw_id, f_path=f_path))
387 c.default_message = _('Edited file %s via RhodeCode') % (f_path)
387 c.default_message = _('Edited file %s via Kallithea') % (f_path)
388 c.f_path = f_path
388 c.f_path = f_path
389
389
390 if r_post:
390 if r_post:
@@ -437,7 +437,7 b' class FilesController(BaseRepoController'
437 redirect_after=False)
437 redirect_after=False)
438 if c.cs is None:
438 if c.cs is None:
439 c.cs = EmptyChangeset(alias=c.db_repo_scm_instance.alias)
439 c.cs = EmptyChangeset(alias=c.db_repo_scm_instance.alias)
440 c.default_message = (_('Added file via RhodeCode'))
440 c.default_message = (_('Added file via Kallithea'))
441 c.f_path = f_path
441 c.f_path = f_path
442
442
443 if r_post:
443 if r_post:
@@ -15,7 +15,7 b''
15 kallithea.controllers.followers
15 kallithea.controllers.followers
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Followers controller for rhodecode
18 Followers controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.forks
15 kallithea.controllers.forks
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 forks controller for rhodecode
18 forks controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.home
15 kallithea.controllers.home
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Home controller for Rhodecode
18 Home controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.login
15 kallithea.controllers.login
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Login controller for rhodeocode
18 Login controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -190,7 +190,7 b' class LoginController(BaseController):'
190 error_dict=error_dict)
190 error_dict=error_dict)
191
191
192 UserModel().create_registration(form_result)
192 UserModel().create_registration(form_result)
193 h.flash(_('You have successfully registered into RhodeCode'),
193 h.flash(_('You have successfully registered into Kallithea'),
194 category='success')
194 category='success')
195 Session().commit()
195 Session().commit()
196 return redirect(url('login_home'))
196 return redirect(url('login_home'))
@@ -15,7 +15,7 b''
15 kallithea.controllers.pullrequests
15 kallithea.controllers.pullrequests
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 pull requests controller for rhodecode for initializing pull requests
18 pull requests controller for Kallithea for initializing pull requests
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.search
15 kallithea.controllers.search
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Search controller for RhodeCode
18 Search controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.summary
15 kallithea.controllers.summary
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Summary controller for Rhodecode
18 Summary controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.controllers.tags
15 kallithea.controllers.tags
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Tags controller for rhodecode
18 Tags controller for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -1,16 +1,16 b''
1 # Translations template for RhodeCode.
1 # Translations template for Kallithea.
2 # Copyright (C) 2014 RhodeCode GmbH, and others.
2 # Copyright (C) 2014 RhodeCode GmbH, and others.
3 # This file is distributed under the same license as the RhodeCode project.
3 # This file is distributed under the same license as the Kallithea project.
4 # Translators:
4 # Translators:
5 # stephanj <info@stephan-jauernick.de>, 2013
5 # stephanj <info@stephan-jauernick.de>, 2013
6 msgid ""
6 msgid ""
7 msgstr ""
7 msgstr ""
8 "Project-Id-Version: RhodeCode\n"
8 "Project-Id-Version: Kallithea\n"
9 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
9 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
10 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
10 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
11 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
11 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
12 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
12 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
13 "Language-Team: German (http://www.transifex.com/projects/p/RhodeCode/language/de/)\n"
13 "Language-Team: German (http://www.transifex.com/projects/p/Kallithea/language/de/)\n"
14 "MIME-Version: 1.0\n"
14 "MIME-Version: 1.0\n"
15 "Content-Type: text/plain; charset=UTF-8\n"
15 "Content-Type: text/plain; charset=UTF-8\n"
16 "Content-Transfer-Encoding: 8bit\n"
16 "Content-Transfer-Encoding: 8bit\n"
@@ -138,7 +138,7 b' msgstr ""'
138
138
139 #: kallithea/controllers/files.py:322
139 #: kallithea/controllers/files.py:322
140 #, python-format
140 #, python-format
141 msgid "Deleted file %s via RhodeCode"
141 msgid "Deleted file %s via Kallithea"
142 msgstr ""
142 msgstr ""
143
143
144 #: kallithea/controllers/files.py:344
144 #: kallithea/controllers/files.py:344
@@ -157,7 +157,7 b' msgstr ""'
157
157
158 #: kallithea/controllers/files.py:385
158 #: kallithea/controllers/files.py:385
159 #, python-format
159 #, python-format
160 msgid "Edited file %s via RhodeCode"
160 msgid "Edited file %s via Kallithea"
161 msgstr ""
161 msgstr ""
162
162
163 #: kallithea/controllers/files.py:401
163 #: kallithea/controllers/files.py:401
@@ -170,7 +170,7 b' msgid "Successfully committed to %s"'
170 msgstr "Der Commit zu %s war erfolgreich"
170 msgstr "Der Commit zu %s war erfolgreich"
171
171
172 #: kallithea/controllers/files.py:438
172 #: kallithea/controllers/files.py:438
173 msgid "Added file via RhodeCode"
173 msgid "Added file via Kallithea"
174 msgstr ""
174 msgstr ""
175
175
176 #: kallithea/controllers/files.py:459
176 #: kallithea/controllers/files.py:459
@@ -275,7 +275,7 b' msgid "bad captcha"'
275 msgstr ""
275 msgstr ""
276
276
277 #: kallithea/controllers/login.py:191
277 #: kallithea/controllers/login.py:191
278 msgid "You have successfully registered into RhodeCode"
278 msgid "You have successfully registered into Kallithea"
279 msgstr ""
279 msgstr ""
280
280
281 #: kallithea/controllers/login.py:235
281 #: kallithea/controllers/login.py:235
@@ -1102,7 +1102,7 b' msgid "[pushed] into"'
1102 msgstr "[übermittelt] in"
1102 msgstr "[übermittelt] in"
1103
1103
1104 #: kallithea/lib/helpers.py:779
1104 #: kallithea/lib/helpers.py:779
1105 msgid "[committed via RhodeCode] into repository"
1105 msgid "[committed via Kallithea] into repository"
1106 msgstr ""
1106 msgstr ""
1107
1107
1108 #: kallithea/lib/helpers.py:781
1108 #: kallithea/lib/helpers.py:781
@@ -1319,8 +1319,8 b' msgstr "Repository Gruppe hat Administra'
1319 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1319 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1320 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1320 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1321 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1321 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1322 msgid "RhodeCode Administrator"
1322 msgid "Kallithea Administrator"
1323 msgstr "RhodeCode Administrator"
1323 msgstr "Kallithea Administrator"
1324
1324
1325 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
1325 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
1326 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
1326 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
@@ -1393,15 +1393,15 b' msgstr "Registrierung deaktiviert"'
1393 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1393 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1394 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1394 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1395 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1395 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1396 msgid "Register new user with RhodeCode with manual activation"
1396 msgid "Register new user with Kallithea with manual activation"
1397 msgstr "Registrierung neuer Benutzer in RhodeCode mit manueller Aktivierung"
1397 msgstr "Registrierung neuer Benutzer in Kallithea mit manueller Aktivierung"
1398
1398
1399 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1399 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1400 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1400 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1401 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1401 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1402 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1402 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1403 msgid "Register new user with RhodeCode with auto activation"
1403 msgid "Register new user with Kallithea with auto activation"
1404 msgstr "Registrierung neuer Benutzer in RhodeCode mit Automatischer Aktivierung"
1404 msgstr "Registrierung neuer Benutzer in Kallithea mit Automatischer Aktivierung"
1405
1405
1406 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
1406 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
1407 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
1407 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
@@ -1704,7 +1704,7 b' msgstr ""'
1704
1704
1705 #: kallithea/model/notification.py:232
1705 #: kallithea/model/notification.py:232
1706 #, python-format
1706 #, python-format
1707 msgid "%(user)s registered in RhodeCode at %(when)s"
1707 msgid "%(user)s registered in Kallithea at %(when)s"
1708 msgstr ""
1708 msgstr ""
1709
1709
1710 #: kallithea/model/notification.py:233
1710 #: kallithea/model/notification.py:233
@@ -1755,7 +1755,7 b' msgstr ""'
1755
1755
1756 #: kallithea/model/user.py:332
1756 #: kallithea/model/user.py:332
1757 #, python-format
1757 #, python-format
1758 msgid "Your new RhodeCode password:%s"
1758 msgid "Your new Kallithea password:%s"
1759 msgstr ""
1759 msgstr ""
1760
1760
1761 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
1761 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
@@ -2321,7 +2321,7 b' msgstr ""'
2321 #: kallithea/templates/admin/auth/auth_settings.html:36
2321 #: kallithea/templates/admin/auth/auth_settings.html:36
2322 msgid ""
2322 msgid ""
2323 "Comma separated list of plugins. Order of plugins is also order in which "
2323 "Comma separated list of plugins. Order of plugins is also order in which "
2324 "RhodeCode will try to authenticate user"
2324 "Kallithea will try to authenticate user"
2325 msgstr ""
2325 msgstr ""
2326
2326
2327 #: kallithea/templates/admin/auth/auth_settings.html:37
2327 #: kallithea/templates/admin/auth/auth_settings.html:37
@@ -2929,7 +2929,7 b' msgstr "Anonymer Zugang"'
2929 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2929 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2930 #, python-format
2930 #, python-format
2931 msgid ""
2931 msgid ""
2932 "Allow access to RhodeCode without need to log in. Anonymous users use %s "
2932 "Allow access to Kallithea without need to log in. Anonymous users use %s "
2933 "user permissions"
2933 "user permissions"
2934 msgstr ""
2934 msgstr ""
2935
2935
@@ -3298,7 +3298,7 b' msgstr ""'
3298 #: kallithea/templates/admin/repos/repo_creating.html:42
3298 #: kallithea/templates/admin/repos/repo_creating.html:42
3299 msgid ""
3299 msgid ""
3300 "We're sorry but error occured during this operation. Please check your "
3300 "We're sorry but error occured during this operation. Please check your "
3301 "RhodeCode server logs, or contact administrator."
3301 "Kallithea server logs, or contact administrator."
3302 msgstr ""
3302 msgstr ""
3303
3303
3304 #: kallithea/templates/admin/repos/repo_edit.html:8
3304 #: kallithea/templates/admin/repos/repo_edit.html:8
@@ -3417,7 +3417,7 b' msgstr ""'
3417 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3417 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3418 msgid ""
3418 msgid ""
3419 "This repository will be renamed in a special way in order to be unaccesible "
3419 "This repository will be renamed in a special way in order to be unaccesible "
3420 "for RhodeCode and VCS systems. If you need to fully delete it from file "
3420 "for Kallithea and VCS systems. If you need to fully delete it from file "
3421 "system please do it manually"
3421 "system please do it manually"
3422 msgstr ""
3422 msgstr ""
3423
3423
@@ -3630,7 +3630,7 b' msgid "Email prefix"'
3630 msgstr ""
3630 msgstr ""
3631
3631
3632 #: kallithea/templates/admin/settings/settings_email.html:5
3632 #: kallithea/templates/admin/settings/settings_email.html:5
3633 msgid "RhodeCode email from"
3633 msgid "Kallithea email from"
3634 msgstr ""
3634 msgstr ""
3635
3635
3636 #: kallithea/templates/admin/settings/settings_email.html:6
3636 #: kallithea/templates/admin/settings/settings_email.html:6
@@ -3682,7 +3682,7 b' msgid "Site branding"'
3682 msgstr ""
3682 msgstr ""
3683
3683
3684 #: kallithea/templates/admin/settings/settings_global.html:12
3684 #: kallithea/templates/admin/settings/settings_global.html:12
3685 msgid "Set a custom title for your RhodeCode Service."
3685 msgid "Set a custom title for your Kallithea Service."
3686 msgstr ""
3686 msgstr ""
3687
3687
3688 #: kallithea/templates/admin/settings/settings_global.html:18
3688 #: kallithea/templates/admin/settings/settings_global.html:18
@@ -3742,7 +3742,7 b' msgstr ""'
3742
3742
3743 #: kallithea/templates/admin/settings/settings_license.html:9
3743 #: kallithea/templates/admin/settings/settings_license.html:9
3744 #: kallithea/templates/admin/settings/settings_system.html:4
3744 #: kallithea/templates/admin/settings/settings_system.html:4
3745 msgid "RhodeCode version"
3745 msgid "Kallithea version"
3746 msgstr ""
3746 msgstr ""
3747
3747
3748 #: kallithea/templates/admin/settings/settings_license.html:10
3748 #: kallithea/templates/admin/settings/settings_license.html:10
@@ -3778,7 +3778,7 b' msgid "License key"'
3778 msgstr ""
3778 msgstr ""
3779
3779
3780 #: kallithea/templates/admin/settings/settings_license.html:37
3780 #: kallithea/templates/admin/settings/settings_license.html:37
3781 msgid "Paste your RhodeCode license key into that textarea."
3781 msgid "Paste your Kallithea license key into that textarea."
3782 msgstr ""
3782 msgstr ""
3783
3783
3784 #: kallithea/templates/admin/settings/settings_license.html:52
3784 #: kallithea/templates/admin/settings/settings_license.html:52
@@ -3817,7 +3817,7 b' msgstr ""'
3817
3817
3818 #: kallithea/templates/admin/settings/settings_mapping.html:25
3818 #: kallithea/templates/admin/settings/settings_mapping.html:25
3819 msgid ""
3819 msgid ""
3820 "Verify if RhodeCodes GIT hooks are installed for each repository. Current "
3820 "Verify if Kallitheas GIT hooks are installed for each repository. Current "
3821 "hooks will be updated to latest version"
3821 "hooks will be updated to latest version"
3822 msgstr ""
3822 msgstr ""
3823
3823
@@ -3835,7 +3835,7 b' msgstr ""'
3835
3835
3836 #: kallithea/templates/admin/settings/settings_search.html:15
3836 #: kallithea/templates/admin/settings/settings_search.html:15
3837 msgid ""
3837 msgid ""
3838 "This option completely reindex all the files within RhodeCode for proper "
3838 "This option completely reindex all the files within Kallithea for proper "
3839 "fulltext search capabilities."
3839 "fulltext search capabilities."
3840 msgstr ""
3840 msgstr ""
3841
3841
@@ -3889,7 +3889,7 b' msgstr ""'
3889
3889
3890 #: kallithea/templates/admin/settings/settings_vcs.html:13
3890 #: kallithea/templates/admin/settings/settings_vcs.html:13
3891 msgid ""
3891 msgid ""
3892 "Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
3892 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
3893 "certificate is missing it will return a HTTP Error 406: Not Acceptable."
3893 "certificate is missing it will return a HTTP Error 406: Not Acceptable."
3894 msgstr ""
3894 msgstr ""
3895
3895
@@ -3933,7 +3933,7 b' msgstr ""'
3933
3933
3934 #: kallithea/templates/admin/settings/settings_vcs.html:69
3934 #: kallithea/templates/admin/settings/settings_vcs.html:69
3935 msgid ""
3935 msgid ""
3936 "Click to unlock. You must restart RhodeCode in order to make this setting "
3936 "Click to unlock. You must restart Kallithea in order to make this setting "
3937 "take effect."
3937 "take effect."
3938 msgstr ""
3938 msgstr ""
3939
3939
@@ -3956,34 +3956,34 b' msgid "Allows storing additional customi'
3956 msgstr ""
3956 msgstr ""
3957
3957
3958 #: kallithea/templates/admin/settings/settings_visual.html:18
3958 #: kallithea/templates/admin/settings/settings_visual.html:18
3959 msgid "Show RhodeCode version"
3959 msgid "Show Kallithea version"
3960 msgstr ""
3960 msgstr ""
3961
3961
3962 #: kallithea/templates/admin/settings/settings_visual.html:20
3962 #: kallithea/templates/admin/settings/settings_visual.html:20
3963 msgid "Shows or hides a version number of RhodeCode displayed in the footer."
3963 msgid "Shows or hides a version number of Kallithea displayed in the footer."
3964 msgstr ""
3964 msgstr ""
3965
3965
3966 #: kallithea/templates/admin/settings/settings_visual.html:24
3966 #: kallithea/templates/admin/settings/settings_visual.html:24
3967 msgid "Use Gravatars in RhodeCode"
3967 msgid "Use Gravatars in Kallithea"
3968 msgstr ""
3968 msgstr ""
3969
3969
3970 #: kallithea/templates/admin/settings/settings_visual.html:30
3970 #: kallithea/templates/admin/settings/settings_visual.html:30
3971 msgid ""
3971 msgid ""
3972 "Gravatar url allows you to use other avatar server application.\n"
3972 "Gravatar url allows you to use other avatar server application.\n"
3973 " Following variables of the URL will be replaced accordingly.\n"
3973 " Following variables of the URL will be replaced accordingly.\n"
3974 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
3974 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
3975 " {email} user email,\n"
3975 " {email} user email,\n"
3976 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
3976 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
3977 " {size} size of the image that is expected from the server application,\n"
3977 " {size} size of the image that is expected from the server application,\n"
3978 " {netloc} network location/server host of running RhodeCode server"
3978 " {netloc} network location/server host of running Kallithea server"
3979 msgstr ""
3979 msgstr ""
3980
3980
3981 #: kallithea/templates/admin/settings/settings_visual.html:42
3981 #: kallithea/templates/admin/settings/settings_visual.html:42
3982 msgid ""
3982 msgid ""
3983 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
3983 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
3984 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
3984 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
3985 " {user} current user username,\n"
3985 " {user} current user username,\n"
3986 " {netloc} network location/server host of running RhodeCode server,\n"
3986 " {netloc} network location/server host of running Kallithea server,\n"
3987 " {repo} full repository name,\n"
3987 " {repo} full repository name,\n"
3988 " {repoid} ID of repository, can be used to contruct clone-by-id"
3988 " {repoid} ID of repository, can be used to contruct clone-by-id"
3989 msgstr ""
3989 msgstr ""
@@ -4698,7 +4698,7 b' msgid "Refs"'
4698 msgstr ""
4698 msgstr ""
4699
4699
4700 #: kallithea/templates/changelog/changelog_summary_data.html:86
4700 #: kallithea/templates/changelog/changelog_summary_data.html:86
4701 msgid "Add or upload files directly via RhodeCode"
4701 msgid "Add or upload files directly via Kallithea"
4702 msgstr ""
4702 msgstr ""
4703
4703
4704 #: kallithea/templates/changelog/changelog_summary_data.html:89
4704 #: kallithea/templates/changelog/changelog_summary_data.html:89
@@ -4844,7 +4844,7 b' msgstr ""'
4844 #: kallithea/templates/changeset/changeset_file_comment.html:69
4844 #: kallithea/templates/changeset/changeset_file_comment.html:69
4845 #: kallithea/templates/changeset/changeset_file_comment.html:155
4845 #: kallithea/templates/changeset/changeset_file_comment.html:155
4846 msgid ""
4846 msgid ""
4847 "Use @username inside this text to send notification to this RhodeCode user"
4847 "Use @username inside this text to send notification to this Kallithea user"
4848 msgstr ""
4848 msgstr ""
4849
4849
4850 #: kallithea/templates/changeset/changeset_file_comment.html:73
4850 #: kallithea/templates/changeset/changeset_file_comment.html:73
@@ -5009,7 +5009,7 b' msgid "The changeset status was changed '
5009 msgstr ""
5009 msgstr ""
5010
5010
5011 #: kallithea/templates/email_templates/main.html:8
5011 #: kallithea/templates/email_templates/main.html:8
5012 msgid "This is a notification from RhodeCode."
5012 msgid "This is a notification from Kallithea."
5013 msgstr ""
5013 msgstr ""
5014
5014
5015 #: kallithea/templates/email_templates/password_reset.html:4
5015 #: kallithea/templates/email_templates/password_reset.html:4
@@ -1,11 +1,11 b''
1 # English translations for rhodecode.
1 # English translations for Kallithea.
2 # Copyright (C) 2010 ORGANIZATION
2 # Copyright (C) 2010 ORGANIZATION
3 # This file is distributed under the same license as the rhodecode project.
3 # This file is distributed under the same license as the Kallithea project.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5 #
5 #
6 msgid ""
6 msgid ""
7 msgstr ""
7 msgstr ""
8 "Project-Id-Version: rhodecode 0.1\n"
8 "Project-Id-Version: Kallithea 0.1\n"
9 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
9 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
10 "POT-Creation-Date: 2013-06-01 18:38+0200\n"
10 "POT-Creation-Date: 2013-06-01 18:38+0200\n"
11 "PO-Revision-Date: 2011-02-25 19:13+0100\n"
11 "PO-Revision-Date: 2011-02-25 19:13+0100\n"
@@ -122,7 +122,7 b' msgstr ""'
122
122
123 #: kallithea/controllers/files.py:297
123 #: kallithea/controllers/files.py:297
124 #, python-format
124 #, python-format
125 msgid "Edited file %s via RhodeCode"
125 msgid "Edited file %s via Kallithea"
126 msgstr ""
126 msgstr ""
127
127
128 #: kallithea/controllers/files.py:313
128 #: kallithea/controllers/files.py:313
@@ -139,7 +139,7 b' msgid "Error occurred during commit"'
139 msgstr ""
139 msgstr ""
140
140
141 #: kallithea/controllers/files.py:351
141 #: kallithea/controllers/files.py:351
142 msgid "Added file via RhodeCode"
142 msgid "Added file via Kallithea"
143 msgstr ""
143 msgstr ""
144
144
145 #: kallithea/controllers/files.py:368
145 #: kallithea/controllers/files.py:368
@@ -212,7 +212,7 b' msgid "journal"'
212 msgstr ""
212 msgstr ""
213
213
214 #: kallithea/controllers/login.py:138
214 #: kallithea/controllers/login.py:138
215 msgid "You have successfully registered into RhodeCode"
215 msgid "You have successfully registered into Kallithea"
216 msgstr ""
216 msgstr ""
217
217
218 #: kallithea/controllers/login.py:159
218 #: kallithea/controllers/login.py:159
@@ -969,7 +969,7 b' msgid "[pushed] into"'
969 msgstr ""
969 msgstr ""
970
970
971 #: kallithea/lib/helpers.py:761
971 #: kallithea/lib/helpers.py:761
972 msgid "[committed via RhodeCode] into repository"
972 msgid "[committed via Kallithea] into repository"
973 msgstr ""
973 msgstr ""
974
974
975 #: kallithea/lib/helpers.py:763
975 #: kallithea/lib/helpers.py:763
@@ -1156,7 +1156,7 b' msgstr ""'
1156 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
1156 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313
1157 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398
1157 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398
1158 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 kallithea/model/db.py:1411
1158 #: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 kallithea/model/db.py:1411
1159 msgid "RhodeCode Administrator"
1159 msgid "Kallithea Administrator"
1160 msgstr ""
1160 msgstr ""
1161
1161
1162 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
1162 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174
@@ -1202,14 +1202,14 b' msgstr ""'
1202 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1202 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1203 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1203 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1204 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1204 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1205 msgid "Register new user with RhodeCode with manual activation"
1205 msgid "Register new user with Kallithea with manual activation"
1206 msgstr ""
1206 msgstr ""
1207
1207
1208 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182
1208 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182
1209 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1209 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1210 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1210 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1211 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1211 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1212 msgid "Register new user with RhodeCode with auto activation"
1212 msgid "Register new user with Kallithea with auto activation"
1213 msgstr ""
1213 msgstr ""
1214
1214
1215 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623
1215 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623
@@ -1357,7 +1357,7 b' msgstr ""'
1357
1357
1358 #: kallithea/model/notification.py:231
1358 #: kallithea/model/notification.py:231
1359 #, python-format
1359 #, python-format
1360 msgid "%(user)s registered in RhodeCode at %(when)s"
1360 msgid "%(user)s registered in Kallithea at %(when)s"
1361 msgstr ""
1361 msgstr ""
1362
1362
1363 #: kallithea/model/notification.py:232
1363 #: kallithea/model/notification.py:232
@@ -1408,7 +1408,7 b' msgstr ""'
1408
1408
1409 #: kallithea/model/user.py:367
1409 #: kallithea/model/user.py:367
1410 #, python-format
1410 #, python-format
1411 msgid "Your new RhodeCode password:%s"
1411 msgid "Your new Kallithea password:%s"
1412 msgstr ""
1412 msgstr ""
1413
1413
1414 #: kallithea/model/validators.py:38 kallithea/model/validators.py:39
1414 #: kallithea/model/validators.py:38 kallithea/model/validators.py:39
@@ -2604,7 +2604,7 b' msgstr ""'
2604 #: kallithea/templates/admin/repos/repo_edit.html:315
2604 #: kallithea/templates/admin/repos/repo_edit.html:315
2605 msgid ""
2605 msgid ""
2606 "This repository will be renamed in a special way in order to be "
2606 "This repository will be renamed in a special way in order to be "
2607 "unaccesible for RhodeCode and VCS systems. If you need to fully delete it"
2607 "unaccesible for Kallithea and VCS systems. If you need to fully delete it"
2608 " from file system please do it manually"
2608 " from file system please do it manually"
2609 msgstr ""
2609 msgstr ""
2610
2610
@@ -2919,11 +2919,11 b' msgid "Allows storing additional customi'
2919 msgstr ""
2919 msgstr ""
2920
2920
2921 #: kallithea/templates/admin/settings/settings.html:139
2921 #: kallithea/templates/admin/settings/settings.html:139
2922 msgid "Show RhodeCode version"
2922 msgid "Show Kallithea version"
2923 msgstr ""
2923 msgstr ""
2924
2924
2925 #: kallithea/templates/admin/settings/settings.html:141
2925 #: kallithea/templates/admin/settings/settings.html:141
2926 msgid "Shows or hides displayed version of RhodeCode in the footer"
2926 msgid "Shows or hides displayed version of Kallithea in the footer"
2927 msgstr ""
2927 msgstr ""
2928
2928
2929 #: kallithea/templates/admin/settings/settings.html:146
2929 #: kallithea/templates/admin/settings/settings.html:146
@@ -2974,7 +2974,7 b' msgstr ""'
2974
2974
2975 #: kallithea/templates/admin/settings/settings.html:220
2975 #: kallithea/templates/admin/settings/settings.html:220
2976 msgid ""
2976 msgid ""
2977 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it "
2977 "Kallithea will require SSL for pushing or pulling. If SSL is missing it "
2978 "will return HTTP Error 406: Not Acceptable"
2978 "will return HTTP Error 406: Not Acceptable"
2979 msgstr ""
2979 msgstr ""
2980
2980
@@ -3026,7 +3026,7 b' msgstr ""'
3026
3026
3027 #: kallithea/templates/admin/settings/settings.html:279
3027 #: kallithea/templates/admin/settings/settings.html:279
3028 msgid ""
3028 msgid ""
3029 "Click to unlock. You must restart RhodeCode in order to make this setting"
3029 "Click to unlock. You must restart Kallithea in order to make this setting"
3030 " take effect."
3030 " take effect."
3031 msgstr ""
3031 msgstr ""
3032
3032
@@ -3697,7 +3697,7 b' msgid "Refs"'
3697 msgstr ""
3697 msgstr ""
3698
3698
3699 #: kallithea/templates/changelog/changelog_summary_data.html:86
3699 #: kallithea/templates/changelog/changelog_summary_data.html:86
3700 msgid "Add or upload files directly via RhodeCode"
3700 msgid "Add or upload files directly via Kallithea"
3701 msgstr ""
3701 msgstr ""
3702
3702
3703 #: kallithea/templates/changelog/changelog_summary_data.html:89
3703 #: kallithea/templates/changelog/changelog_summary_data.html:89
@@ -3828,7 +3828,7 b' msgstr ""'
3828
3828
3829 #: kallithea/templates/changeset/changeset_file_comment.html:61
3829 #: kallithea/templates/changeset/changeset_file_comment.html:61
3830 #: kallithea/templates/changeset/changeset_file_comment.html:147
3830 #: kallithea/templates/changeset/changeset_file_comment.html:147
3831 msgid "Use @username inside this text to send notification to this RhodeCode user"
3831 msgid "Use @username inside this text to send notification to this Kallithea user"
3832 msgstr ""
3832 msgstr ""
3833
3833
3834 #: kallithea/templates/changeset/changeset_file_comment.html:65
3834 #: kallithea/templates/changeset/changeset_file_comment.html:65
@@ -3990,7 +3990,7 b' msgid "The changeset status was changed '
3990 msgstr ""
3990 msgstr ""
3991
3991
3992 #: kallithea/templates/email_templates/main.html:8
3992 #: kallithea/templates/email_templates/main.html:8
3993 msgid "This is a notification from RhodeCode."
3993 msgid "This is a notification from Kallithea."
3994 msgstr ""
3994 msgstr ""
3995
3995
3996 #: kallithea/templates/email_templates/password_reset.html:4
3996 #: kallithea/templates/email_templates/password_reset.html:4
@@ -1,16 +1,16 b''
1 # Translations template for RhodeCode.
1 # Translations template for Kallithea.
2 # Copyright (C) 2014 RhodeCode GmbH, and others.
2 # Copyright (C) 2014 RhodeCode GmbH, and others.
3 # This file is distributed under the same license as the RhodeCode project.
3 # This file is distributed under the same license as the Kallithea project.
4 # Translators:
4 # Translators:
5 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
5 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
6 msgid ""
6 msgid ""
7 msgstr ""
7 msgstr ""
8 "Project-Id-Version: RhodeCode\n"
8 "Project-Id-Version: Kallithea\n"
9 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
9 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
10 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
10 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
11 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
11 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
12 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
12 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
13 "Language-Team: French (http://www.transifex.com/projects/p/RhodeCode/language/fr/)\n"
13 "Language-Team: French (http://www.transifex.com/projects/p/Kallithea/language/fr/)\n"
14 "MIME-Version: 1.0\n"
14 "MIME-Version: 1.0\n"
15 "Content-Type: text/plain; charset=UTF-8\n"
15 "Content-Type: text/plain; charset=UTF-8\n"
16 "Content-Transfer-Encoding: 8bit\n"
16 "Content-Transfer-Encoding: 8bit\n"
@@ -138,7 +138,7 b' msgstr ""'
138
138
139 #: kallithea/controllers/files.py:322
139 #: kallithea/controllers/files.py:322
140 #, python-format
140 #, python-format
141 msgid "Deleted file %s via RhodeCode"
141 msgid "Deleted file %s via Kallithea"
142 msgstr ""
142 msgstr ""
143
143
144 #: kallithea/controllers/files.py:344
144 #: kallithea/controllers/files.py:344
@@ -157,8 +157,8 b' msgstr ""'
157
157
158 #: kallithea/controllers/files.py:385
158 #: kallithea/controllers/files.py:385
159 #, python-format
159 #, python-format
160 msgid "Edited file %s via RhodeCode"
160 msgid "Edited file %s via Kallithea"
161 msgstr "%s édité via RhodeCode"
161 msgstr "%s édité via Kallithea"
162
162
163 #: kallithea/controllers/files.py:401
163 #: kallithea/controllers/files.py:401
164 msgid "No changes"
164 msgid "No changes"
@@ -170,8 +170,8 b' msgid "Successfully committed to %s"'
170 msgstr "Commit réalisé avec succès sur %s"
170 msgstr "Commit réalisé avec succès sur %s"
171
171
172 #: kallithea/controllers/files.py:438
172 #: kallithea/controllers/files.py:438
173 msgid "Added file via RhodeCode"
173 msgid "Added file via Kallithea"
174 msgstr "%s ajouté par RhodeCode"
174 msgstr "%s ajouté par Kallithea"
175
175
176 #: kallithea/controllers/files.py:459
176 #: kallithea/controllers/files.py:459
177 msgid "No content"
177 msgid "No content"
@@ -275,8 +275,8 b' msgid "bad captcha"'
275 msgstr ""
275 msgstr ""
276
276
277 #: kallithea/controllers/login.py:191
277 #: kallithea/controllers/login.py:191
278 msgid "You have successfully registered into RhodeCode"
278 msgid "You have successfully registered into Kallithea"
279 msgstr "Vous vous êtes inscrits avec succès à RhodeCode"
279 msgstr "Vous vous êtes inscrits avec succès à Kallithea"
280
280
281 #: kallithea/controllers/login.py:235
281 #: kallithea/controllers/login.py:235
282 msgid "Your password reset link was sent"
282 msgid "Your password reset link was sent"
@@ -1102,8 +1102,8 b' msgid "[pushed] into"'
1102 msgstr "[a pushé] dans"
1102 msgstr "[a pushé] dans"
1103
1103
1104 #: kallithea/lib/helpers.py:779
1104 #: kallithea/lib/helpers.py:779
1105 msgid "[committed via RhodeCode] into repository"
1105 msgid "[committed via Kallithea] into repository"
1106 msgstr "[a commité via RhodeCode] dans le dépôt"
1106 msgstr "[a commité via Kallithea] dans le dépôt"
1107
1107
1108 #: kallithea/lib/helpers.py:781
1108 #: kallithea/lib/helpers.py:781
1109 msgid "[pulled from remote] into repository"
1109 msgid "[pulled from remote] into repository"
@@ -1319,8 +1319,8 b' msgstr "Acc\xc3\xa8s administrateur au groupe de d\xc3\xa9p\xc3\xb4ts"'
1319 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1319 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1320 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1320 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1321 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1321 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1322 msgid "RhodeCode Administrator"
1322 msgid "Kallithea Administrator"
1323 msgstr "Administrateur RhodeCode"
1323 msgstr "Administrateur Kallithea"
1324
1324
1325 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
1325 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
1326 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
1326 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
@@ -1393,15 +1393,15 b' msgstr "Enregistrement d\xc3\xa9sactiv\xc3\xa9"'
1393 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1393 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1394 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1394 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1395 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1395 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1396 msgid "Register new user with RhodeCode with manual activation"
1396 msgid "Register new user with Kallithea with manual activation"
1397 msgstr "Enregistrer un nouvel utilisateur Rhodecode manuellement activé"
1397 msgstr "Enregistrer un nouvel utilisateur Kallithea manuellement activé"
1398
1398
1399 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1399 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1400 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1400 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1401 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1401 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1402 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1402 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1403 msgid "Register new user with RhodeCode with auto activation"
1403 msgid "Register new user with Kallithea with auto activation"
1404 msgstr "Enregistrer un nouvel utilisateur Rhodecode auto-activé"
1404 msgstr "Enregistrer un nouvel utilisateur Kallithea auto-activé"
1405
1405
1406 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
1406 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
1407 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
1407 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
@@ -1704,7 +1704,7 b' msgstr ""'
1704
1704
1705 #: kallithea/model/notification.py:232
1705 #: kallithea/model/notification.py:232
1706 #, python-format
1706 #, python-format
1707 msgid "%(user)s registered in RhodeCode at %(when)s"
1707 msgid "%(user)s registered in Kallithea at %(when)s"
1708 msgstr ""
1708 msgstr ""
1709
1709
1710 #: kallithea/model/notification.py:233
1710 #: kallithea/model/notification.py:233
@@ -1755,7 +1755,7 b' msgstr ""'
1755
1755
1756 #: kallithea/model/user.py:332
1756 #: kallithea/model/user.py:332
1757 #, python-format
1757 #, python-format
1758 msgid "Your new RhodeCode password:%s"
1758 msgid "Your new Kallithea password:%s"
1759 msgstr ""
1759 msgstr ""
1760
1760
1761 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
1761 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
@@ -2321,7 +2321,7 b' msgstr ""'
2321 #: kallithea/templates/admin/auth/auth_settings.html:36
2321 #: kallithea/templates/admin/auth/auth_settings.html:36
2322 msgid ""
2322 msgid ""
2323 "Comma separated list of plugins. Order of plugins is also order in which "
2323 "Comma separated list of plugins. Order of plugins is also order in which "
2324 "RhodeCode will try to authenticate user"
2324 "Kallithea will try to authenticate user"
2325 msgstr ""
2325 msgstr ""
2326
2326
2327 #: kallithea/templates/admin/auth/auth_settings.html:37
2327 #: kallithea/templates/admin/auth/auth_settings.html:37
@@ -2929,7 +2929,7 b' msgstr "Acc\xc3\xa8s anonyme"'
2929 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2929 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2930 #, python-format
2930 #, python-format
2931 msgid ""
2931 msgid ""
2932 "Allow access to RhodeCode without need to log in. Anonymous users use %s "
2932 "Allow access to Kallithea without need to log in. Anonymous users use %s "
2933 "user permissions"
2933 "user permissions"
2934 msgstr ""
2934 msgstr ""
2935
2935
@@ -3298,7 +3298,7 b' msgstr ""'
3298 #: kallithea/templates/admin/repos/repo_creating.html:42
3298 #: kallithea/templates/admin/repos/repo_creating.html:42
3299 msgid ""
3299 msgid ""
3300 "We're sorry but error occured during this operation. Please check your "
3300 "We're sorry but error occured during this operation. Please check your "
3301 "RhodeCode server logs, or contact administrator."
3301 "Kallithea server logs, or contact administrator."
3302 msgstr ""
3302 msgstr ""
3303
3303
3304 #: kallithea/templates/admin/repos/repo_edit.html:8
3304 #: kallithea/templates/admin/repos/repo_edit.html:8
@@ -3417,7 +3417,7 b' msgstr ""'
3417 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3417 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3418 msgid ""
3418 msgid ""
3419 "This repository will be renamed in a special way in order to be unaccesible "
3419 "This repository will be renamed in a special way in order to be unaccesible "
3420 "for RhodeCode and VCS systems. If you need to fully delete it from file "
3420 "for Kallithea and VCS systems. If you need to fully delete it from file "
3421 "system please do it manually"
3421 "system please do it manually"
3422 msgstr ""
3422 msgstr ""
3423
3423
@@ -3630,7 +3630,7 b' msgid "Email prefix"'
3630 msgstr ""
3630 msgstr ""
3631
3631
3632 #: kallithea/templates/admin/settings/settings_email.html:5
3632 #: kallithea/templates/admin/settings/settings_email.html:5
3633 msgid "RhodeCode email from"
3633 msgid "Kallithea email from"
3634 msgstr ""
3634 msgstr ""
3635
3635
3636 #: kallithea/templates/admin/settings/settings_email.html:6
3636 #: kallithea/templates/admin/settings/settings_email.html:6
@@ -3682,7 +3682,7 b' msgid "Site branding"'
3682 msgstr ""
3682 msgstr ""
3683
3683
3684 #: kallithea/templates/admin/settings/settings_global.html:12
3684 #: kallithea/templates/admin/settings/settings_global.html:12
3685 msgid "Set a custom title for your RhodeCode Service."
3685 msgid "Set a custom title for your Kallithea Service."
3686 msgstr ""
3686 msgstr ""
3687
3687
3688 #: kallithea/templates/admin/settings/settings_global.html:18
3688 #: kallithea/templates/admin/settings/settings_global.html:18
@@ -3742,7 +3742,7 b' msgstr ""'
3742
3742
3743 #: kallithea/templates/admin/settings/settings_license.html:9
3743 #: kallithea/templates/admin/settings/settings_license.html:9
3744 #: kallithea/templates/admin/settings/settings_system.html:4
3744 #: kallithea/templates/admin/settings/settings_system.html:4
3745 msgid "RhodeCode version"
3745 msgid "Kallithea version"
3746 msgstr ""
3746 msgstr ""
3747
3747
3748 #: kallithea/templates/admin/settings/settings_license.html:10
3748 #: kallithea/templates/admin/settings/settings_license.html:10
@@ -3778,7 +3778,7 b' msgid "License key"'
3778 msgstr ""
3778 msgstr ""
3779
3779
3780 #: kallithea/templates/admin/settings/settings_license.html:37
3780 #: kallithea/templates/admin/settings/settings_license.html:37
3781 msgid "Paste your RhodeCode license key into that textarea."
3781 msgid "Paste your Kallithea license key into that textarea."
3782 msgstr ""
3782 msgstr ""
3783
3783
3784 #: kallithea/templates/admin/settings/settings_license.html:52
3784 #: kallithea/templates/admin/settings/settings_license.html:52
@@ -3817,7 +3817,7 b' msgstr ""'
3817
3817
3818 #: kallithea/templates/admin/settings/settings_mapping.html:25
3818 #: kallithea/templates/admin/settings/settings_mapping.html:25
3819 msgid ""
3819 msgid ""
3820 "Verify if RhodeCodes GIT hooks are installed for each repository. Current "
3820 "Verify if Kallitheas GIT hooks are installed for each repository. Current "
3821 "hooks will be updated to latest version"
3821 "hooks will be updated to latest version"
3822 msgstr ""
3822 msgstr ""
3823
3823
@@ -3835,7 +3835,7 b' msgstr ""'
3835
3835
3836 #: kallithea/templates/admin/settings/settings_search.html:15
3836 #: kallithea/templates/admin/settings/settings_search.html:15
3837 msgid ""
3837 msgid ""
3838 "This option completely reindex all the files within RhodeCode for proper "
3838 "This option completely reindex all the files within Kallithea for proper "
3839 "fulltext search capabilities."
3839 "fulltext search capabilities."
3840 msgstr ""
3840 msgstr ""
3841
3841
@@ -3889,7 +3889,7 b' msgstr ""'
3889
3889
3890 #: kallithea/templates/admin/settings/settings_vcs.html:13
3890 #: kallithea/templates/admin/settings/settings_vcs.html:13
3891 msgid ""
3891 msgid ""
3892 "Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
3892 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
3893 "certificate is missing it will return a HTTP Error 406: Not Acceptable."
3893 "certificate is missing it will return a HTTP Error 406: Not Acceptable."
3894 msgstr ""
3894 msgstr ""
3895
3895
@@ -3933,7 +3933,7 b' msgstr "Emplacement des d\xc3\xa9p\xc3\xb4ts"'
3933
3933
3934 #: kallithea/templates/admin/settings/settings_vcs.html:69
3934 #: kallithea/templates/admin/settings/settings_vcs.html:69
3935 msgid ""
3935 msgid ""
3936 "Click to unlock. You must restart RhodeCode in order to make this setting "
3936 "Click to unlock. You must restart Kallithea in order to make this setting "
3937 "take effect."
3937 "take effect."
3938 msgstr ""
3938 msgstr ""
3939
3939
@@ -3956,34 +3956,34 b' msgid "Allows storing additional customi'
3956 msgstr ""
3956 msgstr ""
3957
3957
3958 #: kallithea/templates/admin/settings/settings_visual.html:18
3958 #: kallithea/templates/admin/settings/settings_visual.html:18
3959 msgid "Show RhodeCode version"
3959 msgid "Show Kallithea version"
3960 msgstr ""
3960 msgstr ""
3961
3961
3962 #: kallithea/templates/admin/settings/settings_visual.html:20
3962 #: kallithea/templates/admin/settings/settings_visual.html:20
3963 msgid "Shows or hides a version number of RhodeCode displayed in the footer."
3963 msgid "Shows or hides a version number of Kallithea displayed in the footer."
3964 msgstr ""
3964 msgstr ""
3965
3965
3966 #: kallithea/templates/admin/settings/settings_visual.html:24
3966 #: kallithea/templates/admin/settings/settings_visual.html:24
3967 msgid "Use Gravatars in RhodeCode"
3967 msgid "Use Gravatars in Kallithea"
3968 msgstr ""
3968 msgstr ""
3969
3969
3970 #: kallithea/templates/admin/settings/settings_visual.html:30
3970 #: kallithea/templates/admin/settings/settings_visual.html:30
3971 msgid ""
3971 msgid ""
3972 "Gravatar url allows you to use other avatar server application.\n"
3972 "Gravatar url allows you to use other avatar server application.\n"
3973 " Following variables of the URL will be replaced accordingly.\n"
3973 " Following variables of the URL will be replaced accordingly.\n"
3974 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
3974 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
3975 " {email} user email,\n"
3975 " {email} user email,\n"
3976 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
3976 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
3977 " {size} size of the image that is expected from the server application,\n"
3977 " {size} size of the image that is expected from the server application,\n"
3978 " {netloc} network location/server host of running RhodeCode server"
3978 " {netloc} network location/server host of running Kallithea server"
3979 msgstr ""
3979 msgstr ""
3980
3980
3981 #: kallithea/templates/admin/settings/settings_visual.html:42
3981 #: kallithea/templates/admin/settings/settings_visual.html:42
3982 msgid ""
3982 msgid ""
3983 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
3983 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
3984 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
3984 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
3985 " {user} current user username,\n"
3985 " {user} current user username,\n"
3986 " {netloc} network location/server host of running RhodeCode server,\n"
3986 " {netloc} network location/server host of running Kallithea server,\n"
3987 " {repo} full repository name,\n"
3987 " {repo} full repository name,\n"
3988 " {repoid} ID of repository, can be used to contruct clone-by-id"
3988 " {repoid} ID of repository, can be used to contruct clone-by-id"
3989 msgstr ""
3989 msgstr ""
@@ -4698,8 +4698,8 b' msgid "Refs"'
4698 msgstr ""
4698 msgstr ""
4699
4699
4700 #: kallithea/templates/changelog/changelog_summary_data.html:86
4700 #: kallithea/templates/changelog/changelog_summary_data.html:86
4701 msgid "Add or upload files directly via RhodeCode"
4701 msgid "Add or upload files directly via Kallithea"
4702 msgstr "Ajouter ou téléverser des fichiers directement via RhodeCode…"
4702 msgstr "Ajouter ou téléverser des fichiers directement via Kallithea…"
4703
4703
4704 #: kallithea/templates/changelog/changelog_summary_data.html:89
4704 #: kallithea/templates/changelog/changelog_summary_data.html:89
4705 #: kallithea/templates/files/files_ypjax.html:9
4705 #: kallithea/templates/files/files_ypjax.html:9
@@ -4844,8 +4844,8 b' msgstr "Les commentaires sont analys\xc3\xa9s avec la syntaxe %s, avec le support de la commande %s."'
4844 #: kallithea/templates/changeset/changeset_file_comment.html:69
4844 #: kallithea/templates/changeset/changeset_file_comment.html:69
4845 #: kallithea/templates/changeset/changeset_file_comment.html:155
4845 #: kallithea/templates/changeset/changeset_file_comment.html:155
4846 msgid ""
4846 msgid ""
4847 "Use @username inside this text to send notification to this RhodeCode user"
4847 "Use @username inside this text to send notification to this Kallithea user"
4848 msgstr "Utilisez @nomutilisateur dans ce texte pour envoyer une notification à l’utilisateur RhodeCode en question."
4848 msgstr "Utilisez @nomutilisateur dans ce texte pour envoyer une notification à l’utilisateur Kallithea en question."
4849
4849
4850 #: kallithea/templates/changeset/changeset_file_comment.html:73
4850 #: kallithea/templates/changeset/changeset_file_comment.html:73
4851 #: kallithea/templates/changeset/changeset_file_comment.html:166
4851 #: kallithea/templates/changeset/changeset_file_comment.html:166
@@ -5009,7 +5009,7 b' msgid "The changeset status was changed '
5009 msgstr ""
5009 msgstr ""
5010
5010
5011 #: kallithea/templates/email_templates/main.html:8
5011 #: kallithea/templates/email_templates/main.html:8
5012 msgid "This is a notification from RhodeCode."
5012 msgid "This is a notification from Kallithea."
5013 msgstr ""
5013 msgstr ""
5014
5014
5015 #: kallithea/templates/email_templates/password_reset.html:4
5015 #: kallithea/templates/email_templates/password_reset.html:4
@@ -4,14 +4,14 b''
4
4
5 Translations are available on transifex under::
5 Translations are available on transifex under::
6
6
7 https://www.transifex.com/projects/p/RhodeCode/
7 https://www.transifex.com/projects/p/Kallithea/
8
8
9 Preferred method is to register on transifex and request new language translation.
9 Preferred method is to register on transifex and request new language translation.
10
10
11 manual creation of new language
11 manual creation of new language
12 +++++++++++++++++++++++++++++++
12 +++++++++++++++++++++++++++++++
13
13
14 Dowload sources of RhodeCode. Run::
14 Dowload sources of Kallithea. Run::
15
15
16 python setup.py develop
16 python setup.py develop
17
17
@@ -62,6 +62,6 b' Edit test.ini file and set lang attribut'
62
62
63 lang=<new_language_code>
63 lang=<new_language_code>
64
64
65 Run RhodeCode tests by executing::
65 Run Kallithea tests by executing::
66
66
67 nosetests
67 nosetests
@@ -1,6 +1,6 b''
1 # Translations template for RhodeCode.
1 # Translations template for Kallithea.
2 # Copyright (C) 2014 RhodeCode GmbH, and others.
2 # Copyright (C) 2014 RhodeCode GmbH, and others.
3 # This file is distributed under the same license as the RhodeCode project.
3 # This file is distributed under the same license as the Kallithea project.
4 # Translators:
4 # Translators:
5 # しろう, 2013
5 # しろう, 2013
6 # shirou - しろう, 2013
6 # shirou - しろう, 2013
@@ -12,12 +12,12 b''
12 # whosaysni <whosaysni@gmail.com>, 2014
12 # whosaysni <whosaysni@gmail.com>, 2014
13 msgid ""
13 msgid ""
14 msgstr ""
14 msgstr ""
15 "Project-Id-Version: RhodeCode\n"
15 "Project-Id-Version: Kallithea\n"
16 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
16 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
17 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
17 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
18 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
18 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
19 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
19 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
20 "Language-Team: Japanese (http://www.transifex.com/projects/p/RhodeCode/language/ja/)\n"
20 "Language-Team: Japanese (http://www.transifex.com/projects/p/Kallithea/language/ja/)\n"
21 "MIME-Version: 1.0\n"
21 "MIME-Version: 1.0\n"
22 "Content-Type: text/plain; charset=UTF-8\n"
22 "Content-Type: text/plain; charset=UTF-8\n"
23 "Content-Transfer-Encoding: 8bit\n"
23 "Content-Transfer-Encoding: 8bit\n"
@@ -145,8 +145,8 b' msgstr "\xe6\x9c\x89\xe5\x8a\xb9\xe3\x81\xaa\xe3\x83\x96\xe3\x83\xa9\xe3\x83\xb3\xe3\x83\x81\xe4\xb8\x8a\xe3\x81\xae\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\x8b\xe3\x82\x89\xe3\x81\x97\xe3\x81\x8b\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x82\x92\xe5\x89\x8a\xe9\x99\xa4\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"'
145
145
146 #: kallithea/controllers/files.py:322
146 #: kallithea/controllers/files.py:322
147 #, python-format
147 #, python-format
148 msgid "Deleted file %s via RhodeCode"
148 msgid "Deleted file %s via Kallithea"
149 msgstr "RhodeCode経由で %s を削除"
149 msgstr "Kallithea経由で %s を削除"
150
150
151 #: kallithea/controllers/files.py:344
151 #: kallithea/controllers/files.py:344
152 #, python-format
152 #, python-format
@@ -164,8 +164,8 b' msgstr "\xe6\x9c\x89\xe5\x8a\xb9\xe3\x81\xaa\xe3\x83\x96\xe3\x83\xa9\xe3\x83\xb3\xe3\x83\x81\xe3\x82\x92\xe7\xa4\xba\xe3\x81\x99\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xa7\xe3\x81\xae\xe3\x81\xbf\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x82\x92\xe7\xb7\xa8\xe9\x9b\x86\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x99\xe3\x80\x82"'
164
164
165 #: kallithea/controllers/files.py:385
165 #: kallithea/controllers/files.py:385
166 #, python-format
166 #, python-format
167 msgid "Edited file %s via RhodeCode"
167 msgid "Edited file %s via Kallithea"
168 msgstr "RhodeCode経由で %s を変更"
168 msgstr "Kallithea経由で %s を変更"
169
169
170 #: kallithea/controllers/files.py:401
170 #: kallithea/controllers/files.py:401
171 msgid "No changes"
171 msgid "No changes"
@@ -177,8 +177,8 b' msgid "Successfully committed to %s"'
177 msgstr "%s へのコミットが成功しました"
177 msgstr "%s へのコミットが成功しました"
178
178
179 #: kallithea/controllers/files.py:438
179 #: kallithea/controllers/files.py:438
180 msgid "Added file via RhodeCode"
180 msgid "Added file via Kallithea"
181 msgstr "RhodeCode経由でファイルを追加"
181 msgstr "Kallithea経由でファイルを追加"
182
182
183 #: kallithea/controllers/files.py:459
183 #: kallithea/controllers/files.py:459
184 msgid "No content"
184 msgid "No content"
@@ -282,8 +282,8 b' msgid "bad captcha"'
282 msgstr "キャプチャが一致しません"
282 msgstr "キャプチャが一致しません"
283
283
284 #: kallithea/controllers/login.py:191
284 #: kallithea/controllers/login.py:191
285 msgid "You have successfully registered into RhodeCode"
285 msgid "You have successfully registered into Kallithea"
286 msgstr "RhodeCodeへの登録を受け付けました"
286 msgstr "Kallitheaへの登録を受け付けました"
287
287
288 #: kallithea/controllers/login.py:235
288 #: kallithea/controllers/login.py:235
289 msgid "Your password reset link was sent"
289 msgid "Your password reset link was sent"
@@ -1109,8 +1109,8 b' msgid "[pushed] into"'
1109 msgstr "[プッシュ]"
1109 msgstr "[プッシュ]"
1110
1110
1111 #: kallithea/lib/helpers.py:779
1111 #: kallithea/lib/helpers.py:779
1112 msgid "[committed via RhodeCode] into repository"
1112 msgid "[committed via Kallithea] into repository"
1113 msgstr "リポジトリに[RhodeCode経由でコミット]"
1113 msgstr "リポジトリに[Kallithea経由でコミット]"
1114
1114
1115 #: kallithea/lib/helpers.py:781
1115 #: kallithea/lib/helpers.py:781
1116 msgid "[pulled from remote] into repository"
1116 msgid "[pulled from remote] into repository"
@@ -1320,8 +1320,8 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x82\xb0\xe3\x83\xab\xe3\x83\xbc\xe3\x83\x97\xe3\x81\xab\xe7\xae\xa1\xe7\x90\x86\xe6\xa8\xa9\xe9\x99\x90\xe3\x81\xa7\xe3\x82\xa2\xe3\x82\xaf\xe3\x82\xbb\xe3\x82\xb9"'
1320 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1320 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1321 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1321 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1322 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1322 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1323 msgid "RhodeCode Administrator"
1323 msgid "Kallithea Administrator"
1324 msgstr "RhodeCode 管理者"
1324 msgstr "Kallithea 管理者"
1325
1325
1326 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
1326 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
1327 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
1327 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
@@ -1394,15 +1394,15 b' msgstr "\xe6\x96\xb0\xe8\xa6\x8f\xe7\x99\xbb\xe9\x8c\xb2\xe3\x82\x92\xe7\x84\xa1\xe5\x8a\xb9\xe3\x81\xab\xe3\x81\x99\xe3\x82\x8b"'
1394 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1394 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1395 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1395 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1396 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1396 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1397 msgid "Register new user with RhodeCode with manual activation"
1397 msgid "Register new user with Kallithea with manual activation"
1398 msgstr "Rhodecodeに登録した新しいユーザーを手動でアクティベートする"
1398 msgstr "Kallitheaに登録した新しいユーザーを手動でアクティベートする"
1399
1399
1400 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1400 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1401 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1401 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1402 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1402 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1403 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1403 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1404 msgid "Register new user with RhodeCode with auto activation"
1404 msgid "Register new user with Kallithea with auto activation"
1405 msgstr "Rhodecodeに登録した新しいユーザーを自動でアクティベートする"
1405 msgstr "Kallitheaに登録した新しいユーザーを自動でアクティベートする"
1406
1406
1407 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
1407 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
1408 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
1408 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
@@ -1705,8 +1705,8 b' msgstr "%(user)s \xe3\x81\x8c\xe3\x81\xab\xe3\x81\x82\xe3\x81\xaa\xe3\x81\x9f\xe3\x81\xab\xe3\x83\xa1\xe3\x83\xb3\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3 %(when)s"'
1705
1705
1706 #: kallithea/model/notification.py:232
1706 #: kallithea/model/notification.py:232
1707 #, python-format
1707 #, python-format
1708 msgid "%(user)s registered in RhodeCode at %(when)s"
1708 msgid "%(user)s registered in Kallithea at %(when)s"
1709 msgstr "%(user)s がRhodeCodeに登録 %(when)s"
1709 msgstr "%(user)s がKallitheaに登録 %(when)s"
1710
1710
1711 #: kallithea/model/notification.py:233
1711 #: kallithea/model/notification.py:233
1712 #, python-format
1712 #, python-format
@@ -1756,8 +1756,8 b' msgstr "\xe6\x96\xb0\xe3\x81\x97\xe3\x81\x84\xe3\x83\x91\xe3\x82\xb9\xe3\x83\xaf\xe3\x83\xbc\xe3\x83\x89"'
1756
1756
1757 #: kallithea/model/user.py:332
1757 #: kallithea/model/user.py:332
1758 #, python-format
1758 #, python-format
1759 msgid "Your new RhodeCode password:%s"
1759 msgid "Your new Kallithea password:%s"
1760 msgstr "新しいRhodeCodeパスワード:%s"
1760 msgstr "新しいKallitheaパスワード:%s"
1761
1761
1762 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
1762 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
1763 msgid "Value cannot be an empty list"
1763 msgid "Value cannot be an empty list"
@@ -2321,8 +2321,8 b' msgstr "\xe6\x9c\x89\xe5\x8a\xb9\xe3\x81\xaa\xe3\x83\x97\xe3\x83\xa9\xe3\x82\xb0\xe3\x82\xa4\xe3\x83\xb3"'
2321 #: kallithea/templates/admin/auth/auth_settings.html:36
2321 #: kallithea/templates/admin/auth/auth_settings.html:36
2322 msgid ""
2322 msgid ""
2323 "Comma separated list of plugins. Order of plugins is also order in which "
2323 "Comma separated list of plugins. Order of plugins is also order in which "
2324 "RhodeCode will try to authenticate user"
2324 "Kallithea will try to authenticate user"
2325 msgstr "カンマ区切りのプラグインの一覧です。プラグインの並び順はRhodeCodeがユーザー認証を試す順番でもあります。"
2325 msgstr "カンマ区切りのプラグインの一覧です。プラグインの並び順はKallitheaがユーザー認証を試す順番でもあります。"
2326
2326
2327 #: kallithea/templates/admin/auth/auth_settings.html:37
2327 #: kallithea/templates/admin/auth/auth_settings.html:37
2328 msgid "Available built-in plugins"
2328 msgid "Available built-in plugins"
@@ -2929,9 +2929,9 b' msgstr "\xe5\x8c\xbf\xe5\x90\x8d\xe3\x82\xa2\xe3\x82\xaf\xe3\x82\xbb\xe3\x82\xb9"'
2929 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2929 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2930 #, python-format
2930 #, python-format
2931 msgid ""
2931 msgid ""
2932 "Allow access to RhodeCode without need to log in. Anonymous users use %s "
2932 "Allow access to Kallithea without need to log in. Anonymous users use %s "
2933 "user permissions"
2933 "user permissions"
2934 msgstr "ログインしなくても RhodeCode にアクセスできるようにします。匿名ユーザーは %s ユーザーパーミッションを使います"
2934 msgstr "ログインしなくても Kallithea にアクセスできるようにします。匿名ユーザーは %s ユーザーパーミッションを使います"
2935
2935
2936 #: kallithea/templates/admin/permissions/permissions_globals.html:26
2936 #: kallithea/templates/admin/permissions/permissions_globals.html:26
2937 msgid ""
2937 msgid ""
@@ -3297,8 +3297,8 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa \\"%(repo_name)s\\" \xe3\x82\x92\xe4\xbd\x9c\xe6\x88\x90\xe4\xb8\xad\xe3\x81\xa7\xe3\x81\x99\xe3\x80\x82\xe5\x87\xa6\xe7\x90\x86\xe3\x82\x92\xe5\xae\x8c\xe4\xba\x86\xe3\x81\x97\xe3\x81\x9f\xe3\x82\x89\xe3\x83\xaa\xe3\x83\x80\xe3\x82\xa4\xe3\x83\xac\xe3\x82\xaf\xe3\x83\x88\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99\xe3\x80\x82"'
3297 #: kallithea/templates/admin/repos/repo_creating.html:42
3297 #: kallithea/templates/admin/repos/repo_creating.html:42
3298 msgid ""
3298 msgid ""
3299 "We're sorry but error occured during this operation. Please check your "
3299 "We're sorry but error occured during this operation. Please check your "
3300 "RhodeCode server logs, or contact administrator."
3300 "Kallithea server logs, or contact administrator."
3301 msgstr "恐れいります。操作中にエラーが発生しました。 RhodeCode サーバのログをチェックするか、管理者に問い合わせてください。"
3301 msgstr "恐れいります。操作中にエラーが発生しました。 Kallithea サーバのログをチェックするか、管理者に問い合わせてください。"
3302
3302
3303 #: kallithea/templates/admin/repos/repo_edit.html:8
3303 #: kallithea/templates/admin/repos/repo_edit.html:8
3304 #, python-format
3304 #, python-format
@@ -3415,9 +3415,9 b' msgstr "\xe3\x83\x95\xe3\x82\xa9\xe3\x83\xbc\xe3\x82\xaf\xe3\x82\x82\xe5\x89\x8a\xe9\x99\xa4"'
3415 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3415 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3416 msgid ""
3416 msgid ""
3417 "This repository will be renamed in a special way in order to be unaccesible "
3417 "This repository will be renamed in a special way in order to be unaccesible "
3418 "for RhodeCode and VCS systems. If you need to fully delete it from file "
3418 "for Kallithea and VCS systems. If you need to fully delete it from file "
3419 "system please do it manually"
3419 "system please do it manually"
3420 msgstr "このリポジトリはRhodeCodeとVCSシステムからアクセス出来ないようにするために特別な方法でリネームされます。\n完全な削除が必要な場合はファイルシステムから手動で削除してください"
3420 msgstr "このリポジトリはKallitheaとVCSシステムからアクセス出来ないようにするために特別な方法でリネームされます。\n完全な削除が必要な場合はファイルシステムから手動で削除してください"
3421
3421
3422 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
3422 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
3423 msgid "Invalidate repository cache"
3423 msgid "Invalidate repository cache"
@@ -3628,8 +3628,8 b' msgid "Email prefix"'
3628 msgstr "メールアドレスプレフィックス"
3628 msgstr "メールアドレスプレフィックス"
3629
3629
3630 #: kallithea/templates/admin/settings/settings_email.html:5
3630 #: kallithea/templates/admin/settings/settings_email.html:5
3631 msgid "RhodeCode email from"
3631 msgid "Kallithea email from"
3632 msgstr "RhodeCode メールのFrom"
3632 msgstr "Kallithea メールのFrom"
3633
3633
3634 #: kallithea/templates/admin/settings/settings_email.html:6
3634 #: kallithea/templates/admin/settings/settings_email.html:6
3635 msgid "Error email from"
3635 msgid "Error email from"
@@ -3680,8 +3680,8 b' msgid "Site branding"'
3680 msgstr "サイト名"
3680 msgstr "サイト名"
3681
3681
3682 #: kallithea/templates/admin/settings/settings_global.html:12
3682 #: kallithea/templates/admin/settings/settings_global.html:12
3683 msgid "Set a custom title for your RhodeCode Service."
3683 msgid "Set a custom title for your Kallithea Service."
3684 msgstr "このRhodeCodeサービスのカスタムタイトルを設定します。"
3684 msgstr "このKallitheaサービスのカスタムタイトルを設定します。"
3685
3685
3686 #: kallithea/templates/admin/settings/settings_global.html:18
3686 #: kallithea/templates/admin/settings/settings_global.html:18
3687 msgid "HTTP authentication realm"
3687 msgid "HTTP authentication realm"
@@ -3740,8 +3740,8 b' msgstr "20\xe3\x83\xa6\xe3\x83\xbc\xe3\x82\xb6\xe3\x83\xbc\xe3\x81\xbe\xe3\x81\xa7\xe5\x88\xa9\xe7\x94\xa8\xe5\x8f\xaf\xe8\x83\xbd\xe3\x81\xaa\xe7\x84\xa1\xe6\x96\x99\xe3\x83\xa9\xe3\x82\xa4\xe3\x82\xbb\xe3\x83\xb3\xe3\x82\xb9\xe3\x82\x92\xe4\xbd\xbf\xe7\x94\xa8\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x84\xe3\x81\xbe\xe3\x81\x99\xe3\x80\x82"'
3740
3740
3741 #: kallithea/templates/admin/settings/settings_license.html:9
3741 #: kallithea/templates/admin/settings/settings_license.html:9
3742 #: kallithea/templates/admin/settings/settings_system.html:4
3742 #: kallithea/templates/admin/settings/settings_system.html:4
3743 msgid "RhodeCode version"
3743 msgid "Kallithea version"
3744 msgstr "RhodeCode バージョン"
3744 msgstr "Kallithea バージョン"
3745
3745
3746 #: kallithea/templates/admin/settings/settings_license.html:10
3746 #: kallithea/templates/admin/settings/settings_license.html:10
3747 msgid "License token"
3747 msgid "License token"
@@ -3776,8 +3776,8 b' msgid "License key"'
3776 msgstr "ライセンスキー"
3776 msgstr "ライセンスキー"
3777
3777
3778 #: kallithea/templates/admin/settings/settings_license.html:37
3778 #: kallithea/templates/admin/settings/settings_license.html:37
3779 msgid "Paste your RhodeCode license key into that textarea."
3779 msgid "Paste your Kallithea license key into that textarea."
3780 msgstr "RhodeCode ライセンスキーをテキストエリアにペーストしてください。"
3780 msgstr "Kallithea ライセンスキーをテキストエリアにペーストしてください。"
3781
3781
3782 #: kallithea/templates/admin/settings/settings_license.html:52
3782 #: kallithea/templates/admin/settings/settings_license.html:52
3783 msgid ""
3783 msgid ""
@@ -3815,9 +3815,9 b' msgstr "GIT\xe3\x83\x95\xe3\x83\x83\xe3\x82\xaf\xe3\x82\x92\xe3\x82\xa4\xe3\x83\xb3\xe3\x82\xb9\xe3\x83\x88\xe3\x83\xbc\xe3\x83\xab"'
3815
3815
3816 #: kallithea/templates/admin/settings/settings_mapping.html:25
3816 #: kallithea/templates/admin/settings/settings_mapping.html:25
3817 msgid ""
3817 msgid ""
3818 "Verify if RhodeCodes GIT hooks are installed for each repository. Current "
3818 "Verify if Kallitheas GIT hooks are installed for each repository. Current "
3819 "hooks will be updated to latest version"
3819 "hooks will be updated to latest version"
3820 msgstr "各リポジトリに RhodeCodes の GIT フックがインストールされているか確認してください。現在のフックは最新版に更新されます"
3820 msgstr "各リポジトリに Kallitheas の GIT フックがインストールされているか確認してください。現在のフックは最新版に更新されます"
3821
3821
3822 #: kallithea/templates/admin/settings/settings_mapping.html:32
3822 #: kallithea/templates/admin/settings/settings_mapping.html:32
3823 msgid "Rescan Repositories"
3823 msgid "Rescan Repositories"
@@ -3833,9 +3833,9 b' msgstr "\xe4\xb8\x80\xe5\xba\xa6\xe5\x89\x8a\xe9\x99\xa4\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8b\xe3\x82\x89\xe5\x86\x8d\xe5\xba\xa6\xe3\x82\xa4\xe3\x83\xb3\xe3\x83\x87\xe3\x83\x83\xe3\x82\xaf\xe3\x82\xb9\xe3\x82\x92\xe4\xbd\x9c\xe6\x88\x90"'
3833
3833
3834 #: kallithea/templates/admin/settings/settings_search.html:15
3834 #: kallithea/templates/admin/settings/settings_search.html:15
3835 msgid ""
3835 msgid ""
3836 "This option completely reindex all the files within RhodeCode for proper "
3836 "This option completely reindex all the files within Kallithea for proper "
3837 "fulltext search capabilities."
3837 "fulltext search capabilities."
3838 msgstr "このオプションを使うと、全文検索の機能が正しく発揮されるよう、 RhodeCode 中の全てのファイルのインデックスを再生成します。"
3838 msgstr "このオプションを使うと、全文検索の機能が正しく発揮されるよう、 Kallithea 中の全てのファイルのインデックスを再生成します。"
3839
3839
3840 #: kallithea/templates/admin/settings/settings_search.html:21
3840 #: kallithea/templates/admin/settings/settings_search.html:21
3841 msgid "Reindex"
3841 msgid "Reindex"
@@ -3887,7 +3887,7 b' msgstr "VCS\xe3\x81\xae\xe6\x93\x8d\xe4\xbd\x9c\xe3\x81\xabSSL\xe3\x82\x92\xe5\xbf\x85\xe9\xa0\x88\xe3\x81\xa8\xe3\x81\x99\xe3\x82\x8b"'
3887
3887
3888 #: kallithea/templates/admin/settings/settings_vcs.html:13
3888 #: kallithea/templates/admin/settings/settings_vcs.html:13
3889 msgid ""
3889 msgid ""
3890 "Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
3890 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
3891 "certificate is missing it will return a HTTP Error 406: Not Acceptable."
3891 "certificate is missing it will return a HTTP Error 406: Not Acceptable."
3892 msgstr "プッシュ、プル時にSSLを要求します。SSLでない場合はHTTP Error 406: Not Acceptableを返します。"
3892 msgstr "プッシュ、プル時にSSLを要求します。SSLでない場合はHTTP Error 406: Not Acceptableを返します。"
3893
3893
@@ -3931,9 +3931,9 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x83\xad\xe3\x82\xb1\xe3\x83\xbc\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3"'
3931
3931
3932 #: kallithea/templates/admin/settings/settings_vcs.html:69
3932 #: kallithea/templates/admin/settings/settings_vcs.html:69
3933 msgid ""
3933 msgid ""
3934 "Click to unlock. You must restart RhodeCode in order to make this setting "
3934 "Click to unlock. You must restart Kallithea in order to make this setting "
3935 "take effect."
3935 "take effect."
3936 msgstr "アンロックする。この設定を有効にするためにはRhodeCodeの再起動が必要です。"
3936 msgstr "アンロックする。この設定を有効にするためにはKallitheaの再起動が必要です。"
3937
3937
3938 #: kallithea/templates/admin/settings/settings_vcs.html:72
3938 #: kallithea/templates/admin/settings/settings_vcs.html:72
3939 msgid ""
3939 msgid ""
@@ -3954,37 +3954,37 b' msgid "Allows storing additional customi'
3954 msgstr "追加のカスタムフィールドをリポジトリ毎に保存することを許可します。"
3954 msgstr "追加のカスタムフィールドをリポジトリ毎に保存することを許可します。"
3955
3955
3956 #: kallithea/templates/admin/settings/settings_visual.html:18
3956 #: kallithea/templates/admin/settings/settings_visual.html:18
3957 msgid "Show RhodeCode version"
3957 msgid "Show Kallithea version"
3958 msgstr "Rhodecodeのバージョンを表示する"
3958 msgstr "Kallitheaのバージョンを表示する"
3959
3959
3960 #: kallithea/templates/admin/settings/settings_visual.html:20
3960 #: kallithea/templates/admin/settings/settings_visual.html:20
3961 msgid "Shows or hides a version number of RhodeCode displayed in the footer."
3961 msgid "Shows or hides a version number of Kallithea displayed in the footer."
3962 msgstr "フッターに表示されるRhodeCodeのバージョン番号の表示、非表示を設定します。"
3962 msgstr "フッターに表示されるKallitheaのバージョン番号の表示、非表示を設定します。"
3963
3963
3964 #: kallithea/templates/admin/settings/settings_visual.html:24
3964 #: kallithea/templates/admin/settings/settings_visual.html:24
3965 msgid "Use Gravatars in RhodeCode"
3965 msgid "Use Gravatars in Kallithea"
3966 msgstr "Gravatorsを利用する"
3966 msgstr "Gravatorsを利用する"
3967
3967
3968 #: kallithea/templates/admin/settings/settings_visual.html:30
3968 #: kallithea/templates/admin/settings/settings_visual.html:30
3969 msgid ""
3969 msgid ""
3970 "Gravatar url allows you to use other avatar server application.\n"
3970 "Gravatar url allows you to use other avatar server application.\n"
3971 " Following variables of the URL will be replaced accordingly.\n"
3971 " Following variables of the URL will be replaced accordingly.\n"
3972 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
3972 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
3973 " {email} user email,\n"
3973 " {email} user email,\n"
3974 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
3974 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
3975 " {size} size of the image that is expected from the server application,\n"
3975 " {size} size of the image that is expected from the server application,\n"
3976 " {netloc} network location/server host of running RhodeCode server"
3976 " {netloc} network location/server host of running Kallithea server"
3977 msgstr "Gravatar URL を設定すると、外部のアバターサーバーアプリケーションを使用します。\n必要に応じて、 URL に以下の変数を使ってください。\n{scheme} RhodeCode サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n{email} ユーザーのメールアドレス\n{md5email} ユーザーのメールアドレスの md5 ハッシュ値 (gravatar.com で使っています)\n{size} サーバーアプリケーションに要求する画像のサイズ\n{netloc} RhodeCode サーバーのアドレスまたはホスト名"
3977 msgstr "Gravatar URL を設定すると、外部のアバターサーバーアプリケーションを使用します。\n必要に応じて、 URL に以下の変数を使ってください。\n{scheme} Kallithea サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n{email} ユーザーのメールアドレス\n{md5email} ユーザーのメールアドレスの md5 ハッシュ値 (gravatar.com で使っています)\n{size} サーバーアプリケーションに要求する画像のサイズ\n{netloc} Kallithea サーバーのアドレスまたはホスト名"
3978
3978
3979 #: kallithea/templates/admin/settings/settings_visual.html:42
3979 #: kallithea/templates/admin/settings/settings_visual.html:42
3980 msgid ""
3980 msgid ""
3981 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
3981 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
3982 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
3982 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
3983 " {user} current user username,\n"
3983 " {user} current user username,\n"
3984 " {netloc} network location/server host of running RhodeCode server,\n"
3984 " {netloc} network location/server host of running Kallithea server,\n"
3985 " {repo} full repository name,\n"
3985 " {repo} full repository name,\n"
3986 " {repoid} ID of repository, can be used to contruct clone-by-id"
3986 " {repoid} ID of repository, can be used to contruct clone-by-id"
3987 msgstr "クローン URL のスキーマは、 '{scheme}://{user}@{netloc}/{repo}' のような形式にします。使える変数は下記の通りです:\n {scheme} RhodeCode サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n {user} ユーザーのユーザー名\n {netloc} RhodeCode サーバーのアドレスまたはホスト名\n {repo} リポジトリの完全な名前\n {repoid} リポジトリの ID。 clone-by-id に使います。"
3987 msgstr "クローン URL のスキーマは、 '{scheme}://{user}@{netloc}/{repo}' のような形式にします。使える変数は下記の通りです:\n {scheme} Kallithea サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n {user} ユーザーのユーザー名\n {netloc} Kallithea サーバーのアドレスまたはホスト名\n {repo} リポジトリの完全な名前\n {repoid} リポジトリの ID。 clone-by-id に使います。"
3988
3988
3989 #: kallithea/templates/admin/settings/settings_visual.html:54
3989 #: kallithea/templates/admin/settings/settings_visual.html:54
3990 msgid "Dashboard items"
3990 msgid "Dashboard items"
@@ -4695,8 +4695,8 b' msgid "Refs"'
4695 msgstr "Refs"
4695 msgstr "Refs"
4696
4696
4697 #: kallithea/templates/changelog/changelog_summary_data.html:86
4697 #: kallithea/templates/changelog/changelog_summary_data.html:86
4698 msgid "Add or upload files directly via RhodeCode"
4698 msgid "Add or upload files directly via Kallithea"
4699 msgstr "RhodeCode経由で直接ファイルを追加またはアップロード"
4699 msgstr "Kallithea経由で直接ファイルを追加またはアップロード"
4700
4700
4701 #: kallithea/templates/changelog/changelog_summary_data.html:89
4701 #: kallithea/templates/changelog/changelog_summary_data.html:89
4702 #: kallithea/templates/files/files_ypjax.html:9
4702 #: kallithea/templates/files/files_ypjax.html:9
@@ -4837,8 +4837,8 b' msgstr "\xe3\x82\xb3\xe3\x83\xa1\xe3\x83\xb3\xe3\x83\x88\xe3\x81\xab\xe3\x81\xaf %s \xe6\xa7\x8b\xe6\x96\x87 ( %s \xe3\x82\xb5\xe3\x83\x9d\xe3\x83\xbc\xe3\x83\x88\xe3\x81\xa4\xe3\x81\x8d ) \xe3\x81\x8c\xe5\x88\xa9\xe7\x94\xa8\xe5\x87\xba\xe6\x9d\xa5\xe3\x81\xbe\xe3\x81\x99"'
4837 #: kallithea/templates/changeset/changeset_file_comment.html:69
4837 #: kallithea/templates/changeset/changeset_file_comment.html:69
4838 #: kallithea/templates/changeset/changeset_file_comment.html:155
4838 #: kallithea/templates/changeset/changeset_file_comment.html:155
4839 msgid ""
4839 msgid ""
4840 "Use @username inside this text to send notification to this RhodeCode user"
4840 "Use @username inside this text to send notification to this Kallithea user"
4841 msgstr "テキスト内で @username を使うと、その RhodeCode のユーザーに通知を送信します"
4841 msgstr "テキスト内で @username を使うと、その Kallithea のユーザーに通知を送信します"
4842
4842
4843 #: kallithea/templates/changeset/changeset_file_comment.html:73
4843 #: kallithea/templates/changeset/changeset_file_comment.html:73
4844 #: kallithea/templates/changeset/changeset_file_comment.html:166
4844 #: kallithea/templates/changeset/changeset_file_comment.html:166
@@ -5001,8 +5001,8 b' msgid "The changeset status was changed '
5001 msgstr "チェンジセットを次に変更"
5001 msgstr "チェンジセットを次に変更"
5002
5002
5003 #: kallithea/templates/email_templates/main.html:8
5003 #: kallithea/templates/email_templates/main.html:8
5004 msgid "This is a notification from RhodeCode."
5004 msgid "This is a notification from Kallithea."
5005 msgstr "RhodeCodeからの通知です"
5005 msgstr "Kallitheaからの通知です"
5006
5006
5007 #: kallithea/templates/email_templates/password_reset.html:4
5007 #: kallithea/templates/email_templates/password_reset.html:4
5008 #, python-format
5008 #, python-format
@@ -1,11 +1,11 b''
1 # Translations template for RhodeCode.
1 # Translations template for Kallithea.
2 # Copyright (C) 2014 RhodeCode GmbH
2 # Copyright (C) 2014 RhodeCode GmbH
3 # This file is distributed under the same license as the RhodeCode project.
3 # This file is distributed under the same license as the Kallithea project.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
5 ##, fuzzy
5 ##, fuzzy
6 msgid ""
6 msgid ""
7 msgstr ""
7 msgstr ""
8 "Project-Id-Version: RhodeCode 2.2.5\n"
8 "Project-Id-Version: Kallithea 2.2.5\n"
9 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
9 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
10 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
10 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@@ -131,7 +131,7 b' msgstr ""'
131
131
132 #: kallithea/controllers/files.py:322
132 #: kallithea/controllers/files.py:322
133 #, python-format
133 #, python-format
134 msgid "Deleted file %s via RhodeCode"
134 msgid "Deleted file %s via Kallithea"
135 msgstr ""
135 msgstr ""
136
136
137 #: kallithea/controllers/files.py:344
137 #: kallithea/controllers/files.py:344
@@ -150,7 +150,7 b' msgstr ""'
150
150
151 #: kallithea/controllers/files.py:385
151 #: kallithea/controllers/files.py:385
152 #, python-format
152 #, python-format
153 msgid "Edited file %s via RhodeCode"
153 msgid "Edited file %s via Kallithea"
154 msgstr ""
154 msgstr ""
155
155
156 #: kallithea/controllers/files.py:401
156 #: kallithea/controllers/files.py:401
@@ -163,7 +163,7 b' msgid "Successfully committed to %s"'
163 msgstr ""
163 msgstr ""
164
164
165 #: kallithea/controllers/files.py:438
165 #: kallithea/controllers/files.py:438
166 msgid "Added file via RhodeCode"
166 msgid "Added file via Kallithea"
167 msgstr ""
167 msgstr ""
168
168
169 #: kallithea/controllers/files.py:459
169 #: kallithea/controllers/files.py:459
@@ -266,7 +266,7 b' msgid "bad captcha"'
266 msgstr ""
266 msgstr ""
267
267
268 #: kallithea/controllers/login.py:191
268 #: kallithea/controllers/login.py:191
269 msgid "You have successfully registered into RhodeCode"
269 msgid "You have successfully registered into Kallithea"
270 msgstr ""
270 msgstr ""
271
271
272 #: kallithea/controllers/login.py:235
272 #: kallithea/controllers/login.py:235
@@ -1081,7 +1081,7 b' msgid "[pushed] into"'
1081 msgstr ""
1081 msgstr ""
1082
1082
1083 #: kallithea/lib/helpers.py:779
1083 #: kallithea/lib/helpers.py:779
1084 msgid "[committed via RhodeCode] into repository"
1084 msgid "[committed via Kallithea] into repository"
1085 msgstr ""
1085 msgstr ""
1086
1086
1087 #: kallithea/lib/helpers.py:781
1087 #: kallithea/lib/helpers.py:781
@@ -1296,7 +1296,7 b' msgstr ""'
1296 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1296 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1297 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1297 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1298 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1298 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1299 msgid "RhodeCode Administrator"
1299 msgid "Kallithea Administrator"
1300 msgstr ""
1300 msgstr ""
1301
1301
1302 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
1302 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
@@ -1370,14 +1370,14 b' msgstr ""'
1370 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1370 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1371 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1371 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1372 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1372 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1373 msgid "Register new user with RhodeCode with manual activation"
1373 msgid "Register new user with Kallithea with manual activation"
1374 msgstr ""
1374 msgstr ""
1375
1375
1376 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1376 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1377 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1377 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1378 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1378 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1379 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1379 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1380 msgid "Register new user with RhodeCode with auto activation"
1380 msgid "Register new user with Kallithea with auto activation"
1381 msgstr ""
1381 msgstr ""
1382
1382
1383 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
1383 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
@@ -1679,7 +1679,7 b' msgstr ""'
1679
1679
1680 #: kallithea/model/notification.py:232
1680 #: kallithea/model/notification.py:232
1681 #, python-format
1681 #, python-format
1682 msgid "%(user)s registered in RhodeCode at %(when)s"
1682 msgid "%(user)s registered in Kallithea at %(when)s"
1683 msgstr ""
1683 msgstr ""
1684
1684
1685 #: kallithea/model/notification.py:233
1685 #: kallithea/model/notification.py:233
@@ -1728,7 +1728,7 b' msgstr ""'
1728
1728
1729 #: kallithea/model/user.py:332
1729 #: kallithea/model/user.py:332
1730 #, python-format
1730 #, python-format
1731 msgid "Your new RhodeCode password:%s"
1731 msgid "Your new Kallithea password:%s"
1732 msgstr ""
1732 msgstr ""
1733
1733
1734 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
1734 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
@@ -2284,7 +2284,7 b' msgid "Enabled Plugins"'
2284 msgstr ""
2284 msgstr ""
2285
2285
2286 #: kallithea/templates/admin/auth/auth_settings.html:36
2286 #: kallithea/templates/admin/auth/auth_settings.html:36
2287 msgid "Comma separated list of plugins. Order of plugins is also order in which RhodeCode will try to authenticate user"
2287 msgid "Comma separated list of plugins. Order of plugins is also order in which Kallithea will try to authenticate user"
2288 msgstr ""
2288 msgstr ""
2289
2289
2290 #: kallithea/templates/admin/auth/auth_settings.html:37
2290 #: kallithea/templates/admin/auth/auth_settings.html:37
@@ -2885,7 +2885,7 b' msgstr ""'
2885
2885
2886 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2886 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2887 #, python-format
2887 #, python-format
2888 msgid "Allow access to RhodeCode without need to log in. Anonymous users use %s user permissions"
2888 msgid "Allow access to Kallithea without need to log in. Anonymous users use %s user permissions"
2889 msgstr ""
2889 msgstr ""
2890
2890
2891 #: kallithea/templates/admin/permissions/permissions_globals.html:26
2891 #: kallithea/templates/admin/permissions/permissions_globals.html:26
@@ -3230,7 +3230,7 b' msgid "Repository \\"%(repo_name)s\\" is b'
3230 msgstr ""
3230 msgstr ""
3231
3231
3232 #: kallithea/templates/admin/repos/repo_creating.html:42
3232 #: kallithea/templates/admin/repos/repo_creating.html:42
3233 msgid "We're sorry but error occured during this operation. Please check your RhodeCode server logs, or contact administrator."
3233 msgid "We're sorry but error occured during this operation. Please check your Kallithea server logs, or contact administrator."
3234 msgstr ""
3234 msgstr ""
3235
3235
3236 #: kallithea/templates/admin/repos/repo_edit.html:8
3236 #: kallithea/templates/admin/repos/repo_edit.html:8
@@ -3342,7 +3342,7 b' msgid "Delete forks"'
3342 msgstr ""
3342 msgstr ""
3343
3343
3344 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3344 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3345 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"
3345 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"
3346 msgstr ""
3346 msgstr ""
3347
3347
3348 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
3348 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
@@ -3552,7 +3552,7 b' msgid "Email prefix"'
3552 msgstr ""
3552 msgstr ""
3553
3553
3554 #: kallithea/templates/admin/settings/settings_email.html:5
3554 #: kallithea/templates/admin/settings/settings_email.html:5
3555 msgid "RhodeCode email from"
3555 msgid "Kallithea email from"
3556 msgstr ""
3556 msgstr ""
3557
3557
3558 #: kallithea/templates/admin/settings/settings_email.html:6
3558 #: kallithea/templates/admin/settings/settings_email.html:6
@@ -3604,7 +3604,7 b' msgid "Site branding"'
3604 msgstr ""
3604 msgstr ""
3605
3605
3606 #: kallithea/templates/admin/settings/settings_global.html:12
3606 #: kallithea/templates/admin/settings/settings_global.html:12
3607 msgid "Set a custom title for your RhodeCode Service."
3607 msgid "Set a custom title for your Kallithea Service."
3608 msgstr ""
3608 msgstr ""
3609
3609
3610 #: kallithea/templates/admin/settings/settings_global.html:18
3610 #: kallithea/templates/admin/settings/settings_global.html:18
@@ -3660,7 +3660,7 b' msgstr ""'
3660
3660
3661 #: kallithea/templates/admin/settings/settings_license.html:9
3661 #: kallithea/templates/admin/settings/settings_license.html:9
3662 #: kallithea/templates/admin/settings/settings_system.html:4
3662 #: kallithea/templates/admin/settings/settings_system.html:4
3663 msgid "RhodeCode version"
3663 msgid "Kallithea version"
3664 msgstr ""
3664 msgstr ""
3665
3665
3666 #: kallithea/templates/admin/settings/settings_license.html:10
3666 #: kallithea/templates/admin/settings/settings_license.html:10
@@ -3696,7 +3696,7 b' msgid "License key"'
3696 msgstr ""
3696 msgstr ""
3697
3697
3698 #: kallithea/templates/admin/settings/settings_license.html:37
3698 #: kallithea/templates/admin/settings/settings_license.html:37
3699 msgid "Paste your RhodeCode license key into that textarea."
3699 msgid "Paste your Kallithea license key into that textarea."
3700 msgstr ""
3700 msgstr ""
3701
3701
3702 #: kallithea/templates/admin/settings/settings_license.html:52
3702 #: kallithea/templates/admin/settings/settings_license.html:52
@@ -3728,7 +3728,7 b' msgid "Install GIT hooks"'
3728 msgstr ""
3728 msgstr ""
3729
3729
3730 #: kallithea/templates/admin/settings/settings_mapping.html:25
3730 #: kallithea/templates/admin/settings/settings_mapping.html:25
3731 msgid "Verify if RhodeCodes GIT hooks are installed for each repository. Current hooks will be updated to latest version"
3731 msgid "Verify if Kallitheas GIT hooks are installed for each repository. Current hooks will be updated to latest version"
3732 msgstr ""
3732 msgstr ""
3733
3733
3734 #: kallithea/templates/admin/settings/settings_mapping.html:32
3734 #: kallithea/templates/admin/settings/settings_mapping.html:32
@@ -3744,7 +3744,7 b' msgid "Build from scratch"'
3744 msgstr ""
3744 msgstr ""
3745
3745
3746 #: kallithea/templates/admin/settings/settings_search.html:15
3746 #: kallithea/templates/admin/settings/settings_search.html:15
3747 msgid "This option completely reindex all the files within RhodeCode for proper fulltext search capabilities."
3747 msgid "This option completely reindex all the files within Kallithea for proper fulltext search capabilities."
3748 msgstr ""
3748 msgstr ""
3749
3749
3750 #: kallithea/templates/admin/settings/settings_search.html:21
3750 #: kallithea/templates/admin/settings/settings_search.html:21
@@ -3796,7 +3796,7 b' msgid "Require SSL for vcs operations"'
3796 msgstr ""
3796 msgstr ""
3797
3797
3798 #: kallithea/templates/admin/settings/settings_vcs.html:13
3798 #: kallithea/templates/admin/settings/settings_vcs.html:13
3799 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."
3799 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."
3800 msgstr ""
3800 msgstr ""
3801
3801
3802 #: kallithea/templates/admin/settings/settings_vcs.html:24
3802 #: kallithea/templates/admin/settings/settings_vcs.html:24
@@ -3836,7 +3836,7 b' msgid "Repositories location"'
3836 msgstr ""
3836 msgstr ""
3837
3837
3838 #: kallithea/templates/admin/settings/settings_vcs.html:69
3838 #: kallithea/templates/admin/settings/settings_vcs.html:69
3839 msgid "Click to unlock. You must restart RhodeCode in order to make this setting take effect."
3839 msgid "Click to unlock. You must restart Kallithea in order to make this setting take effect."
3840 msgstr ""
3840 msgstr ""
3841
3841
3842 #: kallithea/templates/admin/settings/settings_vcs.html:72
3842 #: kallithea/templates/admin/settings/settings_vcs.html:72
@@ -3856,34 +3856,34 b' msgid "Allows storing additional customi'
3856 msgstr ""
3856 msgstr ""
3857
3857
3858 #: kallithea/templates/admin/settings/settings_visual.html:18
3858 #: kallithea/templates/admin/settings/settings_visual.html:18
3859 msgid "Show RhodeCode version"
3859 msgid "Show Kallithea version"
3860 msgstr ""
3860 msgstr ""
3861
3861
3862 #: kallithea/templates/admin/settings/settings_visual.html:20
3862 #: kallithea/templates/admin/settings/settings_visual.html:20
3863 msgid "Shows or hides a version number of RhodeCode displayed in the footer."
3863 msgid "Shows or hides a version number of Kallithea displayed in the footer."
3864 msgstr ""
3864 msgstr ""
3865
3865
3866 #: kallithea/templates/admin/settings/settings_visual.html:24
3866 #: kallithea/templates/admin/settings/settings_visual.html:24
3867 msgid "Use Gravatars in RhodeCode"
3867 msgid "Use Gravatars in Kallithea"
3868 msgstr ""
3868 msgstr ""
3869
3869
3870 #: kallithea/templates/admin/settings/settings_visual.html:30
3870 #: kallithea/templates/admin/settings/settings_visual.html:30
3871 msgid ""
3871 msgid ""
3872 "Gravatar url allows you to use other avatar server application.\n"
3872 "Gravatar url allows you to use other avatar server application.\n"
3873 " Following variables of the URL will be replaced accordingly.\n"
3873 " Following variables of the URL will be replaced accordingly.\n"
3874 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
3874 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
3875 " {email} user email,\n"
3875 " {email} user email,\n"
3876 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
3876 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
3877 " {size} size of the image that is expected from the server application,\n"
3877 " {size} size of the image that is expected from the server application,\n"
3878 " {netloc} network location/server host of running RhodeCode server"
3878 " {netloc} network location/server host of running Kallithea server"
3879 msgstr ""
3879 msgstr ""
3880
3880
3881 #: kallithea/templates/admin/settings/settings_visual.html:42
3881 #: kallithea/templates/admin/settings/settings_visual.html:42
3882 msgid ""
3882 msgid ""
3883 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
3883 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
3884 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
3884 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
3885 " {user} current user username,\n"
3885 " {user} current user username,\n"
3886 " {netloc} network location/server host of running RhodeCode server,\n"
3886 " {netloc} network location/server host of running Kallithea server,\n"
3887 " {repo} full repository name,\n"
3887 " {repo} full repository name,\n"
3888 " {repoid} ID of repository, can be used to contruct clone-by-id"
3888 " {repoid} ID of repository, can be used to contruct clone-by-id"
3889 msgstr ""
3889 msgstr ""
@@ -4588,7 +4588,7 b' msgid "Refs"'
4588 msgstr ""
4588 msgstr ""
4589
4589
4590 #: kallithea/templates/changelog/changelog_summary_data.html:86
4590 #: kallithea/templates/changelog/changelog_summary_data.html:86
4591 msgid "Add or upload files directly via RhodeCode"
4591 msgid "Add or upload files directly via Kallithea"
4592 msgstr ""
4592 msgstr ""
4593
4593
4594 #: kallithea/templates/changelog/changelog_summary_data.html:89
4594 #: kallithea/templates/changelog/changelog_summary_data.html:89
@@ -4733,7 +4733,7 b' msgstr ""'
4733
4733
4734 #: kallithea/templates/changeset/changeset_file_comment.html:69
4734 #: kallithea/templates/changeset/changeset_file_comment.html:69
4735 #: kallithea/templates/changeset/changeset_file_comment.html:155
4735 #: kallithea/templates/changeset/changeset_file_comment.html:155
4736 msgid "Use @username inside this text to send notification to this RhodeCode user"
4736 msgid "Use @username inside this text to send notification to this Kallithea user"
4737 msgstr ""
4737 msgstr ""
4738
4738
4739 #: kallithea/templates/changeset/changeset_file_comment.html:73
4739 #: kallithea/templates/changeset/changeset_file_comment.html:73
@@ -4898,7 +4898,7 b' msgid "The changeset status was changed '
4898 msgstr ""
4898 msgstr ""
4899
4899
4900 #: kallithea/templates/email_templates/main.html:8
4900 #: kallithea/templates/email_templates/main.html:8
4901 msgid "This is a notification from RhodeCode."
4901 msgid "This is a notification from Kallithea."
4902 msgstr ""
4902 msgstr ""
4903
4903
4904 #: kallithea/templates/email_templates/password_reset.html:4
4904 #: kallithea/templates/email_templates/password_reset.html:4
@@ -1,6 +1,6 b''
1 # Translations template for RhodeCode.
1 # Translations template for Kallithea.
2 # Copyright (C) 2014 RhodeCode GmbH, and others.
2 # Copyright (C) 2014 RhodeCode GmbH, and others.
3 # This file is distributed under the same license as the RhodeCode project.
3 # This file is distributed under the same license as the Kallithea project.
4 # Translators:
4 # Translators:
5 # Nemcio <areczek01@gmail.com>, 2013
5 # Nemcio <areczek01@gmail.com>, 2013
6 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010
6 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010
@@ -9,12 +9,12 b''
9 # Nemcio <areczek01@gmail.com>, 2012-2013
9 # Nemcio <areczek01@gmail.com>, 2012-2013
10 msgid ""
10 msgid ""
11 msgstr ""
11 msgstr ""
12 "Project-Id-Version: RhodeCode\n"
12 "Project-Id-Version: Kallithea\n"
13 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
13 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
14 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
14 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
15 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
15 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
16 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
16 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
17 "Language-Team: Polish (http://www.transifex.com/projects/p/RhodeCode/language/pl/)\n"
17 "Language-Team: Polish (http://www.transifex.com/projects/p/Kallithea/language/pl/)\n"
18 "MIME-Version: 1.0\n"
18 "MIME-Version: 1.0\n"
19 "Content-Type: text/plain; charset=UTF-8\n"
19 "Content-Type: text/plain; charset=UTF-8\n"
20 "Content-Transfer-Encoding: 8bit\n"
20 "Content-Transfer-Encoding: 8bit\n"
@@ -142,7 +142,7 b' msgstr ""'
142
142
143 #: kallithea/controllers/files.py:322
143 #: kallithea/controllers/files.py:322
144 #, python-format
144 #, python-format
145 msgid "Deleted file %s via RhodeCode"
145 msgid "Deleted file %s via Kallithea"
146 msgstr ""
146 msgstr ""
147
147
148 #: kallithea/controllers/files.py:344
148 #: kallithea/controllers/files.py:344
@@ -161,8 +161,8 b' msgstr "Mo\xc5\xbcna tylko edytowa\xc4\x87 pliki z rewizji obecnej ga\xc5\x82\xc4\x99zi"'
161
161
162 #: kallithea/controllers/files.py:385
162 #: kallithea/controllers/files.py:385
163 #, python-format
163 #, python-format
164 msgid "Edited file %s via RhodeCode"
164 msgid "Edited file %s via Kallithea"
165 msgstr "Edytowanie %s w RhodeCode"
165 msgstr "Edytowanie %s w Kallithea"
166
166
167 #: kallithea/controllers/files.py:401
167 #: kallithea/controllers/files.py:401
168 msgid "No changes"
168 msgid "No changes"
@@ -174,8 +174,8 b' msgid "Successfully committed to %s"'
174 msgstr "Committ wykonany do %s"
174 msgstr "Committ wykonany do %s"
175
175
176 #: kallithea/controllers/files.py:438
176 #: kallithea/controllers/files.py:438
177 msgid "Added file via RhodeCode"
177 msgid "Added file via Kallithea"
178 msgstr "Dodano %s poprzez RhodeCode"
178 msgstr "Dodano %s poprzez Kallithea"
179
179
180 #: kallithea/controllers/files.py:459
180 #: kallithea/controllers/files.py:459
181 msgid "No content"
181 msgid "No content"
@@ -279,7 +279,7 b' msgid "bad captcha"'
279 msgstr ""
279 msgstr ""
280
280
281 #: kallithea/controllers/login.py:191
281 #: kallithea/controllers/login.py:191
282 msgid "You have successfully registered into RhodeCode"
282 msgid "You have successfully registered into Kallithea"
283 msgstr "Udało Ci się zarejestrować na stronie"
283 msgstr "Udało Ci się zarejestrować na stronie"
284
284
285 #: kallithea/controllers/login.py:235
285 #: kallithea/controllers/login.py:235
@@ -1106,8 +1106,8 b' msgid "[pushed] into"'
1106 msgstr "[wysłane zmiany] w"
1106 msgstr "[wysłane zmiany] w"
1107
1107
1108 #: kallithea/lib/helpers.py:779
1108 #: kallithea/lib/helpers.py:779
1109 msgid "[committed via RhodeCode] into repository"
1109 msgid "[committed via Kallithea] into repository"
1110 msgstr "[synchronizacja przez RhodeCode] z repozytorium"
1110 msgstr "[synchronizacja przez Kallithea] z repozytorium"
1111
1111
1112 #: kallithea/lib/helpers.py:781
1112 #: kallithea/lib/helpers.py:781
1113 msgid "[pulled from remote] into repository"
1113 msgid "[pulled from remote] into repository"
@@ -1329,7 +1329,7 b' msgstr "Repozytoria Grupy dost\xc4\x99p administratora"'
1329 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1329 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1330 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1330 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1331 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1331 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1332 msgid "RhodeCode Administrator"
1332 msgid "Kallithea Administrator"
1333 msgstr "Administrator Repo"
1333 msgstr "Administrator Repo"
1334
1334
1335 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
1335 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
@@ -1403,14 +1403,14 b' msgstr "Rejestracja wy\xc5\x82\xc4\x85czona"'
1403 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1403 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1404 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1404 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1405 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1405 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1406 msgid "Register new user with RhodeCode with manual activation"
1406 msgid "Register new user with Kallithea with manual activation"
1407 msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją"
1407 msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją"
1408
1408
1409 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1409 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1410 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1410 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1411 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1411 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1412 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1412 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1413 msgid "Register new user with RhodeCode with auto activation"
1413 msgid "Register new user with Kallithea with auto activation"
1414 msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją"
1414 msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją"
1415
1415
1416 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
1416 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
@@ -1714,7 +1714,7 b' msgstr "%(user)s wspomnia\xc5\x82 o Tobie w %(when)s"'
1714
1714
1715 #: kallithea/model/notification.py:232
1715 #: kallithea/model/notification.py:232
1716 #, python-format
1716 #, python-format
1717 msgid "%(user)s registered in RhodeCode at %(when)s"
1717 msgid "%(user)s registered in Kallithea at %(when)s"
1718 msgstr "%(user)s zarejestrował na stronie w %(when)s"
1718 msgstr "%(user)s zarejestrował na stronie w %(when)s"
1719
1719
1720 #: kallithea/model/notification.py:233
1720 #: kallithea/model/notification.py:233
@@ -1765,7 +1765,7 b' msgstr "Nowe has\xc5\x82o"'
1765
1765
1766 #: kallithea/model/user.py:332
1766 #: kallithea/model/user.py:332
1767 #, python-format
1767 #, python-format
1768 msgid "Your new RhodeCode password:%s"
1768 msgid "Your new Kallithea password:%s"
1769 msgstr "Nowe hasło do strony: %s"
1769 msgstr "Nowe hasło do strony: %s"
1770
1770
1771 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
1771 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
@@ -2332,7 +2332,7 b' msgstr "W\xc5\x82\xc4\x85czone Wtyczki"'
2332 #: kallithea/templates/admin/auth/auth_settings.html:36
2332 #: kallithea/templates/admin/auth/auth_settings.html:36
2333 msgid ""
2333 msgid ""
2334 "Comma separated list of plugins. Order of plugins is also order in which "
2334 "Comma separated list of plugins. Order of plugins is also order in which "
2335 "RhodeCode will try to authenticate user"
2335 "Kallithea will try to authenticate user"
2336 msgstr ""
2336 msgstr ""
2337
2337
2338 #: kallithea/templates/admin/auth/auth_settings.html:37
2338 #: kallithea/templates/admin/auth/auth_settings.html:37
@@ -2940,7 +2940,7 b' msgstr "Dost\xc4\x99p anonimowy"'
2940 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2940 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2941 #, python-format
2941 #, python-format
2942 msgid ""
2942 msgid ""
2943 "Allow access to RhodeCode without need to log in. Anonymous users use %s "
2943 "Allow access to Kallithea without need to log in. Anonymous users use %s "
2944 "user permissions"
2944 "user permissions"
2945 msgstr ""
2945 msgstr ""
2946
2946
@@ -3310,7 +3310,7 b' msgstr ""'
3310 #: kallithea/templates/admin/repos/repo_creating.html:42
3310 #: kallithea/templates/admin/repos/repo_creating.html:42
3311 msgid ""
3311 msgid ""
3312 "We're sorry but error occured during this operation. Please check your "
3312 "We're sorry but error occured during this operation. Please check your "
3313 "RhodeCode server logs, or contact administrator."
3313 "Kallithea server logs, or contact administrator."
3314 msgstr ""
3314 msgstr ""
3315
3315
3316 #: kallithea/templates/admin/repos/repo_edit.html:8
3316 #: kallithea/templates/admin/repos/repo_edit.html:8
@@ -3430,7 +3430,7 b' msgstr "Usu\xc5\x84 rozwidlenie"'
3430 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3430 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3431 msgid ""
3431 msgid ""
3432 "This repository will be renamed in a special way in order to be unaccesible "
3432 "This repository will be renamed in a special way in order to be unaccesible "
3433 "for RhodeCode and VCS systems. If you need to fully delete it from file "
3433 "for Kallithea and VCS systems. If you need to fully delete it from file "
3434 "system please do it manually"
3434 "system please do it manually"
3435 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"
3435 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"
3436
3436
@@ -3643,7 +3643,7 b' msgid "Email prefix"'
3643 msgstr ""
3643 msgstr ""
3644
3644
3645 #: kallithea/templates/admin/settings/settings_email.html:5
3645 #: kallithea/templates/admin/settings/settings_email.html:5
3646 msgid "RhodeCode email from"
3646 msgid "Kallithea email from"
3647 msgstr ""
3647 msgstr ""
3648
3648
3649 #: kallithea/templates/admin/settings/settings_email.html:6
3649 #: kallithea/templates/admin/settings/settings_email.html:6
@@ -3695,7 +3695,7 b' msgid "Site branding"'
3695 msgstr "Nazwa strony"
3695 msgstr "Nazwa strony"
3696
3696
3697 #: kallithea/templates/admin/settings/settings_global.html:12
3697 #: kallithea/templates/admin/settings/settings_global.html:12
3698 msgid "Set a custom title for your RhodeCode Service."
3698 msgid "Set a custom title for your Kallithea Service."
3699 msgstr ""
3699 msgstr ""
3700
3700
3701 #: kallithea/templates/admin/settings/settings_global.html:18
3701 #: kallithea/templates/admin/settings/settings_global.html:18
@@ -3755,7 +3755,7 b' msgstr ""'
3755
3755
3756 #: kallithea/templates/admin/settings/settings_license.html:9
3756 #: kallithea/templates/admin/settings/settings_license.html:9
3757 #: kallithea/templates/admin/settings/settings_system.html:4
3757 #: kallithea/templates/admin/settings/settings_system.html:4
3758 msgid "RhodeCode version"
3758 msgid "Kallithea version"
3759 msgstr ""
3759 msgstr ""
3760
3760
3761 #: kallithea/templates/admin/settings/settings_license.html:10
3761 #: kallithea/templates/admin/settings/settings_license.html:10
@@ -3791,7 +3791,7 b' msgid "License key"'
3791 msgstr ""
3791 msgstr ""
3792
3792
3793 #: kallithea/templates/admin/settings/settings_license.html:37
3793 #: kallithea/templates/admin/settings/settings_license.html:37
3794 msgid "Paste your RhodeCode license key into that textarea."
3794 msgid "Paste your Kallithea license key into that textarea."
3795 msgstr ""
3795 msgstr ""
3796
3796
3797 #: kallithea/templates/admin/settings/settings_license.html:52
3797 #: kallithea/templates/admin/settings/settings_license.html:52
@@ -3830,7 +3830,7 b' msgstr ""'
3830
3830
3831 #: kallithea/templates/admin/settings/settings_mapping.html:25
3831 #: kallithea/templates/admin/settings/settings_mapping.html:25
3832 msgid ""
3832 msgid ""
3833 "Verify if RhodeCodes GIT hooks are installed for each repository. Current "
3833 "Verify if Kallitheas GIT hooks are installed for each repository. Current "
3834 "hooks will be updated to latest version"
3834 "hooks will be updated to latest version"
3835 msgstr ""
3835 msgstr ""
3836
3836
@@ -3848,7 +3848,7 b' msgstr "Buduj od podstaw"'
3848
3848
3849 #: kallithea/templates/admin/settings/settings_search.html:15
3849 #: kallithea/templates/admin/settings/settings_search.html:15
3850 msgid ""
3850 msgid ""
3851 "This option completely reindex all the files within RhodeCode for proper "
3851 "This option completely reindex all the files within Kallithea for proper "
3852 "fulltext search capabilities."
3852 "fulltext search capabilities."
3853 msgstr ""
3853 msgstr ""
3854
3854
@@ -3902,7 +3902,7 b' msgstr "Wymagaj ssl dla operacji vcs"'
3902
3902
3903 #: kallithea/templates/admin/settings/settings_vcs.html:13
3903 #: kallithea/templates/admin/settings/settings_vcs.html:13
3904 msgid ""
3904 msgid ""
3905 "Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
3905 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
3906 "certificate is missing it will return a HTTP Error 406: Not Acceptable."
3906 "certificate is missing it will return a HTTP Error 406: Not Acceptable."
3907 msgstr ""
3907 msgstr ""
3908
3908
@@ -3946,9 +3946,9 b' msgstr "Po\xc5\x82o\xc5\xbcenie repozytorium"'
3946
3946
3947 #: kallithea/templates/admin/settings/settings_vcs.html:69
3947 #: kallithea/templates/admin/settings/settings_vcs.html:69
3948 msgid ""
3948 msgid ""
3949 "Click to unlock. You must restart RhodeCode in order to make this setting "
3949 "Click to unlock. You must restart Kallithea in order to make this setting "
3950 "take effect."
3950 "take effect."
3951 msgstr "Kliknij, aby odblokować. Musisz ponownie uruchomić RhodeCode żeby wprowadzić to ustawienie w życie."
3951 msgstr "Kliknij, aby odblokować. Musisz ponownie uruchomić Kallithea żeby wprowadzić to ustawienie w życie."
3952
3952
3953 #: kallithea/templates/admin/settings/settings_vcs.html:72
3953 #: kallithea/templates/admin/settings/settings_vcs.html:72
3954 msgid ""
3954 msgid ""
@@ -3969,34 +3969,34 b' msgid "Allows storing additional customi'
3969 msgstr "Umożliwia przechowywanie dodatkowych niestandardowych pól w repozytorium."
3969 msgstr "Umożliwia przechowywanie dodatkowych niestandardowych pól w repozytorium."
3970
3970
3971 #: kallithea/templates/admin/settings/settings_visual.html:18
3971 #: kallithea/templates/admin/settings/settings_visual.html:18
3972 msgid "Show RhodeCode version"
3972 msgid "Show Kallithea version"
3973 msgstr "Pokaż wersję RhodeCode"
3973 msgstr "Pokaż wersję Kallithea"
3974
3974
3975 #: kallithea/templates/admin/settings/settings_visual.html:20
3975 #: kallithea/templates/admin/settings/settings_visual.html:20
3976 msgid "Shows or hides a version number of RhodeCode displayed in the footer."
3976 msgid "Shows or hides a version number of Kallithea displayed in the footer."
3977 msgstr ""
3977 msgstr ""
3978
3978
3979 #: kallithea/templates/admin/settings/settings_visual.html:24
3979 #: kallithea/templates/admin/settings/settings_visual.html:24
3980 msgid "Use Gravatars in RhodeCode"
3980 msgid "Use Gravatars in Kallithea"
3981 msgstr ""
3981 msgstr ""
3982
3982
3983 #: kallithea/templates/admin/settings/settings_visual.html:30
3983 #: kallithea/templates/admin/settings/settings_visual.html:30
3984 msgid ""
3984 msgid ""
3985 "Gravatar url allows you to use other avatar server application.\n"
3985 "Gravatar url allows you to use other avatar server application.\n"
3986 " Following variables of the URL will be replaced accordingly.\n"
3986 " Following variables of the URL will be replaced accordingly.\n"
3987 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
3987 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
3988 " {email} user email,\n"
3988 " {email} user email,\n"
3989 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
3989 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
3990 " {size} size of the image that is expected from the server application,\n"
3990 " {size} size of the image that is expected from the server application,\n"
3991 " {netloc} network location/server host of running RhodeCode server"
3991 " {netloc} network location/server host of running Kallithea server"
3992 msgstr ""
3992 msgstr ""
3993
3993
3994 #: kallithea/templates/admin/settings/settings_visual.html:42
3994 #: kallithea/templates/admin/settings/settings_visual.html:42
3995 msgid ""
3995 msgid ""
3996 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
3996 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
3997 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
3997 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
3998 " {user} current user username,\n"
3998 " {user} current user username,\n"
3999 " {netloc} network location/server host of running RhodeCode server,\n"
3999 " {netloc} network location/server host of running Kallithea server,\n"
4000 " {repo} full repository name,\n"
4000 " {repo} full repository name,\n"
4001 " {repoid} ID of repository, can be used to contruct clone-by-id"
4001 " {repoid} ID of repository, can be used to contruct clone-by-id"
4002 msgstr ""
4002 msgstr ""
@@ -4712,7 +4712,7 b' msgid "Refs"'
4712 msgstr "Gałąź/Etykieta"
4712 msgstr "Gałąź/Etykieta"
4713
4713
4714 #: kallithea/templates/changelog/changelog_summary_data.html:86
4714 #: kallithea/templates/changelog/changelog_summary_data.html:86
4715 msgid "Add or upload files directly via RhodeCode"
4715 msgid "Add or upload files directly via Kallithea"
4716 msgstr "Dodaj lub prześlij pliki bezpośrednio przez stronę"
4716 msgstr "Dodaj lub prześlij pliki bezpośrednio przez stronę"
4717
4717
4718 #: kallithea/templates/changelog/changelog_summary_data.html:89
4718 #: kallithea/templates/changelog/changelog_summary_data.html:89
@@ -4862,7 +4862,7 b' msgstr "Komentarze analizowane za pomoc\xc4\x85 %s sk\xc5\x82adni od %s wsparcia."'
4862 #: kallithea/templates/changeset/changeset_file_comment.html:69
4862 #: kallithea/templates/changeset/changeset_file_comment.html:69
4863 #: kallithea/templates/changeset/changeset_file_comment.html:155
4863 #: kallithea/templates/changeset/changeset_file_comment.html:155
4864 msgid ""
4864 msgid ""
4865 "Use @username inside this text to send notification to this RhodeCode user"
4865 "Use @username inside this text to send notification to this Kallithea user"
4866 msgstr "Użyj @username wewnątrz tego tekstu, aby wysłać powiadomienie do użytkownika strony"
4866 msgstr "Użyj @username wewnątrz tego tekstu, aby wysłać powiadomienie do użytkownika strony"
4867
4867
4868 #: kallithea/templates/changeset/changeset_file_comment.html:73
4868 #: kallithea/templates/changeset/changeset_file_comment.html:73
@@ -5028,7 +5028,7 b' msgid "The changeset status was changed '
5028 msgstr "Status zestawienia zmian został zmieniony na"
5028 msgstr "Status zestawienia zmian został zmieniony na"
5029
5029
5030 #: kallithea/templates/email_templates/main.html:8
5030 #: kallithea/templates/email_templates/main.html:8
5031 msgid "This is a notification from RhodeCode."
5031 msgid "This is a notification from Kallithea."
5032 msgstr "To jest powiadomienie z strony"
5032 msgstr "To jest powiadomienie z strony"
5033
5033
5034 #: kallithea/templates/email_templates/password_reset.html:4
5034 #: kallithea/templates/email_templates/password_reset.html:4
@@ -1,17 +1,17 b''
1 # Translations template for RhodeCode.
1 # Translations template for Kallithea.
2 # Copyright (C) 2014 RhodeCode GmbH, and others.
2 # Copyright (C) 2014 RhodeCode GmbH, and others.
3 # This file is distributed under the same license as the RhodeCode project.
3 # This file is distributed under the same license as the Kallithea project.
4 # Translators:
4 # Translators:
5 # Augusto Herrmann <augusto.herrmann@gmail.com>, 2012
5 # Augusto Herrmann <augusto.herrmann@gmail.com>, 2012
6 # gnustavo <gustavo@gnustavo.com>, 2013
6 # gnustavo <gustavo@gnustavo.com>, 2013
7 msgid ""
7 msgid ""
8 msgstr ""
8 msgstr ""
9 "Project-Id-Version: RhodeCode\n"
9 "Project-Id-Version: Kallithea\n"
10 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
10 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
11 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
11 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
12 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
12 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
13 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
13 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
14 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/RhodeCode/language/pt_BR/)\n"
14 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/Kallithea/language/pt_BR/)\n"
15 "MIME-Version: 1.0\n"
15 "MIME-Version: 1.0\n"
16 "Content-Type: text/plain; charset=UTF-8\n"
16 "Content-Type: text/plain; charset=UTF-8\n"
17 "Content-Transfer-Encoding: 8bit\n"
17 "Content-Transfer-Encoding: 8bit\n"
@@ -139,7 +139,7 b' msgstr ""'
139
139
140 #: kallithea/controllers/files.py:322
140 #: kallithea/controllers/files.py:322
141 #, python-format
141 #, python-format
142 msgid "Deleted file %s via RhodeCode"
142 msgid "Deleted file %s via Kallithea"
143 msgstr ""
143 msgstr ""
144
144
145 #: kallithea/controllers/files.py:344
145 #: kallithea/controllers/files.py:344
@@ -158,8 +158,8 b' msgstr "S\xc3\xb3 \xc3\xa9 poss\xc3\xadvel editar arquivos quando a revis\xc3\xa3o \xc3\xa9 um ramo v\xc3\xa1lido"'
158
158
159 #: kallithea/controllers/files.py:385
159 #: kallithea/controllers/files.py:385
160 #, python-format
160 #, python-format
161 msgid "Edited file %s via RhodeCode"
161 msgid "Edited file %s via Kallithea"
162 msgstr "Arquivo %s editado via RhodeCode"
162 msgstr "Arquivo %s editado via Kallithea"
163
163
164 #: kallithea/controllers/files.py:401
164 #: kallithea/controllers/files.py:401
165 msgid "No changes"
165 msgid "No changes"
@@ -171,8 +171,8 b' msgid "Successfully committed to %s"'
171 msgstr "Commit realizado com sucesso para %s"
171 msgstr "Commit realizado com sucesso para %s"
172
172
173 #: kallithea/controllers/files.py:438
173 #: kallithea/controllers/files.py:438
174 msgid "Added file via RhodeCode"
174 msgid "Added file via Kallithea"
175 msgstr "Arquivo adicionado via RhodeCode"
175 msgstr "Arquivo adicionado via Kallithea"
176
176
177 #: kallithea/controllers/files.py:459
177 #: kallithea/controllers/files.py:459
178 msgid "No content"
178 msgid "No content"
@@ -276,8 +276,8 b' msgid "bad captcha"'
276 msgstr ""
276 msgstr ""
277
277
278 #: kallithea/controllers/login.py:191
278 #: kallithea/controllers/login.py:191
279 msgid "You have successfully registered into RhodeCode"
279 msgid "You have successfully registered into Kallithea"
280 msgstr "Você foi registrado no RhodeCode com sucesso"
280 msgstr "Você foi registrado no Kallithea com sucesso"
281
281
282 #: kallithea/controllers/login.py:235
282 #: kallithea/controllers/login.py:235
283 msgid "Your password reset link was sent"
283 msgid "Your password reset link was sent"
@@ -1103,8 +1103,8 b' msgid "[pushed] into"'
1103 msgstr "[realizado push] para"
1103 msgstr "[realizado push] para"
1104
1104
1105 #: kallithea/lib/helpers.py:779
1105 #: kallithea/lib/helpers.py:779
1106 msgid "[committed via RhodeCode] into repository"
1106 msgid "[committed via Kallithea] into repository"
1107 msgstr "[commitado via RhodeCode] no repositório"
1107 msgstr "[commitado via Kallithea] no repositório"
1108
1108
1109 #: kallithea/lib/helpers.py:781
1109 #: kallithea/lib/helpers.py:781
1110 msgid "[pulled from remote] into repository"
1110 msgid "[pulled from remote] into repository"
@@ -1320,8 +1320,8 b' msgstr "Acesso administrativo ao Grupo de Reposit\xc3\xb3rios"'
1320 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1320 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1321 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1321 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1322 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1322 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1323 msgid "RhodeCode Administrator"
1323 msgid "Kallithea Administrator"
1324 msgstr "Administrador do RhodeCode"
1324 msgstr "Administrador do Kallithea"
1325
1325
1326 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
1326 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
1327 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
1327 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
@@ -1394,15 +1394,15 b' msgstr "Registro desabilitado"'
1394 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1394 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1395 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1395 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1396 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1396 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1397 msgid "Register new user with RhodeCode with manual activation"
1397 msgid "Register new user with Kallithea with manual activation"
1398 msgstr "Registro de novo usuário no RhodeCode com ativação manual"
1398 msgstr "Registro de novo usuário no Kallithea com ativação manual"
1399
1399
1400 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1400 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1401 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1401 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1402 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1402 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1403 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1403 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1404 msgid "Register new user with RhodeCode with auto activation"
1404 msgid "Register new user with Kallithea with auto activation"
1405 msgstr "Registro de novo usuário no RhodeCode com auto-ativação"
1405 msgstr "Registro de novo usuário no Kallithea com auto-ativação"
1406
1406
1407 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
1407 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
1408 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
1408 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
@@ -1705,8 +1705,8 b' msgstr "%(user)s mencionou-o em %(when)s'
1705
1705
1706 #: kallithea/model/notification.py:232
1706 #: kallithea/model/notification.py:232
1707 #, python-format
1707 #, python-format
1708 msgid "%(user)s registered in RhodeCode at %(when)s"
1708 msgid "%(user)s registered in Kallithea at %(when)s"
1709 msgstr "%(user)s registrou-se no RhodeCode em %(when)s"
1709 msgstr "%(user)s registrou-se no Kallithea em %(when)s"
1710
1710
1711 #: kallithea/model/notification.py:233
1711 #: kallithea/model/notification.py:233
1712 #, python-format
1712 #, python-format
@@ -1756,8 +1756,8 b' msgstr "Sua nova senha"'
1756
1756
1757 #: kallithea/model/user.py:332
1757 #: kallithea/model/user.py:332
1758 #, python-format
1758 #, python-format
1759 msgid "Your new RhodeCode password:%s"
1759 msgid "Your new Kallithea password:%s"
1760 msgstr "Sua nova senha no RhodeCode: %s"
1760 msgstr "Sua nova senha no Kallithea: %s"
1761
1761
1762 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
1762 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
1763 msgid "Value cannot be an empty list"
1763 msgid "Value cannot be an empty list"
@@ -2322,7 +2322,7 b' msgstr ""'
2322 #: kallithea/templates/admin/auth/auth_settings.html:36
2322 #: kallithea/templates/admin/auth/auth_settings.html:36
2323 msgid ""
2323 msgid ""
2324 "Comma separated list of plugins. Order of plugins is also order in which "
2324 "Comma separated list of plugins. Order of plugins is also order in which "
2325 "RhodeCode will try to authenticate user"
2325 "Kallithea will try to authenticate user"
2326 msgstr ""
2326 msgstr ""
2327
2327
2328 #: kallithea/templates/admin/auth/auth_settings.html:37
2328 #: kallithea/templates/admin/auth/auth_settings.html:37
@@ -2930,7 +2930,7 b' msgstr "Acesso an\xc3\xb4nimo"'
2930 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2930 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2931 #, python-format
2931 #, python-format
2932 msgid ""
2932 msgid ""
2933 "Allow access to RhodeCode without need to log in. Anonymous users use %s "
2933 "Allow access to Kallithea without need to log in. Anonymous users use %s "
2934 "user permissions"
2934 "user permissions"
2935 msgstr ""
2935 msgstr ""
2936
2936
@@ -3299,7 +3299,7 b' msgstr ""'
3299 #: kallithea/templates/admin/repos/repo_creating.html:42
3299 #: kallithea/templates/admin/repos/repo_creating.html:42
3300 msgid ""
3300 msgid ""
3301 "We're sorry but error occured during this operation. Please check your "
3301 "We're sorry but error occured during this operation. Please check your "
3302 "RhodeCode server logs, or contact administrator."
3302 "Kallithea server logs, or contact administrator."
3303 msgstr ""
3303 msgstr ""
3304
3304
3305 #: kallithea/templates/admin/repos/repo_edit.html:8
3305 #: kallithea/templates/admin/repos/repo_edit.html:8
@@ -3418,9 +3418,9 b' msgstr "Excluir bifurca\xc3\xa7\xc3\xb5es"'
3418 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3418 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3419 msgid ""
3419 msgid ""
3420 "This repository will be renamed in a special way in order to be unaccesible "
3420 "This repository will be renamed in a special way in order to be unaccesible "
3421 "for RhodeCode and VCS systems. If you need to fully delete it from file "
3421 "for Kallithea and VCS systems. If you need to fully delete it from file "
3422 "system please do it manually"
3422 "system please do it manually"
3423 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"
3423 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"
3424
3424
3425 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
3425 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
3426 msgid "Invalidate repository cache"
3426 msgid "Invalidate repository cache"
@@ -3631,7 +3631,7 b' msgid "Email prefix"'
3631 msgstr ""
3631 msgstr ""
3632
3632
3633 #: kallithea/templates/admin/settings/settings_email.html:5
3633 #: kallithea/templates/admin/settings/settings_email.html:5
3634 msgid "RhodeCode email from"
3634 msgid "Kallithea email from"
3635 msgstr ""
3635 msgstr ""
3636
3636
3637 #: kallithea/templates/admin/settings/settings_email.html:6
3637 #: kallithea/templates/admin/settings/settings_email.html:6
@@ -3683,7 +3683,7 b' msgid "Site branding"'
3683 msgstr "Marca do site"
3683 msgstr "Marca do site"
3684
3684
3685 #: kallithea/templates/admin/settings/settings_global.html:12
3685 #: kallithea/templates/admin/settings/settings_global.html:12
3686 msgid "Set a custom title for your RhodeCode Service."
3686 msgid "Set a custom title for your Kallithea Service."
3687 msgstr ""
3687 msgstr ""
3688
3688
3689 #: kallithea/templates/admin/settings/settings_global.html:18
3689 #: kallithea/templates/admin/settings/settings_global.html:18
@@ -3743,7 +3743,7 b' msgstr ""'
3743
3743
3744 #: kallithea/templates/admin/settings/settings_license.html:9
3744 #: kallithea/templates/admin/settings/settings_license.html:9
3745 #: kallithea/templates/admin/settings/settings_system.html:4
3745 #: kallithea/templates/admin/settings/settings_system.html:4
3746 msgid "RhodeCode version"
3746 msgid "Kallithea version"
3747 msgstr ""
3747 msgstr ""
3748
3748
3749 #: kallithea/templates/admin/settings/settings_license.html:10
3749 #: kallithea/templates/admin/settings/settings_license.html:10
@@ -3779,7 +3779,7 b' msgid "License key"'
3779 msgstr ""
3779 msgstr ""
3780
3780
3781 #: kallithea/templates/admin/settings/settings_license.html:37
3781 #: kallithea/templates/admin/settings/settings_license.html:37
3782 msgid "Paste your RhodeCode license key into that textarea."
3782 msgid "Paste your Kallithea license key into that textarea."
3783 msgstr ""
3783 msgstr ""
3784
3784
3785 #: kallithea/templates/admin/settings/settings_license.html:52
3785 #: kallithea/templates/admin/settings/settings_license.html:52
@@ -3818,7 +3818,7 b' msgstr ""'
3818
3818
3819 #: kallithea/templates/admin/settings/settings_mapping.html:25
3819 #: kallithea/templates/admin/settings/settings_mapping.html:25
3820 msgid ""
3820 msgid ""
3821 "Verify if RhodeCodes GIT hooks are installed for each repository. Current "
3821 "Verify if Kallitheas GIT hooks are installed for each repository. Current "
3822 "hooks will be updated to latest version"
3822 "hooks will be updated to latest version"
3823 msgstr ""
3823 msgstr ""
3824
3824
@@ -3836,7 +3836,7 b' msgstr "Construir do zero"'
3836
3836
3837 #: kallithea/templates/admin/settings/settings_search.html:15
3837 #: kallithea/templates/admin/settings/settings_search.html:15
3838 msgid ""
3838 msgid ""
3839 "This option completely reindex all the files within RhodeCode for proper "
3839 "This option completely reindex all the files within Kallithea for proper "
3840 "fulltext search capabilities."
3840 "fulltext search capabilities."
3841 msgstr ""
3841 msgstr ""
3842
3842
@@ -3890,7 +3890,7 b' msgstr "Requer SSL para opera\xc3\xa7\xc3\xb5es de VCS"'
3890
3890
3891 #: kallithea/templates/admin/settings/settings_vcs.html:13
3891 #: kallithea/templates/admin/settings/settings_vcs.html:13
3892 msgid ""
3892 msgid ""
3893 "Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
3893 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
3894 "certificate is missing it will return a HTTP Error 406: Not Acceptable."
3894 "certificate is missing it will return a HTTP Error 406: Not Acceptable."
3895 msgstr ""
3895 msgstr ""
3896
3896
@@ -3934,9 +3934,9 b' msgstr "Localiza\xc3\xa7\xc3\xa3o dos reposit\xc3\xb3rios"'
3934
3934
3935 #: kallithea/templates/admin/settings/settings_vcs.html:69
3935 #: kallithea/templates/admin/settings/settings_vcs.html:69
3936 msgid ""
3936 msgid ""
3937 "Click to unlock. You must restart RhodeCode in order to make this setting "
3937 "Click to unlock. You must restart Kallithea in order to make this setting "
3938 "take effect."
3938 "take effect."
3939 msgstr "Clique para destravar. Você deve reiniciar o RhodeCode para que esta configuração tenha efeito."
3939 msgstr "Clique para destravar. Você deve reiniciar o Kallithea para que esta configuração tenha efeito."
3940
3940
3941 #: kallithea/templates/admin/settings/settings_vcs.html:72
3941 #: kallithea/templates/admin/settings/settings_vcs.html:72
3942 msgid ""
3942 msgid ""
@@ -3957,34 +3957,34 b' msgid "Allows storing additional customi'
3957 msgstr "Permite armazenar campos customizados adicionais por repositório."
3957 msgstr "Permite armazenar campos customizados adicionais por repositório."
3958
3958
3959 #: kallithea/templates/admin/settings/settings_visual.html:18
3959 #: kallithea/templates/admin/settings/settings_visual.html:18
3960 msgid "Show RhodeCode version"
3960 msgid "Show Kallithea version"
3961 msgstr "Mostrar versão do RhodeCode"
3961 msgstr "Mostrar versão do Kallithea"
3962
3962
3963 #: kallithea/templates/admin/settings/settings_visual.html:20
3963 #: kallithea/templates/admin/settings/settings_visual.html:20
3964 msgid "Shows or hides a version number of RhodeCode displayed in the footer."
3964 msgid "Shows or hides a version number of Kallithea displayed in the footer."
3965 msgstr ""
3965 msgstr ""
3966
3966
3967 #: kallithea/templates/admin/settings/settings_visual.html:24
3967 #: kallithea/templates/admin/settings/settings_visual.html:24
3968 msgid "Use Gravatars in RhodeCode"
3968 msgid "Use Gravatars in Kallithea"
3969 msgstr ""
3969 msgstr ""
3970
3970
3971 #: kallithea/templates/admin/settings/settings_visual.html:30
3971 #: kallithea/templates/admin/settings/settings_visual.html:30
3972 msgid ""
3972 msgid ""
3973 "Gravatar url allows you to use other avatar server application.\n"
3973 "Gravatar url allows you to use other avatar server application.\n"
3974 " Following variables of the URL will be replaced accordingly.\n"
3974 " Following variables of the URL will be replaced accordingly.\n"
3975 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
3975 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
3976 " {email} user email,\n"
3976 " {email} user email,\n"
3977 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
3977 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
3978 " {size} size of the image that is expected from the server application,\n"
3978 " {size} size of the image that is expected from the server application,\n"
3979 " {netloc} network location/server host of running RhodeCode server"
3979 " {netloc} network location/server host of running Kallithea server"
3980 msgstr ""
3980 msgstr ""
3981
3981
3982 #: kallithea/templates/admin/settings/settings_visual.html:42
3982 #: kallithea/templates/admin/settings/settings_visual.html:42
3983 msgid ""
3983 msgid ""
3984 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
3984 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
3985 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
3985 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
3986 " {user} current user username,\n"
3986 " {user} current user username,\n"
3987 " {netloc} network location/server host of running RhodeCode server,\n"
3987 " {netloc} network location/server host of running Kallithea server,\n"
3988 " {repo} full repository name,\n"
3988 " {repo} full repository name,\n"
3989 " {repoid} ID of repository, can be used to contruct clone-by-id"
3989 " {repoid} ID of repository, can be used to contruct clone-by-id"
3990 msgstr ""
3990 msgstr ""
@@ -4699,8 +4699,8 b' msgid "Refs"'
4699 msgstr "Refs"
4699 msgstr "Refs"
4700
4700
4701 #: kallithea/templates/changelog/changelog_summary_data.html:86
4701 #: kallithea/templates/changelog/changelog_summary_data.html:86
4702 msgid "Add or upload files directly via RhodeCode"
4702 msgid "Add or upload files directly via Kallithea"
4703 msgstr "Adicionar ou enviar arquivos diretamente pelo RhodeCode"
4703 msgstr "Adicionar ou enviar arquivos diretamente pelo Kallithea"
4704
4704
4705 #: kallithea/templates/changelog/changelog_summary_data.html:89
4705 #: kallithea/templates/changelog/changelog_summary_data.html:89
4706 #: kallithea/templates/files/files_ypjax.html:9
4706 #: kallithea/templates/files/files_ypjax.html:9
@@ -4845,8 +4845,8 b' msgstr "Coment\xc3\xa1rios interpretados usando a sintaxe %s com suporte a %s."'
4845 #: kallithea/templates/changeset/changeset_file_comment.html:69
4845 #: kallithea/templates/changeset/changeset_file_comment.html:69
4846 #: kallithea/templates/changeset/changeset_file_comment.html:155
4846 #: kallithea/templates/changeset/changeset_file_comment.html:155
4847 msgid ""
4847 msgid ""
4848 "Use @username inside this text to send notification to this RhodeCode user"
4848 "Use @username inside this text to send notification to this Kallithea user"
4849 msgstr "Use @nomedeusuário dentro desse texto para enviar notificação a este usuário do RhodeCode"
4849 msgstr "Use @nomedeusuário dentro desse texto para enviar notificação a este usuário do Kallithea"
4850
4850
4851 #: kallithea/templates/changeset/changeset_file_comment.html:73
4851 #: kallithea/templates/changeset/changeset_file_comment.html:73
4852 #: kallithea/templates/changeset/changeset_file_comment.html:166
4852 #: kallithea/templates/changeset/changeset_file_comment.html:166
@@ -5010,8 +5010,8 b' msgid "The changeset status was changed '
5010 msgstr "O estado do changeset foi alterado para"
5010 msgstr "O estado do changeset foi alterado para"
5011
5011
5012 #: kallithea/templates/email_templates/main.html:8
5012 #: kallithea/templates/email_templates/main.html:8
5013 msgid "This is a notification from RhodeCode."
5013 msgid "This is a notification from Kallithea."
5014 msgstr "Esta é uma notificação do RhodeCode."
5014 msgstr "Esta é uma notificação do Kallithea."
5015
5015
5016 #: kallithea/templates/email_templates/password_reset.html:4
5016 #: kallithea/templates/email_templates/password_reset.html:4
5017 #, python-format
5017 #, python-format
@@ -1,6 +1,6 b''
1 # Translations template for RhodeCode.
1 # Translations template for Kallithea.
2 # Copyright (C) 2014 RhodeCode GmbH, and others.
2 # Copyright (C) 2014 RhodeCode GmbH, and others.
3 # This file is distributed under the same license as the RhodeCode project.
3 # This file is distributed under the same license as the Kallithea project.
4 # Translators:
4 # Translators:
5 # ArcheR <aleclitvinov1980@gmail.com>, 2013
5 # ArcheR <aleclitvinov1980@gmail.com>, 2013
6 # mokeev1995 <mokeev_andre@mail.ru>, 2013
6 # mokeev1995 <mokeev_andre@mail.ru>, 2013
@@ -22,12 +22,12 b''
22 # Mikhail Zholobov <legal90@gmail.com>, 2013
22 # Mikhail Zholobov <legal90@gmail.com>, 2013
23 msgid ""
23 msgid ""
24 msgstr ""
24 msgstr ""
25 "Project-Id-Version: RhodeCode\n"
25 "Project-Id-Version: Kallithea\n"
26 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
26 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
27 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
27 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
28 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
28 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
29 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
29 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
30 "Language-Team: Russian (http://www.transifex.com/projects/p/RhodeCode/language/ru/)\n"
30 "Language-Team: Russian (http://www.transifex.com/projects/p/Kallithea/language/ru/)\n"
31 "MIME-Version: 1.0\n"
31 "MIME-Version: 1.0\n"
32 "Content-Type: text/plain; charset=UTF-8\n"
32 "Content-Type: text/plain; charset=UTF-8\n"
33 "Content-Transfer-Encoding: 8bit\n"
33 "Content-Transfer-Encoding: 8bit\n"
@@ -155,7 +155,7 b' msgstr ""'
155
155
156 #: kallithea/controllers/files.py:322
156 #: kallithea/controllers/files.py:322
157 #, python-format
157 #, python-format
158 msgid "Deleted file %s via RhodeCode"
158 msgid "Deleted file %s via Kallithea"
159 msgstr ""
159 msgstr ""
160
160
161 #: kallithea/controllers/files.py:344
161 #: kallithea/controllers/files.py:344
@@ -174,8 +174,8 b' msgstr "\xd0\x92\xd1\x8b \xd0\xbc\xd0\xbe\xd0\xb6\xd0\xb5\xd1\x82\xd0\xb5 \xd1\x80\xd0\xb5\xd0\xb4\xd0\xb0\xd0\xba\xd1\x82\xd0\xb8\xd1\x80\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x82\xd1\x8c \xd1\x84\xd0\xb0\xd0\xb9\xd0\xbb\xd1\x8b \xd1\x82\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xba\xd0\xbe \xd0\xb2 \xd1\x80\xd0\xb5\xd0\xb4\xd0\xb0\xd0\xba\xd1\x86\xd0\xb8\xd0\xb8, \xd1\x81\xd0\xb2\xd1\x8f\xd0\xb7\xd0\xb0\xd0\xbd\xd0\xbd\xd0\xbe\xd0\xb9 \xd1\x81 \xd1\x81\xd1\x83\xd1\x89\xd0\xb5\xd1\x81\xd1\x82\xd0\xb2\xd1\x83\xd1\x8e\xd1\x89\xd0\xb5\xd0\xb9 \xd0\xb2\xd0\xb5\xd1\x82\xd0\xba\xd0\xbe\xd0\xb9"'
174
174
175 #: kallithea/controllers/files.py:385
175 #: kallithea/controllers/files.py:385
176 #, python-format
176 #, python-format
177 msgid "Edited file %s via RhodeCode"
177 msgid "Edited file %s via Kallithea"
178 msgstr "Файл %s отредактирован с помощью RhodeCode"
178 msgstr "Файл %s отредактирован с помощью Kallithea"
179
179
180 #: kallithea/controllers/files.py:401
180 #: kallithea/controllers/files.py:401
181 msgid "No changes"
181 msgid "No changes"
@@ -187,8 +187,8 b' msgid "Successfully committed to %s"'
187 msgstr "Изменения применены в %s"
187 msgstr "Изменения применены в %s"
188
188
189 #: kallithea/controllers/files.py:438
189 #: kallithea/controllers/files.py:438
190 msgid "Added file via RhodeCode"
190 msgid "Added file via Kallithea"
191 msgstr "Файл добавлен с помощью RhodeCode"
191 msgstr "Файл добавлен с помощью Kallithea"
192
192
193 #: kallithea/controllers/files.py:459
193 #: kallithea/controllers/files.py:459
194 msgid "No content"
194 msgid "No content"
@@ -292,8 +292,8 b' msgid "bad captcha"'
292 msgstr ""
292 msgstr ""
293
293
294 #: kallithea/controllers/login.py:191
294 #: kallithea/controllers/login.py:191
295 msgid "You have successfully registered into RhodeCode"
295 msgid "You have successfully registered into Kallithea"
296 msgstr "Регистрация в RhodeCode прошла успешно"
296 msgstr "Регистрация в Kallithea прошла успешно"
297
297
298 #: kallithea/controllers/login.py:235
298 #: kallithea/controllers/login.py:235
299 msgid "Your password reset link was sent"
299 msgid "Your password reset link was sent"
@@ -1119,8 +1119,8 b' msgid "[pushed] into"'
1119 msgstr "[отправлено] в"
1119 msgstr "[отправлено] в"
1120
1120
1121 #: kallithea/lib/helpers.py:779
1121 #: kallithea/lib/helpers.py:779
1122 msgid "[committed via RhodeCode] into repository"
1122 msgid "[committed via Kallithea] into repository"
1123 msgstr "[внесены изменения с помощью RhodeCode] в репозитории"
1123 msgstr "[внесены изменения с помощью Kallithea] в репозитории"
1124
1124
1125 #: kallithea/lib/helpers.py:781
1125 #: kallithea/lib/helpers.py:781
1126 msgid "[pulled from remote] into repository"
1126 msgid "[pulled from remote] into repository"
@@ -1342,8 +1342,8 b' msgstr "\xd0\x93\xd1\x80\xd1\x83\xd0\xbf\xd0\xbf\xd0\xb0 \xd0\xa0\xd0\xb5\xd0\xbf\xd0\xbe\xd0\xb7\xd0\xb8\xd1\x82\xd0\xbe\xd1\x80\xd0\xb8\xd0\xb5\xd0\xb2 - \xd0\xb0\xd0\xb4\xd0\xbc\xd0\xb8\xd0\xbd\xd0\xb8\xd1\x81\xd1\x82\xd1\x80\xd0\xb8\xd1\x80\xd0\xbe\xd0\xb2\xd0\xb0\xd0\xbd\xd0\xb8\xd0\xb5"'
1342 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1342 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1343 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1343 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1344 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1344 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1345 msgid "RhodeCode Administrator"
1345 msgid "Kallithea Administrator"
1346 msgstr "Администратор RhodeCode "
1346 msgstr "Администратор Kallithea "
1347
1347
1348 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
1348 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
1349 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
1349 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
@@ -1416,15 +1416,15 b' msgstr "\xd0\xa0\xd0\xb5\xd0\xb3\xd0\xb8\xd1\x81\xd1\x82\xd1\x80\xd0\xb0\xd1\x86\xd0\xb8\xd1\x8f \xd0\xbe\xd1\x82\xd0\xba\xd0\xbb\xd1\x8e\xd1\x87\xd0\xb5\xd0\xbd\xd0\xb0"'
1416 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1416 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1417 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1417 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1418 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1418 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1419 msgid "Register new user with RhodeCode with manual activation"
1419 msgid "Register new user with Kallithea with manual activation"
1420 msgstr "Регистрация нового пользователя в RhodeCode с ручной активацией"
1420 msgstr "Регистрация нового пользователя в Kallithea с ручной активацией"
1421
1421
1422 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1422 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1423 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1423 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1424 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1424 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1425 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1425 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1426 msgid "Register new user with RhodeCode with auto activation"
1426 msgid "Register new user with Kallithea with auto activation"
1427 msgstr "Регистрация нового пользователя в RhodeCode с автоматической активацией"
1427 msgstr "Регистрация нового пользователя в Kallithea с автоматической активацией"
1428
1428
1429 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
1429 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
1430 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
1430 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651
@@ -1727,8 +1727,8 b' msgstr "%(user)s \xd1\x83\xd0\xbf\xd0\xbe\xd0\xbc\xd1\x8f\xd0\xbd\xd1\x83\xd0\xbb \xd0\xb2\xd0\xb0\xd1\x81 %(when)s"'
1727
1727
1728 #: kallithea/model/notification.py:232
1728 #: kallithea/model/notification.py:232
1729 #, python-format
1729 #, python-format
1730 msgid "%(user)s registered in RhodeCode at %(when)s"
1730 msgid "%(user)s registered in Kallithea at %(when)s"
1731 msgstr "%(user)s зарегистрировался в RhodeCode %(when)s"
1731 msgstr "%(user)s зарегистрировался в Kallithea %(when)s"
1732
1732
1733 #: kallithea/model/notification.py:233
1733 #: kallithea/model/notification.py:233
1734 #, python-format
1734 #, python-format
@@ -1778,8 +1778,8 b' msgstr "\xd0\x92\xd0\xb0\xd1\x88 \xd0\xbd\xd0\xbe\xd0\xb2\xd1\x8b\xd0\xb9 \xd0\xbf\xd0\xb0\xd1\x80\xd0\xbe\xd0\xbb\xd1\x8c"'
1778
1778
1779 #: kallithea/model/user.py:332
1779 #: kallithea/model/user.py:332
1780 #, python-format
1780 #, python-format
1781 msgid "Your new RhodeCode password:%s"
1781 msgid "Your new Kallithea password:%s"
1782 msgstr "Ваш новый пароль от RhodeCode: %s"
1782 msgstr "Ваш новый пароль от Kallithea: %s"
1783
1783
1784 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
1784 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
1785 msgid "Value cannot be an empty list"
1785 msgid "Value cannot be an empty list"
@@ -2345,8 +2345,8 b' msgstr "\xd0\x92\xd0\xba\xd0\xbb\xd1\x8e\xd1\x87\xd0\xb5\xd0\xbd\xd0\xbd\xd1\x8b\xd0\xb5 \xd0\xbf\xd0\xbb\xd0\xb0\xd0\xb3\xd0\xb8\xd0\xbd\xd1\x8b"'
2345 #: kallithea/templates/admin/auth/auth_settings.html:36
2345 #: kallithea/templates/admin/auth/auth_settings.html:36
2346 msgid ""
2346 msgid ""
2347 "Comma separated list of plugins. Order of plugins is also order in which "
2347 "Comma separated list of plugins. Order of plugins is also order in which "
2348 "RhodeCode will try to authenticate user"
2348 "Kallithea will try to authenticate user"
2349 msgstr "Список плагинов, разделенных запятой. RhodeCode будет пробовать аутентифицировать пользователя в порядке указания плагинов."
2349 msgstr "Список плагинов, разделенных запятой. Kallithea будет пробовать аутентифицировать пользователя в порядке указания плагинов."
2350
2350
2351 #: kallithea/templates/admin/auth/auth_settings.html:37
2351 #: kallithea/templates/admin/auth/auth_settings.html:37
2352 msgid "Available built-in plugins"
2352 msgid "Available built-in plugins"
@@ -2953,7 +2953,7 b' msgstr "\xd0\x90\xd0\xbd\xd0\xbe\xd0\xbd\xd0\xb8\xd0\xbc\xd0\xbd\xd1\x8b\xd0\xb9 \xd0\xb4\xd0\xbe\xd1\x81\xd1\x82\xd1\x83\xd0\xbf"'
2953 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2953 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2954 #, python-format
2954 #, python-format
2955 msgid ""
2955 msgid ""
2956 "Allow access to RhodeCode without need to log in. Anonymous users use %s "
2956 "Allow access to Kallithea without need to log in. Anonymous users use %s "
2957 "user permissions"
2957 "user permissions"
2958 msgstr ""
2958 msgstr ""
2959
2959
@@ -3323,7 +3323,7 b' msgstr ""'
3323 #: kallithea/templates/admin/repos/repo_creating.html:42
3323 #: kallithea/templates/admin/repos/repo_creating.html:42
3324 msgid ""
3324 msgid ""
3325 "We're sorry but error occured during this operation. Please check your "
3325 "We're sorry but error occured during this operation. Please check your "
3326 "RhodeCode server logs, or contact administrator."
3326 "Kallithea server logs, or contact administrator."
3327 msgstr ""
3327 msgstr ""
3328
3328
3329 #: kallithea/templates/admin/repos/repo_edit.html:8
3329 #: kallithea/templates/admin/repos/repo_edit.html:8
@@ -3443,9 +3443,9 b' msgstr "\xd0\xa3\xd0\xb4\xd0\xb0\xd0\xbb\xd0\xb8\xd1\x82\xd1\x8c fork\'\xd0\xb8"'
3443 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3443 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3444 msgid ""
3444 msgid ""
3445 "This repository will be renamed in a special way in order to be unaccesible "
3445 "This repository will be renamed in a special way in order to be unaccesible "
3446 "for RhodeCode and VCS systems. If you need to fully delete it from file "
3446 "for Kallithea and VCS systems. If you need to fully delete it from file "
3447 "system please do it manually"
3447 "system please do it manually"
3448 msgstr "Этот репозитарий будет переименован таким образом, чтобы сделать его недоступным для RhodeCode и систем управления версиями. Если вам необходимо полностью удалить его из файловой системы, пожалуйста, сделайте это вручную"
3448 msgstr "Этот репозитарий будет переименован таким образом, чтобы сделать его недоступным для Kallithea и систем управления версиями. Если вам необходимо полностью удалить его из файловой системы, пожалуйста, сделайте это вручную"
3449
3449
3450 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
3450 #: kallithea/templates/admin/repos/repo_edit_caches.html:4
3451 msgid "Invalidate repository cache"
3451 msgid "Invalidate repository cache"
@@ -3656,7 +3656,7 b' msgid "Email prefix"'
3656 msgstr ""
3656 msgstr ""
3657
3657
3658 #: kallithea/templates/admin/settings/settings_email.html:5
3658 #: kallithea/templates/admin/settings/settings_email.html:5
3659 msgid "RhodeCode email from"
3659 msgid "Kallithea email from"
3660 msgstr ""
3660 msgstr ""
3661
3661
3662 #: kallithea/templates/admin/settings/settings_email.html:6
3662 #: kallithea/templates/admin/settings/settings_email.html:6
@@ -3708,7 +3708,7 b' msgid "Site branding"'
3708 msgstr "Брендинг сайта"
3708 msgstr "Брендинг сайта"
3709
3709
3710 #: kallithea/templates/admin/settings/settings_global.html:12
3710 #: kallithea/templates/admin/settings/settings_global.html:12
3711 msgid "Set a custom title for your RhodeCode Service."
3711 msgid "Set a custom title for your Kallithea Service."
3712 msgstr ""
3712 msgstr ""
3713
3713
3714 #: kallithea/templates/admin/settings/settings_global.html:18
3714 #: kallithea/templates/admin/settings/settings_global.html:18
@@ -3768,7 +3768,7 b' msgstr ""'
3768
3768
3769 #: kallithea/templates/admin/settings/settings_license.html:9
3769 #: kallithea/templates/admin/settings/settings_license.html:9
3770 #: kallithea/templates/admin/settings/settings_system.html:4
3770 #: kallithea/templates/admin/settings/settings_system.html:4
3771 msgid "RhodeCode version"
3771 msgid "Kallithea version"
3772 msgstr ""
3772 msgstr ""
3773
3773
3774 #: kallithea/templates/admin/settings/settings_license.html:10
3774 #: kallithea/templates/admin/settings/settings_license.html:10
@@ -3804,7 +3804,7 b' msgid "License key"'
3804 msgstr ""
3804 msgstr ""
3805
3805
3806 #: kallithea/templates/admin/settings/settings_license.html:37
3806 #: kallithea/templates/admin/settings/settings_license.html:37
3807 msgid "Paste your RhodeCode license key into that textarea."
3807 msgid "Paste your Kallithea license key into that textarea."
3808 msgstr ""
3808 msgstr ""
3809
3809
3810 #: kallithea/templates/admin/settings/settings_license.html:52
3810 #: kallithea/templates/admin/settings/settings_license.html:52
@@ -3843,7 +3843,7 b' msgstr ""'
3843
3843
3844 #: kallithea/templates/admin/settings/settings_mapping.html:25
3844 #: kallithea/templates/admin/settings/settings_mapping.html:25
3845 msgid ""
3845 msgid ""
3846 "Verify if RhodeCodes GIT hooks are installed for each repository. Current "
3846 "Verify if Kallitheas GIT hooks are installed for each repository. Current "
3847 "hooks will be updated to latest version"
3847 "hooks will be updated to latest version"
3848 msgstr ""
3848 msgstr ""
3849
3849
@@ -3861,7 +3861,7 b' msgstr "\xd0\xa1\xd0\xb1\xd0\xbe\xd1\x80\xd0\xba\xd0\xb0 \xd1\x81 \xd0\xbd\xd1\x83\xd0\xbb\xd1\x8f"'
3861
3861
3862 #: kallithea/templates/admin/settings/settings_search.html:15
3862 #: kallithea/templates/admin/settings/settings_search.html:15
3863 msgid ""
3863 msgid ""
3864 "This option completely reindex all the files within RhodeCode for proper "
3864 "This option completely reindex all the files within Kallithea for proper "
3865 "fulltext search capabilities."
3865 "fulltext search capabilities."
3866 msgstr ""
3866 msgstr ""
3867
3867
@@ -3915,7 +3915,7 b' msgstr "\xd0\x97\xd0\xb0\xd0\xbf\xd1\x80\xd0\xb0\xd1\x88\xd0\xb8\xd0\xb2\xd0\xb0\xd1\x82\xd1\x8c SSL \xd0\xb4\xd0\xbb\xd1\x8f \xd0\xbe\xd0\xbf\xd0\xb5\xd1\x80\xd0\xb0\xd1\x86\xd0\xb8\xd0\xb9 \xd1\x81 VCS"'
3915
3915
3916 #: kallithea/templates/admin/settings/settings_vcs.html:13
3916 #: kallithea/templates/admin/settings/settings_vcs.html:13
3917 msgid ""
3917 msgid ""
3918 "Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
3918 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
3919 "certificate is missing it will return a HTTP Error 406: Not Acceptable."
3919 "certificate is missing it will return a HTTP Error 406: Not Acceptable."
3920 msgstr ""
3920 msgstr ""
3921
3921
@@ -3959,9 +3959,9 b' msgstr "\xd0\xa0\xd0\xb0\xd1\x81\xd0\xbf\xd0\xbe\xd0\xbb\xd0\xbe\xd0\xb6\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5 \xd1\x80\xd0\xb5\xd0\xbf\xd0\xbe\xd0\xb7\xd0\xb8\xd1\x82\xd0\xb0\xd1\x80\xd0\xb8\xd0\xb5\xd0\xb2"'
3959
3959
3960 #: kallithea/templates/admin/settings/settings_vcs.html:69
3960 #: kallithea/templates/admin/settings/settings_vcs.html:69
3961 msgid ""
3961 msgid ""
3962 "Click to unlock. You must restart RhodeCode in order to make this setting "
3962 "Click to unlock. You must restart Kallithea in order to make this setting "
3963 "take effect."
3963 "take effect."
3964 msgstr "Нажмите для разблокирования. Изменения вступят в силу после перезагрузки RhodeCode."
3964 msgstr "Нажмите для разблокирования. Изменения вступят в силу после перезагрузки Kallithea."
3965
3965
3966 #: kallithea/templates/admin/settings/settings_vcs.html:72
3966 #: kallithea/templates/admin/settings/settings_vcs.html:72
3967 msgid ""
3967 msgid ""
@@ -3982,34 +3982,34 b' msgid "Allows storing additional customi'
3982 msgstr "Позволяет хранить дополнительные поля в репозиториях"
3982 msgstr "Позволяет хранить дополнительные поля в репозиториях"
3983
3983
3984 #: kallithea/templates/admin/settings/settings_visual.html:18
3984 #: kallithea/templates/admin/settings/settings_visual.html:18
3985 msgid "Show RhodeCode version"
3985 msgid "Show Kallithea version"
3986 msgstr "Отображать версию RhodeCode"
3986 msgstr "Отображать версию Kallithea"
3987
3987
3988 #: kallithea/templates/admin/settings/settings_visual.html:20
3988 #: kallithea/templates/admin/settings/settings_visual.html:20
3989 msgid "Shows or hides a version number of RhodeCode displayed in the footer."
3989 msgid "Shows or hides a version number of Kallithea displayed in the footer."
3990 msgstr ""
3990 msgstr ""
3991
3991
3992 #: kallithea/templates/admin/settings/settings_visual.html:24
3992 #: kallithea/templates/admin/settings/settings_visual.html:24
3993 msgid "Use Gravatars in RhodeCode"
3993 msgid "Use Gravatars in Kallithea"
3994 msgstr ""
3994 msgstr ""
3995
3995
3996 #: kallithea/templates/admin/settings/settings_visual.html:30
3996 #: kallithea/templates/admin/settings/settings_visual.html:30
3997 msgid ""
3997 msgid ""
3998 "Gravatar url allows you to use other avatar server application.\n"
3998 "Gravatar url allows you to use other avatar server application.\n"
3999 " Following variables of the URL will be replaced accordingly.\n"
3999 " Following variables of the URL will be replaced accordingly.\n"
4000 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
4000 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
4001 " {email} user email,\n"
4001 " {email} user email,\n"
4002 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
4002 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
4003 " {size} size of the image that is expected from the server application,\n"
4003 " {size} size of the image that is expected from the server application,\n"
4004 " {netloc} network location/server host of running RhodeCode server"
4004 " {netloc} network location/server host of running Kallithea server"
4005 msgstr ""
4005 msgstr ""
4006
4006
4007 #: kallithea/templates/admin/settings/settings_visual.html:42
4007 #: kallithea/templates/admin/settings/settings_visual.html:42
4008 msgid ""
4008 msgid ""
4009 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
4009 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
4010 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
4010 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
4011 " {user} current user username,\n"
4011 " {user} current user username,\n"
4012 " {netloc} network location/server host of running RhodeCode server,\n"
4012 " {netloc} network location/server host of running Kallithea server,\n"
4013 " {repo} full repository name,\n"
4013 " {repo} full repository name,\n"
4014 " {repoid} ID of repository, can be used to contruct clone-by-id"
4014 " {repoid} ID of repository, can be used to contruct clone-by-id"
4015 msgstr ""
4015 msgstr ""
@@ -4725,8 +4725,8 b' msgid "Refs"'
4725 msgstr "Ссылки"
4725 msgstr "Ссылки"
4726
4726
4727 #: kallithea/templates/changelog/changelog_summary_data.html:86
4727 #: kallithea/templates/changelog/changelog_summary_data.html:86
4728 msgid "Add or upload files directly via RhodeCode"
4728 msgid "Add or upload files directly via Kallithea"
4729 msgstr "Добавить или загрузить файлы через RhodeCode"
4729 msgstr "Добавить или загрузить файлы через Kallithea"
4730
4730
4731 #: kallithea/templates/changelog/changelog_summary_data.html:89
4731 #: kallithea/templates/changelog/changelog_summary_data.html:89
4732 #: kallithea/templates/files/files_ypjax.html:9
4732 #: kallithea/templates/files/files_ypjax.html:9
@@ -4875,8 +4875,8 b' msgstr "\xd0\x9f\xd0\xb0\xd1\x80\xd1\x81\xd0\xb8\xd0\xbd\xd0\xb3 \xd0\xba\xd0\xbe\xd0\xbc\xd0\xbc\xd0\xb5\xd0\xbd\xd1\x82\xd0\xb0\xd1\x80\xd0\xb8\xd0\xb5\xd0\xb2 \xd0\xb2\xd1\x8b\xd0\xbf\xd0\xbe\xd0\xbb\xd0\xbd\xd0\xb5\xd0\xbd \xd1\x81 \xd0\xb8\xd1\x81\xd0\xbf\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xb7\xd0\xbe\xd0\xb2\xd0\xb0\xd0\xbd\xd0\xb8\xd0\xb5\xd0\xbc \xd1\x81\xd0\xb8\xd0\xbd\xd1\x82\xd0\xb0\xd0\xba\xd1\x81\xd0\xb8\xd1\x81\xd0\xb0 %s \xd1\x81 \xd0\xbf\xd0\xbe\xd0\xb4\xd0\xb4\xd0\xb5\xd1\x80\xd0\xb6\xd0\xba\xd0\xbe\xd0\xb9 %s."'
4875 #: kallithea/templates/changeset/changeset_file_comment.html:69
4875 #: kallithea/templates/changeset/changeset_file_comment.html:69
4876 #: kallithea/templates/changeset/changeset_file_comment.html:155
4876 #: kallithea/templates/changeset/changeset_file_comment.html:155
4877 msgid ""
4877 msgid ""
4878 "Use @username inside this text to send notification to this RhodeCode user"
4878 "Use @username inside this text to send notification to this Kallithea user"
4879 msgstr "Используйте @имя_пользователя в тексте, чтобы отправить оповещение указанному пользователю RhodeCode"
4879 msgstr "Используйте @имя_пользователя в тексте, чтобы отправить оповещение указанному пользователю Kallithea"
4880
4880
4881 #: kallithea/templates/changeset/changeset_file_comment.html:73
4881 #: kallithea/templates/changeset/changeset_file_comment.html:73
4882 #: kallithea/templates/changeset/changeset_file_comment.html:166
4882 #: kallithea/templates/changeset/changeset_file_comment.html:166
@@ -5041,8 +5041,8 b' msgid "The changeset status was changed '
5041 msgstr "Состояние набора изменений изменено на"
5041 msgstr "Состояние набора изменений изменено на"
5042
5042
5043 #: kallithea/templates/email_templates/main.html:8
5043 #: kallithea/templates/email_templates/main.html:8
5044 msgid "This is a notification from RhodeCode."
5044 msgid "This is a notification from Kallithea."
5045 msgstr "Это уведомление от RhodeCode"
5045 msgstr "Это уведомление от Kallithea"
5046
5046
5047 #: kallithea/templates/email_templates/password_reset.html:4
5047 #: kallithea/templates/email_templates/password_reset.html:4
5048 #, python-format
5048 #, python-format
@@ -1,18 +1,18 b''
1 # Translations template for RhodeCode.
1 # Translations template for Kallithea.
2 # Copyright (C) 2014 RhodeCode GmbH, and others.
2 # Copyright (C) 2014 RhodeCode GmbH, and others.
3 # This file is distributed under the same license as the RhodeCode project.
3 # This file is distributed under the same license as the Kallithea project.
4 # Translators:
4 # Translators:
5 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
5 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
6 # mikespook <mikespook@gmail.com>, 2012
6 # mikespook <mikespook@gmail.com>, 2012
7 # xpol <xpolife@gmail.com>, 2012
7 # xpol <xpolife@gmail.com>, 2012
8 msgid ""
8 msgid ""
9 msgstr ""
9 msgstr ""
10 "Project-Id-Version: RhodeCode\n"
10 "Project-Id-Version: Kallithea\n"
11 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
11 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
12 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
12 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
13 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
13 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
14 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
14 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
15 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/RhodeCode/language/zh_CN/)\n"
15 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/Kallithea/language/zh_CN/)\n"
16 "MIME-Version: 1.0\n"
16 "MIME-Version: 1.0\n"
17 "Content-Type: text/plain; charset=UTF-8\n"
17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n"
18 "Content-Transfer-Encoding: 8bit\n"
@@ -140,7 +140,7 b' msgstr ""'
140
140
141 #: kallithea/controllers/files.py:322
141 #: kallithea/controllers/files.py:322
142 #, python-format
142 #, python-format
143 msgid "Deleted file %s via RhodeCode"
143 msgid "Deleted file %s via Kallithea"
144 msgstr ""
144 msgstr ""
145
145
146 #: kallithea/controllers/files.py:344
146 #: kallithea/controllers/files.py:344
@@ -159,7 +159,7 b' msgstr ""'
159
159
160 #: kallithea/controllers/files.py:385
160 #: kallithea/controllers/files.py:385
161 #, python-format
161 #, python-format
162 msgid "Edited file %s via RhodeCode"
162 msgid "Edited file %s via Kallithea"
163 msgstr ""
163 msgstr ""
164
164
165 #: kallithea/controllers/files.py:401
165 #: kallithea/controllers/files.py:401
@@ -172,7 +172,7 b' msgid "Successfully committed to %s"'
172 msgstr "成功提交到%s"
172 msgstr "成功提交到%s"
173
173
174 #: kallithea/controllers/files.py:438
174 #: kallithea/controllers/files.py:438
175 msgid "Added file via RhodeCode"
175 msgid "Added file via Kallithea"
176 msgstr ""
176 msgstr ""
177
177
178 #: kallithea/controllers/files.py:459
178 #: kallithea/controllers/files.py:459
@@ -277,7 +277,7 b' msgid "bad captcha"'
277 msgstr ""
277 msgstr ""
278
278
279 #: kallithea/controllers/login.py:191
279 #: kallithea/controllers/login.py:191
280 msgid "You have successfully registered into RhodeCode"
280 msgid "You have successfully registered into Kallithea"
281 msgstr ""
281 msgstr ""
282
282
283 #: kallithea/controllers/login.py:235
283 #: kallithea/controllers/login.py:235
@@ -1104,8 +1104,8 b' msgid "[pushed] into"'
1104 msgstr "[推送]到"
1104 msgstr "[推送]到"
1105
1105
1106 #: kallithea/lib/helpers.py:779
1106 #: kallithea/lib/helpers.py:779
1107 msgid "[committed via RhodeCode] into repository"
1107 msgid "[committed via Kallithea] into repository"
1108 msgstr "[通过RhodeCode提交]到版本库"
1108 msgstr "[通过Kallithea提交]到版本库"
1109
1109
1110 #: kallithea/lib/helpers.py:781
1110 #: kallithea/lib/helpers.py:781
1111 msgid "[pulled from remote] into repository"
1111 msgid "[pulled from remote] into repository"
@@ -1157,7 +1157,7 b' msgstr ""'
1157 msgid ""
1157 msgid ""
1158 "%s repository is not mapped to db perhaps it was created or renamed from the"
1158 "%s repository is not mapped to db perhaps it was created or renamed from the"
1159 " filesystem please run the application again in order to rescan repositories"
1159 " filesystem please run the application again in order to rescan repositories"
1160 msgstr "版本库%s没有映射到数据库,可能是从文件系统创建或者重命名,请重启RhodeCode以重新扫描版本库"
1160 msgstr "版本库%s没有映射到数据库,可能是从文件系统创建或者重命名,请重启Kallithea以重新扫描版本库"
1161
1161
1162 #: kallithea/lib/utils2.py:413
1162 #: kallithea/lib/utils2.py:413
1163 #, python-format
1163 #, python-format
@@ -1315,8 +1315,8 b' msgstr "\xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93\xe7\xbb\x84\xe7\xae\xa1\xe7\x90\x86\xe6\x9d\x83\xe9\x99\x90"'
1315 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1315 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1316 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1316 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1317 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1317 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1318 msgid "RhodeCode Administrator"
1318 msgid "Kallithea Administrator"
1319 msgstr "RhodeCode 管理员"
1319 msgstr "Kallithea 管理员"
1320
1320
1321 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
1321 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
1322 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
1322 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194
@@ -1389,14 +1389,14 b' msgstr "\xe7\xa6\x81\xe7\x94\xa8\xe6\xb3\xa8\xe5\x86\x8c"'
1389 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1389 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1390 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1390 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1391 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1391 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1392 msgid "Register new user with RhodeCode with manual activation"
1392 msgid "Register new user with Kallithea with manual activation"
1393 msgstr "用手动激活注册新用户"
1393 msgstr "用手动激活注册新用户"
1394
1394
1395 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1395 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1396 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1396 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1397 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1397 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1398 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1398 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1399 msgid "Register new user with RhodeCode with auto activation"
1399 msgid "Register new user with Kallithea with auto activation"
1400 msgstr "用自动激活注册新用户"
1400 msgstr "用自动激活注册新用户"
1401
1401
1402 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
1402 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
@@ -1700,7 +1700,7 b' msgstr ""'
1700
1700
1701 #: kallithea/model/notification.py:232
1701 #: kallithea/model/notification.py:232
1702 #, python-format
1702 #, python-format
1703 msgid "%(user)s registered in RhodeCode at %(when)s"
1703 msgid "%(user)s registered in Kallithea at %(when)s"
1704 msgstr ""
1704 msgstr ""
1705
1705
1706 #: kallithea/model/notification.py:233
1706 #: kallithea/model/notification.py:233
@@ -1751,7 +1751,7 b' msgstr ""'
1751
1751
1752 #: kallithea/model/user.py:332
1752 #: kallithea/model/user.py:332
1753 #, python-format
1753 #, python-format
1754 msgid "Your new RhodeCode password:%s"
1754 msgid "Your new Kallithea password:%s"
1755 msgstr ""
1755 msgstr ""
1756
1756
1757 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
1757 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
@@ -2316,7 +2316,7 b' msgstr ""'
2316 #: kallithea/templates/admin/auth/auth_settings.html:36
2316 #: kallithea/templates/admin/auth/auth_settings.html:36
2317 msgid ""
2317 msgid ""
2318 "Comma separated list of plugins. Order of plugins is also order in which "
2318 "Comma separated list of plugins. Order of plugins is also order in which "
2319 "RhodeCode will try to authenticate user"
2319 "Kallithea will try to authenticate user"
2320 msgstr ""
2320 msgstr ""
2321
2321
2322 #: kallithea/templates/admin/auth/auth_settings.html:37
2322 #: kallithea/templates/admin/auth/auth_settings.html:37
@@ -2924,7 +2924,7 b' msgstr "\xe5\x8c\xbf\xe5\x90\x8d\xe8\xae\xbf\xe9\x97\xae"'
2924 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2924 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2925 #, python-format
2925 #, python-format
2926 msgid ""
2926 msgid ""
2927 "Allow access to RhodeCode without need to log in. Anonymous users use %s "
2927 "Allow access to Kallithea without need to log in. Anonymous users use %s "
2928 "user permissions"
2928 "user permissions"
2929 msgstr ""
2929 msgstr ""
2930
2930
@@ -3292,7 +3292,7 b' msgstr ""'
3292 #: kallithea/templates/admin/repos/repo_creating.html:42
3292 #: kallithea/templates/admin/repos/repo_creating.html:42
3293 msgid ""
3293 msgid ""
3294 "We're sorry but error occured during this operation. Please check your "
3294 "We're sorry but error occured during this operation. Please check your "
3295 "RhodeCode server logs, or contact administrator."
3295 "Kallithea server logs, or contact administrator."
3296 msgstr ""
3296 msgstr ""
3297
3297
3298 #: kallithea/templates/admin/repos/repo_edit.html:8
3298 #: kallithea/templates/admin/repos/repo_edit.html:8
@@ -3410,7 +3410,7 b' msgstr ""'
3410 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3410 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3411 msgid ""
3411 msgid ""
3412 "This repository will be renamed in a special way in order to be unaccesible "
3412 "This repository will be renamed in a special way in order to be unaccesible "
3413 "for RhodeCode and VCS systems. If you need to fully delete it from file "
3413 "for Kallithea and VCS systems. If you need to fully delete it from file "
3414 "system please do it manually"
3414 "system please do it manually"
3415 msgstr ""
3415 msgstr ""
3416
3416
@@ -3623,7 +3623,7 b' msgid "Email prefix"'
3623 msgstr ""
3623 msgstr ""
3624
3624
3625 #: kallithea/templates/admin/settings/settings_email.html:5
3625 #: kallithea/templates/admin/settings/settings_email.html:5
3626 msgid "RhodeCode email from"
3626 msgid "Kallithea email from"
3627 msgstr ""
3627 msgstr ""
3628
3628
3629 #: kallithea/templates/admin/settings/settings_email.html:6
3629 #: kallithea/templates/admin/settings/settings_email.html:6
@@ -3675,7 +3675,7 b' msgid "Site branding"'
3675 msgstr ""
3675 msgstr ""
3676
3676
3677 #: kallithea/templates/admin/settings/settings_global.html:12
3677 #: kallithea/templates/admin/settings/settings_global.html:12
3678 msgid "Set a custom title for your RhodeCode Service."
3678 msgid "Set a custom title for your Kallithea Service."
3679 msgstr ""
3679 msgstr ""
3680
3680
3681 #: kallithea/templates/admin/settings/settings_global.html:18
3681 #: kallithea/templates/admin/settings/settings_global.html:18
@@ -3735,7 +3735,7 b' msgstr ""'
3735
3735
3736 #: kallithea/templates/admin/settings/settings_license.html:9
3736 #: kallithea/templates/admin/settings/settings_license.html:9
3737 #: kallithea/templates/admin/settings/settings_system.html:4
3737 #: kallithea/templates/admin/settings/settings_system.html:4
3738 msgid "RhodeCode version"
3738 msgid "Kallithea version"
3739 msgstr ""
3739 msgstr ""
3740
3740
3741 #: kallithea/templates/admin/settings/settings_license.html:10
3741 #: kallithea/templates/admin/settings/settings_license.html:10
@@ -3771,7 +3771,7 b' msgid "License key"'
3771 msgstr ""
3771 msgstr ""
3772
3772
3773 #: kallithea/templates/admin/settings/settings_license.html:37
3773 #: kallithea/templates/admin/settings/settings_license.html:37
3774 msgid "Paste your RhodeCode license key into that textarea."
3774 msgid "Paste your Kallithea license key into that textarea."
3775 msgstr ""
3775 msgstr ""
3776
3776
3777 #: kallithea/templates/admin/settings/settings_license.html:52
3777 #: kallithea/templates/admin/settings/settings_license.html:52
@@ -3810,7 +3810,7 b' msgstr ""'
3810
3810
3811 #: kallithea/templates/admin/settings/settings_mapping.html:25
3811 #: kallithea/templates/admin/settings/settings_mapping.html:25
3812 msgid ""
3812 msgid ""
3813 "Verify if RhodeCodes GIT hooks are installed for each repository. Current "
3813 "Verify if Kallitheas GIT hooks are installed for each repository. Current "
3814 "hooks will be updated to latest version"
3814 "hooks will be updated to latest version"
3815 msgstr ""
3815 msgstr ""
3816
3816
@@ -3828,7 +3828,7 b' msgstr ""'
3828
3828
3829 #: kallithea/templates/admin/settings/settings_search.html:15
3829 #: kallithea/templates/admin/settings/settings_search.html:15
3830 msgid ""
3830 msgid ""
3831 "This option completely reindex all the files within RhodeCode for proper "
3831 "This option completely reindex all the files within Kallithea for proper "
3832 "fulltext search capabilities."
3832 "fulltext search capabilities."
3833 msgstr ""
3833 msgstr ""
3834
3834
@@ -3882,7 +3882,7 b' msgstr ""'
3882
3882
3883 #: kallithea/templates/admin/settings/settings_vcs.html:13
3883 #: kallithea/templates/admin/settings/settings_vcs.html:13
3884 msgid ""
3884 msgid ""
3885 "Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
3885 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
3886 "certificate is missing it will return a HTTP Error 406: Not Acceptable."
3886 "certificate is missing it will return a HTTP Error 406: Not Acceptable."
3887 msgstr ""
3887 msgstr ""
3888
3888
@@ -3926,7 +3926,7 b' msgstr "\xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93\xe8\xb7\xaf\xe5\xbe\x84"'
3926
3926
3927 #: kallithea/templates/admin/settings/settings_vcs.html:69
3927 #: kallithea/templates/admin/settings/settings_vcs.html:69
3928 msgid ""
3928 msgid ""
3929 "Click to unlock. You must restart RhodeCode in order to make this setting "
3929 "Click to unlock. You must restart Kallithea in order to make this setting "
3930 "take effect."
3930 "take effect."
3931 msgstr ""
3931 msgstr ""
3932
3932
@@ -3949,34 +3949,34 b' msgid "Allows storing additional customi'
3949 msgstr ""
3949 msgstr ""
3950
3950
3951 #: kallithea/templates/admin/settings/settings_visual.html:18
3951 #: kallithea/templates/admin/settings/settings_visual.html:18
3952 msgid "Show RhodeCode version"
3952 msgid "Show Kallithea version"
3953 msgstr ""
3953 msgstr ""
3954
3954
3955 #: kallithea/templates/admin/settings/settings_visual.html:20
3955 #: kallithea/templates/admin/settings/settings_visual.html:20
3956 msgid "Shows or hides a version number of RhodeCode displayed in the footer."
3956 msgid "Shows or hides a version number of Kallithea displayed in the footer."
3957 msgstr ""
3957 msgstr ""
3958
3958
3959 #: kallithea/templates/admin/settings/settings_visual.html:24
3959 #: kallithea/templates/admin/settings/settings_visual.html:24
3960 msgid "Use Gravatars in RhodeCode"
3960 msgid "Use Gravatars in Kallithea"
3961 msgstr ""
3961 msgstr ""
3962
3962
3963 #: kallithea/templates/admin/settings/settings_visual.html:30
3963 #: kallithea/templates/admin/settings/settings_visual.html:30
3964 msgid ""
3964 msgid ""
3965 "Gravatar url allows you to use other avatar server application.\n"
3965 "Gravatar url allows you to use other avatar server application.\n"
3966 " Following variables of the URL will be replaced accordingly.\n"
3966 " Following variables of the URL will be replaced accordingly.\n"
3967 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
3967 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
3968 " {email} user email,\n"
3968 " {email} user email,\n"
3969 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
3969 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
3970 " {size} size of the image that is expected from the server application,\n"
3970 " {size} size of the image that is expected from the server application,\n"
3971 " {netloc} network location/server host of running RhodeCode server"
3971 " {netloc} network location/server host of running Kallithea server"
3972 msgstr ""
3972 msgstr ""
3973
3973
3974 #: kallithea/templates/admin/settings/settings_visual.html:42
3974 #: kallithea/templates/admin/settings/settings_visual.html:42
3975 msgid ""
3975 msgid ""
3976 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
3976 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
3977 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
3977 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
3978 " {user} current user username,\n"
3978 " {user} current user username,\n"
3979 " {netloc} network location/server host of running RhodeCode server,\n"
3979 " {netloc} network location/server host of running Kallithea server,\n"
3980 " {repo} full repository name,\n"
3980 " {repo} full repository name,\n"
3981 " {repoid} ID of repository, can be used to contruct clone-by-id"
3981 " {repoid} ID of repository, can be used to contruct clone-by-id"
3982 msgstr ""
3982 msgstr ""
@@ -4690,8 +4690,8 b' msgid "Refs"'
4690 msgstr ""
4690 msgstr ""
4691
4691
4692 #: kallithea/templates/changelog/changelog_summary_data.html:86
4692 #: kallithea/templates/changelog/changelog_summary_data.html:86
4693 msgid "Add or upload files directly via RhodeCode"
4693 msgid "Add or upload files directly via Kallithea"
4694 msgstr "通过RhodeCode直接添加或者上传文件"
4694 msgstr "通过Kallithea直接添加或者上传文件"
4695
4695
4696 #: kallithea/templates/changelog/changelog_summary_data.html:89
4696 #: kallithea/templates/changelog/changelog_summary_data.html:89
4697 #: kallithea/templates/files/files_ypjax.html:9
4697 #: kallithea/templates/files/files_ypjax.html:9
@@ -4832,8 +4832,8 b' msgstr "\xe8\xaf\x84\xe8\xae\xba\xe4\xbd\xbf\xe7\x94\xa8%s\xe8\xaf\xad\xe6\xb3\x95\xe5\xb9\xb6\xe6\x94\xaf\xe6\x8c\x81%s"'
4832 #: kallithea/templates/changeset/changeset_file_comment.html:69
4832 #: kallithea/templates/changeset/changeset_file_comment.html:69
4833 #: kallithea/templates/changeset/changeset_file_comment.html:155
4833 #: kallithea/templates/changeset/changeset_file_comment.html:155
4834 msgid ""
4834 msgid ""
4835 "Use @username inside this text to send notification to this RhodeCode user"
4835 "Use @username inside this text to send notification to this Kallithea user"
4836 msgstr "在文本中使用 @用户名 以发送通知到该RhodeCode用户"
4836 msgstr "在文本中使用 @用户名 以发送通知到该Kallithea用户"
4837
4837
4838 #: kallithea/templates/changeset/changeset_file_comment.html:73
4838 #: kallithea/templates/changeset/changeset_file_comment.html:73
4839 #: kallithea/templates/changeset/changeset_file_comment.html:166
4839 #: kallithea/templates/changeset/changeset_file_comment.html:166
@@ -4996,8 +4996,8 b' msgid "The changeset status was changed '
4996 msgstr ""
4996 msgstr ""
4997
4997
4998 #: kallithea/templates/email_templates/main.html:8
4998 #: kallithea/templates/email_templates/main.html:8
4999 msgid "This is a notification from RhodeCode."
4999 msgid "This is a notification from Kallithea."
5000 msgstr "这是一个RhodeCode通知。"
5000 msgstr "这是一个Kallithea通知。"
5001
5001
5002 #: kallithea/templates/email_templates/password_reset.html:4
5002 #: kallithea/templates/email_templates/password_reset.html:4
5003 #, python-format
5003 #, python-format
@@ -1,16 +1,16 b''
1 # Translations template for RhodeCode.
1 # Translations template for Kallithea.
2 # Copyright (C) 2014 RhodeCode GmbH, and others.
2 # Copyright (C) 2014 RhodeCode GmbH, and others.
3 # This file is distributed under the same license as the RhodeCode project.
3 # This file is distributed under the same license as the Kallithea project.
4 # Translators:
4 # Translators:
5 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
5 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
6 msgid ""
6 msgid ""
7 msgstr ""
7 msgstr ""
8 "Project-Id-Version: RhodeCode\n"
8 "Project-Id-Version: Kallithea\n"
9 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
9 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
10 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
10 "POT-Creation-Date: 2014-02-13 15:30+0100\n"
11 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
11 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
12 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
12 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
13 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/RhodeCode/language/zh_TW/)\n"
13 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/Kallithea/language/zh_TW/)\n"
14 "MIME-Version: 1.0\n"
14 "MIME-Version: 1.0\n"
15 "Content-Type: text/plain; charset=UTF-8\n"
15 "Content-Type: text/plain; charset=UTF-8\n"
16 "Content-Transfer-Encoding: 8bit\n"
16 "Content-Transfer-Encoding: 8bit\n"
@@ -138,7 +138,7 b' msgstr ""'
138
138
139 #: kallithea/controllers/files.py:322
139 #: kallithea/controllers/files.py:322
140 #, python-format
140 #, python-format
141 msgid "Deleted file %s via RhodeCode"
141 msgid "Deleted file %s via Kallithea"
142 msgstr ""
142 msgstr ""
143
143
144 #: kallithea/controllers/files.py:344
144 #: kallithea/controllers/files.py:344
@@ -157,7 +157,7 b' msgstr ""'
157
157
158 #: kallithea/controllers/files.py:385
158 #: kallithea/controllers/files.py:385
159 #, python-format
159 #, python-format
160 msgid "Edited file %s via RhodeCode"
160 msgid "Edited file %s via Kallithea"
161 msgstr ""
161 msgstr ""
162
162
163 #: kallithea/controllers/files.py:401
163 #: kallithea/controllers/files.py:401
@@ -170,7 +170,7 b' msgid "Successfully committed to %s"'
170 msgstr "成功遞交至 %s"
170 msgstr "成功遞交至 %s"
171
171
172 #: kallithea/controllers/files.py:438
172 #: kallithea/controllers/files.py:438
173 msgid "Added file via RhodeCode"
173 msgid "Added file via Kallithea"
174 msgstr ""
174 msgstr ""
175
175
176 #: kallithea/controllers/files.py:459
176 #: kallithea/controllers/files.py:459
@@ -275,7 +275,7 b' msgid "bad captcha"'
275 msgstr ""
275 msgstr ""
276
276
277 #: kallithea/controllers/login.py:191
277 #: kallithea/controllers/login.py:191
278 msgid "You have successfully registered into RhodeCode"
278 msgid "You have successfully registered into Kallithea"
279 msgstr ""
279 msgstr ""
280
280
281 #: kallithea/controllers/login.py:235
281 #: kallithea/controllers/login.py:235
@@ -1102,7 +1102,7 b' msgid "[pushed] into"'
1102 msgstr ""
1102 msgstr ""
1103
1103
1104 #: kallithea/lib/helpers.py:779
1104 #: kallithea/lib/helpers.py:779
1105 msgid "[committed via RhodeCode] into repository"
1105 msgid "[committed via Kallithea] into repository"
1106 msgstr ""
1106 msgstr ""
1107
1107
1108 #: kallithea/lib/helpers.py:781
1108 #: kallithea/lib/helpers.py:781
@@ -1313,7 +1313,7 b' msgstr ""'
1313 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1313 #: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570
1314 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1314 #: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620
1315 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1315 #: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1657
1316 msgid "RhodeCode Administrator"
1316 msgid "Kallithea Administrator"
1317 msgstr ""
1317 msgstr ""
1318
1318
1319 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
1319 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175
@@ -1387,14 +1387,14 b' msgstr ""'
1387 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1387 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1199
1388 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1388 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319
1389 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1389 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404
1390 msgid "Register new user with RhodeCode with manual activation"
1390 msgid "Register new user with Kallithea with manual activation"
1391 msgstr ""
1391 msgstr ""
1392
1392
1393 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1393 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1183
1394 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1394 #: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1202
1395 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1395 #: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322
1396 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1396 #: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407
1397 msgid "Register new user with RhodeCode with auto activation"
1397 msgid "Register new user with Kallithea with auto activation"
1398 msgstr ""
1398 msgstr ""
1399
1399
1400 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
1400 #: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624
@@ -1698,7 +1698,7 b' msgstr ""'
1698
1698
1699 #: kallithea/model/notification.py:232
1699 #: kallithea/model/notification.py:232
1700 #, python-format
1700 #, python-format
1701 msgid "%(user)s registered in RhodeCode at %(when)s"
1701 msgid "%(user)s registered in Kallithea at %(when)s"
1702 msgstr ""
1702 msgstr ""
1703
1703
1704 #: kallithea/model/notification.py:233
1704 #: kallithea/model/notification.py:233
@@ -1749,7 +1749,7 b' msgstr ""'
1749
1749
1750 #: kallithea/model/user.py:332
1750 #: kallithea/model/user.py:332
1751 #, python-format
1751 #, python-format
1752 msgid "Your new RhodeCode password:%s"
1752 msgid "Your new Kallithea password:%s"
1753 msgstr ""
1753 msgstr ""
1754
1754
1755 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
1755 #: kallithea/model/validators.py:82 kallithea/model/validators.py:83
@@ -2314,7 +2314,7 b' msgstr ""'
2314 #: kallithea/templates/admin/auth/auth_settings.html:36
2314 #: kallithea/templates/admin/auth/auth_settings.html:36
2315 msgid ""
2315 msgid ""
2316 "Comma separated list of plugins. Order of plugins is also order in which "
2316 "Comma separated list of plugins. Order of plugins is also order in which "
2317 "RhodeCode will try to authenticate user"
2317 "Kallithea will try to authenticate user"
2318 msgstr ""
2318 msgstr ""
2319
2319
2320 #: kallithea/templates/admin/auth/auth_settings.html:37
2320 #: kallithea/templates/admin/auth/auth_settings.html:37
@@ -2922,7 +2922,7 b' msgstr "\xe8\xa8\xaa\xe5\xae\xa2\xe6\xac\x8a\xe9\x99\x90"'
2922 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2922 #: kallithea/templates/admin/permissions/permissions_globals.html:13
2923 #, python-format
2923 #, python-format
2924 msgid ""
2924 msgid ""
2925 "Allow access to RhodeCode without need to log in. Anonymous users use %s "
2925 "Allow access to Kallithea without need to log in. Anonymous users use %s "
2926 "user permissions"
2926 "user permissions"
2927 msgstr ""
2927 msgstr ""
2928
2928
@@ -3290,7 +3290,7 b' msgstr ""'
3290 #: kallithea/templates/admin/repos/repo_creating.html:42
3290 #: kallithea/templates/admin/repos/repo_creating.html:42
3291 msgid ""
3291 msgid ""
3292 "We're sorry but error occured during this operation. Please check your "
3292 "We're sorry but error occured during this operation. Please check your "
3293 "RhodeCode server logs, or contact administrator."
3293 "Kallithea server logs, or contact administrator."
3294 msgstr ""
3294 msgstr ""
3295
3295
3296 #: kallithea/templates/admin/repos/repo_edit.html:8
3296 #: kallithea/templates/admin/repos/repo_edit.html:8
@@ -3408,7 +3408,7 b' msgstr ""'
3408 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3408 #: kallithea/templates/admin/repos/repo_edit_advanced.html:94
3409 msgid ""
3409 msgid ""
3410 "This repository will be renamed in a special way in order to be unaccesible "
3410 "This repository will be renamed in a special way in order to be unaccesible "
3411 "for RhodeCode and VCS systems. If you need to fully delete it from file "
3411 "for Kallithea and VCS systems. If you need to fully delete it from file "
3412 "system please do it manually"
3412 "system please do it manually"
3413 msgstr ""
3413 msgstr ""
3414
3414
@@ -3621,7 +3621,7 b' msgid "Email prefix"'
3621 msgstr ""
3621 msgstr ""
3622
3622
3623 #: kallithea/templates/admin/settings/settings_email.html:5
3623 #: kallithea/templates/admin/settings/settings_email.html:5
3624 msgid "RhodeCode email from"
3624 msgid "Kallithea email from"
3625 msgstr ""
3625 msgstr ""
3626
3626
3627 #: kallithea/templates/admin/settings/settings_email.html:6
3627 #: kallithea/templates/admin/settings/settings_email.html:6
@@ -3673,7 +3673,7 b' msgid "Site branding"'
3673 msgstr ""
3673 msgstr ""
3674
3674
3675 #: kallithea/templates/admin/settings/settings_global.html:12
3675 #: kallithea/templates/admin/settings/settings_global.html:12
3676 msgid "Set a custom title for your RhodeCode Service."
3676 msgid "Set a custom title for your Kallithea Service."
3677 msgstr ""
3677 msgstr ""
3678
3678
3679 #: kallithea/templates/admin/settings/settings_global.html:18
3679 #: kallithea/templates/admin/settings/settings_global.html:18
@@ -3733,7 +3733,7 b' msgstr ""'
3733
3733
3734 #: kallithea/templates/admin/settings/settings_license.html:9
3734 #: kallithea/templates/admin/settings/settings_license.html:9
3735 #: kallithea/templates/admin/settings/settings_system.html:4
3735 #: kallithea/templates/admin/settings/settings_system.html:4
3736 msgid "RhodeCode version"
3736 msgid "Kallithea version"
3737 msgstr ""
3737 msgstr ""
3738
3738
3739 #: kallithea/templates/admin/settings/settings_license.html:10
3739 #: kallithea/templates/admin/settings/settings_license.html:10
@@ -3769,7 +3769,7 b' msgid "License key"'
3769 msgstr ""
3769 msgstr ""
3770
3770
3771 #: kallithea/templates/admin/settings/settings_license.html:37
3771 #: kallithea/templates/admin/settings/settings_license.html:37
3772 msgid "Paste your RhodeCode license key into that textarea."
3772 msgid "Paste your Kallithea license key into that textarea."
3773 msgstr ""
3773 msgstr ""
3774
3774
3775 #: kallithea/templates/admin/settings/settings_license.html:52
3775 #: kallithea/templates/admin/settings/settings_license.html:52
@@ -3808,7 +3808,7 b' msgstr ""'
3808
3808
3809 #: kallithea/templates/admin/settings/settings_mapping.html:25
3809 #: kallithea/templates/admin/settings/settings_mapping.html:25
3810 msgid ""
3810 msgid ""
3811 "Verify if RhodeCodes GIT hooks are installed for each repository. Current "
3811 "Verify if Kallitheas GIT hooks are installed for each repository. Current "
3812 "hooks will be updated to latest version"
3812 "hooks will be updated to latest version"
3813 msgstr ""
3813 msgstr ""
3814
3814
@@ -3826,7 +3826,7 b' msgstr ""'
3826
3826
3827 #: kallithea/templates/admin/settings/settings_search.html:15
3827 #: kallithea/templates/admin/settings/settings_search.html:15
3828 msgid ""
3828 msgid ""
3829 "This option completely reindex all the files within RhodeCode for proper "
3829 "This option completely reindex all the files within Kallithea for proper "
3830 "fulltext search capabilities."
3830 "fulltext search capabilities."
3831 msgstr ""
3831 msgstr ""
3832
3832
@@ -3880,7 +3880,7 b' msgstr ""'
3880
3880
3881 #: kallithea/templates/admin/settings/settings_vcs.html:13
3881 #: kallithea/templates/admin/settings/settings_vcs.html:13
3882 msgid ""
3882 msgid ""
3883 "Activate to set RhodeCode to require SSL for pushing or pulling. If SSL "
3883 "Activate to set Kallithea to require SSL for pushing or pulling. If SSL "
3884 "certificate is missing it will return a HTTP Error 406: Not Acceptable."
3884 "certificate is missing it will return a HTTP Error 406: Not Acceptable."
3885 msgstr ""
3885 msgstr ""
3886
3886
@@ -3924,7 +3924,7 b' msgstr "\xe7\x89\x88\xe6\x9c\xac\xe5\xba\xab\xe8\xb7\xaf\xe5\xbe\x91"'
3924
3924
3925 #: kallithea/templates/admin/settings/settings_vcs.html:69
3925 #: kallithea/templates/admin/settings/settings_vcs.html:69
3926 msgid ""
3926 msgid ""
3927 "Click to unlock. You must restart RhodeCode in order to make this setting "
3927 "Click to unlock. You must restart Kallithea in order to make this setting "
3928 "take effect."
3928 "take effect."
3929 msgstr ""
3929 msgstr ""
3930
3930
@@ -3947,34 +3947,34 b' msgid "Allows storing additional customi'
3947 msgstr ""
3947 msgstr ""
3948
3948
3949 #: kallithea/templates/admin/settings/settings_visual.html:18
3949 #: kallithea/templates/admin/settings/settings_visual.html:18
3950 msgid "Show RhodeCode version"
3950 msgid "Show Kallithea version"
3951 msgstr ""
3951 msgstr ""
3952
3952
3953 #: kallithea/templates/admin/settings/settings_visual.html:20
3953 #: kallithea/templates/admin/settings/settings_visual.html:20
3954 msgid "Shows or hides a version number of RhodeCode displayed in the footer."
3954 msgid "Shows or hides a version number of Kallithea displayed in the footer."
3955 msgstr ""
3955 msgstr ""
3956
3956
3957 #: kallithea/templates/admin/settings/settings_visual.html:24
3957 #: kallithea/templates/admin/settings/settings_visual.html:24
3958 msgid "Use Gravatars in RhodeCode"
3958 msgid "Use Gravatars in Kallithea"
3959 msgstr ""
3959 msgstr ""
3960
3960
3961 #: kallithea/templates/admin/settings/settings_visual.html:30
3961 #: kallithea/templates/admin/settings/settings_visual.html:30
3962 msgid ""
3962 msgid ""
3963 "Gravatar url allows you to use other avatar server application.\n"
3963 "Gravatar url allows you to use other avatar server application.\n"
3964 " Following variables of the URL will be replaced accordingly.\n"
3964 " Following variables of the URL will be replaced accordingly.\n"
3965 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
3965 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
3966 " {email} user email,\n"
3966 " {email} user email,\n"
3967 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
3967 " {md5email} md5 hash of the user email (like at gravatar.com),\n"
3968 " {size} size of the image that is expected from the server application,\n"
3968 " {size} size of the image that is expected from the server application,\n"
3969 " {netloc} network location/server host of running RhodeCode server"
3969 " {netloc} network location/server host of running Kallithea server"
3970 msgstr ""
3970 msgstr ""
3971
3971
3972 #: kallithea/templates/admin/settings/settings_visual.html:42
3972 #: kallithea/templates/admin/settings/settings_visual.html:42
3973 msgid ""
3973 msgid ""
3974 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
3974 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
3975 " {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
3975 " {scheme} 'http' or 'https' sent from running Kallithea server,\n"
3976 " {user} current user username,\n"
3976 " {user} current user username,\n"
3977 " {netloc} network location/server host of running RhodeCode server,\n"
3977 " {netloc} network location/server host of running Kallithea server,\n"
3978 " {repo} full repository name,\n"
3978 " {repo} full repository name,\n"
3979 " {repoid} ID of repository, can be used to contruct clone-by-id"
3979 " {repoid} ID of repository, can be used to contruct clone-by-id"
3980 msgstr ""
3980 msgstr ""
@@ -4688,7 +4688,7 b' msgid "Refs"'
4688 msgstr ""
4688 msgstr ""
4689
4689
4690 #: kallithea/templates/changelog/changelog_summary_data.html:86
4690 #: kallithea/templates/changelog/changelog_summary_data.html:86
4691 msgid "Add or upload files directly via RhodeCode"
4691 msgid "Add or upload files directly via Kallithea"
4692 msgstr ""
4692 msgstr ""
4693
4693
4694 #: kallithea/templates/changelog/changelog_summary_data.html:89
4694 #: kallithea/templates/changelog/changelog_summary_data.html:89
@@ -4830,7 +4830,7 b' msgstr ""'
4830 #: kallithea/templates/changeset/changeset_file_comment.html:69
4830 #: kallithea/templates/changeset/changeset_file_comment.html:69
4831 #: kallithea/templates/changeset/changeset_file_comment.html:155
4831 #: kallithea/templates/changeset/changeset_file_comment.html:155
4832 msgid ""
4832 msgid ""
4833 "Use @username inside this text to send notification to this RhodeCode user"
4833 "Use @username inside this text to send notification to this Kallithea user"
4834 msgstr ""
4834 msgstr ""
4835
4835
4836 #: kallithea/templates/changeset/changeset_file_comment.html:73
4836 #: kallithea/templates/changeset/changeset_file_comment.html:73
@@ -4994,7 +4994,7 b' msgid "The changeset status was changed '
4994 msgstr ""
4994 msgstr ""
4995
4995
4996 #: kallithea/templates/email_templates/main.html:8
4996 #: kallithea/templates/email_templates/main.html:8
4997 msgid "This is a notification from RhodeCode."
4997 msgid "This is a notification from Kallithea."
4998 msgstr ""
4998 msgstr ""
4999
4999
5000 #: kallithea/templates/email_templates/password_reset.html:4
5000 #: kallithea/templates/email_templates/password_reset.html:4
@@ -15,7 +15,7 b''
15 kallithea.lib
15 kallithea.lib
16 ~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~
17
17
18 RhodeCode libs
18 Kallithea libs
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -47,7 +47,7 b' def get_current_revision(quiet=False):'
47 return (cur_rev.revision, cur_rev.short_id)
47 return (cur_rev.revision, cur_rev.short_id)
48 except Exception, err:
48 except Exception, err:
49 if not quiet:
49 if not quiet:
50 print ("WARNING: Cannot retrieve rhodecode's revision. "
50 print ("WARNING: Cannot retrieve kallithea's revision. "
51 "disregard this if you don't know what that means. "
51 "disregard this if you don't know what that means. "
52 "Original error was: %s" % err)
52 "Original error was: %s" % err)
53 return None
53 return None
@@ -15,7 +15,7 b''
15 kallithea.lib.annotate
15 kallithea.lib.annotate
16 ~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Anontation library for usage in rhodecode, previously part of vcs
18 Anontation library for usage in kallithea, previously part of vcs
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -476,7 +476,7 b' def allowed_api_access(controller_name, '
476
476
477 class AuthUser(object):
477 class AuthUser(object):
478 """
478 """
479 A simple object that handles all attributes of user in RhodeCode
479 A simple object that handles all attributes of user in Kallithea
480
480
481 It does lookup based on API key,given user, or user present in session
481 It does lookup based on API key,given user, or user present in session
482 Then it fills all required information for such user. It also checks if
482 Then it fills all required information for such user. It also checks if
@@ -45,7 +45,7 b' class LazyFormencode(object):'
45 return formencode_obj(*self.args, **self.kwargs)
45 return formencode_obj(*self.args, **self.kwargs)
46
46
47
47
48 class RhodeCodeAuthPluginBase(object):
48 class KallitheaAuthPluginBase(object):
49 auth_func_attrs = {
49 auth_func_attrs = {
50 "username": "unique username",
50 "username": "unique username",
51 "firstname": "first name",
51 "firstname": "first name",
@@ -54,16 +54,16 b' class RhodeCodeAuthPluginBase(object):'
54 "groups": '["list", "of", "groups"]',
54 "groups": '["list", "of", "groups"]',
55 "extern_name": "name in external source of record",
55 "extern_name": "name in external source of record",
56 "extern_type": "type of external source of record",
56 "extern_type": "type of external source of record",
57 "admin": 'True|False defines if user should be RhodeCode super admin',
57 "admin": 'True|False defines if user should be Kallithea super admin',
58 "active": 'True|False defines active state of user internally for RhodeCode',
58 "active": 'True|False defines active state of user internally for Kallithea',
59 "active_from_extern": "True|False\None, active state from the external auth, "
59 "active_from_extern": "True|False\None, active state from the external auth, "
60 "None means use definition from RhodeCode extern_type active value"
60 "None means use definition from Kallithea extern_type active value"
61 }
61 }
62
62
63 @property
63 @property
64 def validators(self):
64 def validators(self):
65 """
65 """
66 Exposes RhodeCode validators modules
66 Exposes Kallithea validators modules
67 """
67 """
68 # this is a hack to overcome issues with pylons threadlocals and
68 # this is a hack to overcome issues with pylons threadlocals and
69 # translator object _() not beein registered properly.
69 # translator object _() not beein registered properly.
@@ -136,7 +136,7 b' class RhodeCodeAuthPluginBase(object):'
136 :param kwargs: extra arguments needed for user fetching.
136 :param kwargs: extra arguments needed for user fetching.
137 """
137 """
138 user = None
138 user = None
139 log.debug('Trying to fetch user `%s` from RhodeCode database'
139 log.debug('Trying to fetch user `%s` from Kallithea database'
140 % (username))
140 % (username))
141 if username:
141 if username:
142 user = User.get_by_username(username)
142 user = User.get_by_username(username)
@@ -175,7 +175,7 b' class RhodeCodeAuthPluginBase(object):'
175
175
176 'validator' is an lazy instantiated form field validator object, ala
176 'validator' is an lazy instantiated form field validator object, ala
177 formencode. You need to *call* this object to init the validators.
177 formencode. You need to *call* this object to init the validators.
178 All calls to RhodeCode validators should be used through self.validators
178 All calls to Kallithea validators should be used through self.validators
179 which is a lazy loading proxy of formencode module.
179 which is a lazy loading proxy of formencode module.
180 """
180 """
181 raise NotImplementedError("Not implemented in base class")
181 raise NotImplementedError("Not implemented in base class")
@@ -216,7 +216,7 b' class RhodeCodeAuthPluginBase(object):'
216
216
217 Return None on failure. On success, return a dictionary of the form:
217 Return None on failure. On success, return a dictionary of the form:
218
218
219 see: RhodeCodeAuthPluginBase.auth_func_attrs
219 see: KallitheaAuthPluginBase.auth_func_attrs
220 This is later validated for correctness
220 This is later validated for correctness
221 """
221 """
222 raise NotImplementedError("not implemented in base class")
222 raise NotImplementedError("not implemented in base class")
@@ -244,7 +244,7 b' class RhodeCodeAuthPluginBase(object):'
244 return ret
244 return ret
245
245
246
246
247 class RhodeCodeExternalAuthPlugin(RhodeCodeAuthPluginBase):
247 class KallitheaExternalAuthPlugin(KallitheaAuthPluginBase):
248 def use_fake_password(self):
248 def use_fake_password(self):
249 """
249 """
250 Return a boolean that indicates whether or not we should set the user's
250 Return a boolean that indicates whether or not we should set the user's
@@ -256,14 +256,14 b' class RhodeCodeExternalAuthPlugin(RhodeC'
256 raise NotImplementedError("Not implemented in base class")
256 raise NotImplementedError("Not implemented in base class")
257
257
258 def _authenticate(self, userobj, username, passwd, settings, **kwargs):
258 def _authenticate(self, userobj, username, passwd, settings, **kwargs):
259 auth = super(RhodeCodeExternalAuthPlugin, self)._authenticate(
259 auth = super(KallitheaExternalAuthPlugin, self)._authenticate(
260 userobj, username, passwd, settings, **kwargs)
260 userobj, username, passwd, settings, **kwargs)
261 if auth:
261 if auth:
262 # maybe plugin will clean the username ?
262 # maybe plugin will clean the username ?
263 # we should use the return value
263 # we should use the return value
264 username = auth['username']
264 username = auth['username']
265 # if user is not active from our extern type we should fail to authe
265 # if user is not active from our extern type we should fail to authe
266 # this can prevent from creating users in RhodeCode when using
266 # this can prevent from creating users in Kallithea when using
267 # external authentication, but if it's inactive user we shouldn't
267 # external authentication, but if it's inactive user we shouldn't
268 # create that user anyway
268 # create that user anyway
269 if auth['active_from_extern'] is False:
269 if auth['active_from_extern'] is False:
@@ -306,15 +306,15 b' def importplugin(plugin):'
306 """
306 """
307 Imports and returns the authentication plugin in the module named by plugin
307 Imports and returns the authentication plugin in the module named by plugin
308 (e.g., plugin='kallithea.lib.auth_modules.auth_internal'). Returns the
308 (e.g., plugin='kallithea.lib.auth_modules.auth_internal'). Returns the
309 RhodeCodeAuthPluginBase subclass on success, raises exceptions on failure.
309 KallitheaAuthPluginBase subclass on success, raises exceptions on failure.
310
310
311 raises:
311 raises:
312 AttributeError -- no RhodeCodeAuthPlugin class in the module
312 AttributeError -- no KallitheaAuthPlugin class in the module
313 TypeError -- if the RhodeCodeAuthPlugin is not a subclass of ours RhodeCodeAuthPluginBase
313 TypeError -- if the KallitheaAuthPlugin is not a subclass of ours KallitheaAuthPluginBase
314 ImportError -- if we couldn't import the plugin at all
314 ImportError -- if we couldn't import the plugin at all
315 """
315 """
316 log.debug("Importing %s" % plugin)
316 log.debug("Importing %s" % plugin)
317 PLUGIN_CLASS_NAME = "RhodeCodeAuthPlugin"
317 PLUGIN_CLASS_NAME = "KallitheaAuthPlugin"
318 try:
318 try:
319 module = importlib.import_module(plugin)
319 module = importlib.import_module(plugin)
320 except (ImportError, TypeError):
320 except (ImportError, TypeError):
@@ -327,9 +327,9 b' def importplugin(plugin):'
327 % (plugin, module.__name__, module.__file__))
327 % (plugin, module.__name__, module.__file__))
328
328
329 pluginclass = getattr(module, PLUGIN_CLASS_NAME)
329 pluginclass = getattr(module, PLUGIN_CLASS_NAME)
330 if not issubclass(pluginclass, RhodeCodeAuthPluginBase):
330 if not issubclass(pluginclass, KallitheaAuthPluginBase):
331 raise TypeError("Authentication class %s.RhodeCodeAuthPlugin is not "
331 raise TypeError("Authentication class %s.KallitheaAuthPlugin is not "
332 "a subclass of %s" % (plugin, RhodeCodeAuthPluginBase))
332 "a subclass of %s" % (plugin, KallitheaAuthPluginBase))
333 return pluginclass
333 return pluginclass
334
334
335
335
@@ -340,8 +340,8 b' def loadplugin(plugin):'
340 see: importplugin
340 see: importplugin
341 """
341 """
342 plugin = importplugin(plugin)()
342 plugin = importplugin(plugin)()
343 if plugin.plugin_settings.im_func != RhodeCodeAuthPluginBase.plugin_settings.im_func:
343 if plugin.plugin_settings.im_func != KallitheaAuthPluginBase.plugin_settings.im_func:
344 raise TypeError("Authentication class %s.RhodeCodeAuthPluginBase "
344 raise TypeError("Authentication class %s.KallitheaAuthPluginBase "
345 "has overriden the plugin_settings method, which is "
345 "has overriden the plugin_settings method, which is "
346 "forbidden." % plugin)
346 "forbidden." % plugin)
347 return plugin
347 return plugin
@@ -367,7 +367,7 b' def authenticate(username, password, env'
367 raise ImportError('Failed to load authentication module %s : %s'
367 raise ImportError('Failed to load authentication module %s : %s'
368 % (module, str(e)))
368 % (module, str(e)))
369 log.debug('Trying authentication using ** %s **' % (module,))
369 log.debug('Trying authentication using ** %s **' % (module,))
370 # load plugin settings from RhodeCode database
370 # load plugin settings from Kallithea database
371 plugin_name = plugin.name
371 plugin_name = plugin.name
372 plugin_settings = {}
372 plugin_settings = {}
373 for v in plugin.plugin_settings():
373 for v in plugin.plugin_settings():
@@ -395,9 +395,9 b' def authenticate(username, password, env'
395
395
396 log.info('Authenticating user using %s plugin' % plugin.__module__)
396 log.info('Authenticating user using %s plugin' % plugin.__module__)
397 # _authenticate is a wrapper for .auth() method of plugin.
397 # _authenticate is a wrapper for .auth() method of plugin.
398 # it checks if .auth() sends proper data. for RhodeCodeExternalAuthPlugin
398 # it checks if .auth() sends proper data. for KallitheaExternalAuthPlugin
399 # it also maps users to Database and maps the attributes returned
399 # it also maps users to Database and maps the attributes returned
400 # from .auth() to RhodeCode database. If this function returns data
400 # from .auth() to Kallithea database. If this function returns data
401 # then auth is correct.
401 # then auth is correct.
402 plugin_user = plugin._authenticate(user, username, password,
402 plugin_user = plugin._authenticate(user, username, password,
403 plugin_settings,
403 plugin_settings,
@@ -15,7 +15,7 b''
15 kallithea.lib.auth_modules.auth_container
15 kallithea.lib.auth_modules.auth_container
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 RhodeCode container based authentication plugin
18 Kallithea container based authentication plugin
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -34,7 +34,7 b' from kallithea.model.db import User'
34 log = logging.getLogger(__name__)
34 log = logging.getLogger(__name__)
35
35
36
36
37 class RhodeCodeAuthPlugin(auth_modules.RhodeCodeExternalAuthPlugin):
37 class KallitheaAuthPlugin(auth_modules.KallitheaExternalAuthPlugin):
38 def __init__(self):
38 def __init__(self):
39 pass
39 pass
40
40
@@ -127,7 +127,7 b' class RhodeCodeAuthPlugin(auth_modules.R'
127 settings = kwargs.get('settings') or {}
127 settings = kwargs.get('settings') or {}
128 username = self._get_username(environ, settings)
128 username = self._get_username(environ, settings)
129 # we got the username, so use default method now
129 # we got the username, so use default method now
130 return super(RhodeCodeAuthPlugin, self).get_user(username)
130 return super(KallitheaAuthPlugin, self).get_user(username)
131
131
132 def auth(self, userobj, username, password, settings, **kwargs):
132 def auth(self, userobj, username, password, settings, **kwargs):
133 """
133 """
@@ -138,7 +138,7 b' class RhodeCodeAuthPlugin(auth_modules.R'
138 having @ in it.
138 having @ in it.
139 Return None on failure. On success, return a dictionary of the form:
139 Return None on failure. On success, return a dictionary of the form:
140
140
141 see: RhodeCodeAuthPluginBase.auth_func_attrs
141 see: KallitheaAuthPluginBase.auth_func_attrs
142
142
143 :param userobj:
143 :param userobj:
144 :param username:
144 :param username:
@@ -169,7 +169,7 b' class RhodeCodeAuthPlugin(auth_modules.R'
169 if not username:
169 if not username:
170 return None
170 return None
171
171
172 # old attrs fetched from RhodeCode database
172 # old attrs fetched from Kallithea database
173 admin = getattr(userobj, 'admin', False)
173 admin = getattr(userobj, 'admin', False)
174 active = getattr(userobj, 'active', True)
174 active = getattr(userobj, 'active', True)
175 email = getattr(userobj, 'email', '')
175 email = getattr(userobj, 'email', '')
@@ -15,7 +15,7 b''
15 kallithea.lib.auth_modules.auth_crowd
15 kallithea.lib.auth_modules.auth_crowd
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 RhodeCode authentication plugin for Atlassian CROWD
18 Kallithea authentication plugin for Atlassian CROWD
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -130,7 +130,7 b' class CrowdServer(object):'
130 return self._request(url)
130 return self._request(url)
131
131
132
132
133 class RhodeCodeAuthPlugin(auth_modules.RhodeCodeExternalAuthPlugin):
133 class KallitheaAuthPlugin(auth_modules.KallitheaExternalAuthPlugin):
134
134
135 @hybrid_property
135 @hybrid_property
136 def name(self):
136 def name(self):
@@ -174,7 +174,7 b' class RhodeCodeAuthPlugin(auth_modules.R'
174 "name": "admin_groups",
174 "name": "admin_groups",
175 "validator": self.validators.UnicodeString(strip=True),
175 "validator": self.validators.UnicodeString(strip=True),
176 "type": "string",
176 "type": "string",
177 "description": "A comma separated list of group names that identify users as RhodeCode Administrators",
177 "description": "A comma separated list of group names that identify users as Kallithea Administrators",
178 "formname": "Admin Groups"
178 "formname": "Admin Groups"
179 }
179 }
180 ]
180 ]
@@ -195,7 +195,7 b' class RhodeCodeAuthPlugin(auth_modules.R'
195
195
196 Return None on failure. On success, return a dictionary of the form:
196 Return None on failure. On success, return a dictionary of the form:
197
197
198 see: RhodeCodeAuthPluginBase.auth_func_attrs
198 see: KallitheaAuthPluginBase.auth_func_attrs
199 This is later validated for correctness
199 This is later validated for correctness
200 """
200 """
201 if not username or not password:
201 if not username or not password:
@@ -214,7 +214,7 b' class RhodeCodeAuthPlugin(auth_modules.R'
214 log.debug("Crowd groups: \n%s" % (formatted_json(res)))
214 log.debug("Crowd groups: \n%s" % (formatted_json(res)))
215 crowd_user["groups"] = [x["name"] for x in res["groups"]]
215 crowd_user["groups"] = [x["name"] for x in res["groups"]]
216
216
217 # old attrs fetched from RhodeCode database
217 # old attrs fetched from Kallithea database
218 admin = getattr(userobj, 'admin', False)
218 admin = getattr(userobj, 'admin', False)
219 active = getattr(userobj, 'active', True)
219 active = getattr(userobj, 'active', True)
220 email = getattr(userobj, 'email', '')
220 email = getattr(userobj, 'email', '')
@@ -15,7 +15,7 b''
15 kallithea.lib.auth_modules.auth_internal
15 kallithea.lib.auth_modules.auth_internal
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 RhodeCode authentication plugin for built in internal auth
18 Kallithea authentication plugin for built in internal auth
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -35,7 +35,7 b' from kallithea.model.db import User'
35 log = logging.getLogger(__name__)
35 log = logging.getLogger(__name__)
36
36
37
37
38 class RhodeCodeAuthPlugin(auth_modules.RhodeCodeAuthPluginBase):
38 class KallitheaAuthPlugin(auth_modules.KallitheaAuthPluginBase):
39 def __init__(self):
39 def __init__(self):
40 pass
40 pass
41
41
@@ -55,7 +55,7 b' class RhodeCodeAuthPlugin(auth_modules.R'
55 Custom accepts for this auth that doesn't accept empty users. We
55 Custom accepts for this auth that doesn't accept empty users. We
56 know that user exisits in database.
56 know that user exisits in database.
57 """
57 """
58 return super(RhodeCodeAuthPlugin, self).accepts(user,
58 return super(KallitheaAuthPlugin, self).accepts(user,
59 accepts_empty=False)
59 accepts_empty=False)
60
60
61 def auth(self, userobj, username, password, settings, **kwargs):
61 def auth(self, userobj, username, password, settings, **kwargs):
@@ -83,7 +83,7 b' class RhodeCodeAuthPlugin(auth_modules.R'
83 log.debug(formatted_json(user_attrs))
83 log.debug(formatted_json(user_attrs))
84 if userobj.active:
84 if userobj.active:
85 from kallithea.lib import auth
85 from kallithea.lib import auth
86 password_match = auth.RhodeCodeCrypto.hash_check(password, userobj.password)
86 password_match = auth.KallitheaCrypto.hash_check(password, userobj.password)
87 if userobj.username == User.DEFAULT_USER and userobj.active:
87 if userobj.username == User.DEFAULT_USER and userobj.active:
88 log.info('user %s authenticated correctly as anonymous user' %
88 log.info('user %s authenticated correctly as anonymous user' %
89 username)
89 username)
@@ -15,7 +15,7 b''
15 kallithea.lib.auth_modules.auth_ldap
15 kallithea.lib.auth_modules.auth_ldap
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 RhodeCode authentication plugin for LDAP
18 Kallithea authentication plugin for LDAP
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -170,7 +170,7 b' class AuthLdap(object):'
170 return dn, attrs
170 return dn, attrs
171
171
172
172
173 class RhodeCodeAuthPlugin(auth_modules.RhodeCodeExternalAuthPlugin):
173 class KallitheaAuthPlugin(auth_modules.KallitheaExternalAuthPlugin):
174 def __init__(self):
174 def __init__(self):
175 self._logger = logging.getLogger(__name__)
175 self._logger = logging.getLogger(__name__)
176 self._tls_kind_values = ["PLAIN", "LDAPS", "START_TLS"]
176 self._tls_kind_values = ["PLAIN", "LDAPS", "START_TLS"]
@@ -297,7 +297,7 b' class RhodeCodeAuthPlugin(auth_modules.R'
297
297
298 Return None on failure. On success, return a dictionary of the form:
298 Return None on failure. On success, return a dictionary of the form:
299
299
300 see: RhodeCodeAuthPluginBase.auth_func_attrs
300 see: KallitheaAuthPluginBase.auth_func_attrs
301 This is later validated for correctness
301 This is later validated for correctness
302 """
302 """
303
303
@@ -332,7 +332,7 b' class RhodeCodeAuthPlugin(auth_modules.R'
332
332
333 get_ldap_attr = lambda k: ldap_attrs.get(settings.get(k), [''])[0]
333 get_ldap_attr = lambda k: ldap_attrs.get(settings.get(k), [''])[0]
334
334
335 # old attrs fetched from RhodeCode database
335 # old attrs fetched from Kallithea database
336 admin = getattr(userobj, 'admin', False)
336 admin = getattr(userobj, 'admin', False)
337 active = getattr(userobj, 'active', True)
337 active = getattr(userobj, 'active', True)
338 email = getattr(userobj, 'email', '')
338 email = getattr(userobj, 'email', '')
@@ -15,7 +15,7 b''
15 kallithea.lib.auth_pam
15 kallithea.lib.auth_pam
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 RhodeCode authentication library for PAM
18 Kallithea authentication library for PAM
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -42,7 +42,7 b' log = logging.getLogger(__name__)'
42 _pam_lock = threading.Lock()
42 _pam_lock = threading.Lock()
43
43
44
44
45 class RhodeCodeAuthPlugin(auth_modules.RhodeCodeExternalAuthPlugin):
45 class KallitheaAuthPlugin(auth_modules.KallitheaExternalAuthPlugin):
46 # PAM authnetication can be slow. Repository operations involve a lot of
46 # PAM authnetication can be slow. Repository operations involve a lot of
47 # auth calls. Little caching helps speedup push/pull operations significantly
47 # auth calls. Little caching helps speedup push/pull operations significantly
48 AUTH_CACHE_TTL = 4
48 AUTH_CACHE_TTL = 4
@@ -52,7 +52,7 b' class RhodeCodeAuthPlugin(auth_modules.R'
52 ts = time.time()
52 ts = time.time()
53 cleared_cache = dict(
53 cleared_cache = dict(
54 [(k, v) for (k, v) in _auth_cache.items() if
54 [(k, v) for (k, v) in _auth_cache.items() if
55 (v + RhodeCodeAuthPlugin.AUTH_CACHE_TTL > ts)])
55 (v + KallitheaAuthPlugin.AUTH_CACHE_TTL > ts)])
56 _auth_cache = cleared_cache
56 _auth_cache = cleared_cache
57
57
58 @hybrid_property
58 @hybrid_property
@@ -103,7 +103,7 b' class RhodeCodeAuthPlugin(auth_modules.R'
103 else:
103 else:
104 log.debug("Using cached auth for user: %s" % (username,))
104 log.debug("Using cached auth for user: %s" % (username,))
105
105
106 # old attrs fetched from RhodeCode database
106 # old attrs fetched from Kallithea database
107 admin = getattr(userobj, 'admin', False)
107 admin = getattr(userobj, 'admin', False)
108 active = getattr(userobj, 'active', True)
108 active = getattr(userobj, 'active', True)
109 email = getattr(userobj, 'email', '') or "%s@%s" % (username, socket.gethostname())
109 email = getattr(userobj, 'email', '') or "%s@%s" % (username, socket.gethostname())
@@ -111,7 +111,7 b' class BasicAuth(AuthBasicAuthenticator):'
111 head = WWW_AUTHENTICATE.tuples('Basic realm="%s"' % self.realm)
111 head = WWW_AUTHENTICATE.tuples('Basic realm="%s"' % self.realm)
112 if self._rc_auth_http_code and self._rc_auth_http_code == '403':
112 if self._rc_auth_http_code and self._rc_auth_http_code == '403':
113 # return 403 if alternative http return code is specified in
113 # return 403 if alternative http return code is specified in
114 # RhodeCode config
114 # Kallithea config
115 return HTTPForbidden(headers=head)
115 return HTTPForbidden(headers=head)
116 return HTTPUnauthorized(headers=head)
116 return HTTPUnauthorized(headers=head)
117
117
@@ -15,7 +15,7 b''
15 kallithea.lib.celerylib.__init__
15 kallithea.lib.celerylib.__init__
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 celery libs for RhodeCode
18 celery libs for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.lib.celerylib.tasks
15 kallithea.lib.celerylib.tasks
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 RhodeCode task modules, containing all task that suppose to be run
18 Kallithea task modules, containing all task that suppose to be run
19 by celery daemon
19 by celery daemon
20
20
21 This file was forked by the Kallithea project in July 2014.
21 This file was forked by the Kallithea project in July 2014.
@@ -278,7 +278,7 b' def send_email(recipients, subject, body'
278 .filter(User.admin == True).all()]
278 .filter(User.admin == True).all()]
279 recipients = [email_config.get('email_to')] + admins
279 recipients = [email_config.get('email_to')] + admins
280
280
281 mail_from = email_config.get('app_email_from', 'RhodeCode')
281 mail_from = email_config.get('app_email_from', 'Kallithea')
282 user = email_config.get('smtp_username')
282 user = email_config.get('smtp_username')
283 passwd = email_config.get('smtp_password')
283 passwd = email_config.get('smtp_password')
284 mail_server = email_config.get('smtp_server')
284 mail_server = email_config.get('smtp_server')
@@ -15,7 +15,7 b''
15 kallithea.lib.db_manage
15 kallithea.lib.db_manage
16 ~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Database creation, and setup module for RhodeCode. Used for creation
18 Database creation, and setup module for Kallithea. Used for creation
19 of database as well as for migration operations
19 of database as well as for migration operations
20
20
21 This file was forked by the Kallithea project in July 2014.
21 This file was forked by the Kallithea project in July 2014.
@@ -184,7 +184,7 b' class DbManage(object):'
184
184
185 def fix_repo_paths(self):
185 def fix_repo_paths(self):
186 """
186 """
187 Fixes a old rhodecode version path into new one without a '*'
187 Fixes a old kallithea version path into new one without a '*'
188 """
188 """
189
189
190 paths = self.sa.query(Ui)\
190 paths = self.sa.query(Ui)\
@@ -222,7 +222,7 b' class DbManage(object):'
222
222
223 def fix_settings(self):
223 def fix_settings(self):
224 """
224 """
225 Fixes rhodecode settings adds ga_code key for google analytics
225 Fixes kallithea settings adds ga_code key for google analytics
226 """
226 """
227
227
228 hgsettings3 = Setting('ga_code', '')
228 hgsettings3 = Setting('ga_code', '')
@@ -488,7 +488,7 b' class DbManage(object):'
488 real_path = os.path.normpath(os.path.realpath(path))
488 real_path = os.path.normpath(os.path.realpath(path))
489
489
490 if real_path != os.path.normpath(path):
490 if real_path != os.path.normpath(path):
491 if not ask_ok(('Path looks like a symlink, Rhodecode will store '
491 if not ask_ok(('Path looks like a symlink, Kallithea will store '
492 'given path as %s ? [y/n]') % (real_path,)):
492 'given path as %s ? [y/n]') % (real_path,)):
493 log.error('Canceled by user')
493 log.error('Canceled by user')
494 sys.exit(-1)
494 sys.exit(-1)
@@ -515,7 +515,7 b' class DbManage(object):'
515 self.sa.add(ui_conf)
515 self.sa.add(ui_conf)
516
516
517 settings = [
517 settings = [
518 ('realm', 'RhodeCode', 'unicode'),
518 ('realm', 'Kallithea', 'unicode'),
519 ('title', '', 'unicode'),
519 ('title', '', 'unicode'),
520 ('ga_code', '', 'unicode'),
520 ('ga_code', '', 'unicode'),
521 ('show_public_icon', True, 'bool'),
521 ('show_public_icon', True, 'bool'),
@@ -541,7 +541,7 b' class DbManage(object):'
541 def create_user(self, username, password, email='', admin=False):
541 def create_user(self, username, password, email='', admin=False):
542 log.info('creating user %s' % username)
542 log.info('creating user %s' % username)
543 UserModel().create_or_update(username, password, email,
543 UserModel().create_or_update(username, password, email,
544 firstname='RhodeCode', lastname='Admin',
544 firstname='Kallithea', lastname='Admin',
545 active=True, admin=admin,
545 active=True, admin=admin,
546 extern_type="internal")
546 extern_type="internal")
547
547
@@ -44,7 +44,7 b' class UpgradeDb(BasePasterCommand):'
44
44
45 usage = "CONFIG_FILE"
45 usage = "CONFIG_FILE"
46 summary = "Upgrades current db to newer version"
46 summary = "Upgrades current db to newer version"
47 group_name = "RhodeCode"
47 group_name = "Kallithea"
48
48
49 parser = Command.standard_parser(verbose=True)
49 parser = Command.standard_parser(verbose=True)
50
50
@@ -15,7 +15,7 b''
15 kallithea.model.db_1_2_0
15 kallithea.model.db_1_2_0
16 ~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Database Models for RhodeCode <=1.2.X
18 Database Models for Kallithea <=1.2.X
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.model.db_1_3_0
15 kallithea.model.db_1_3_0
16 ~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Database Models for RhodeCode <=1.3.X
18 Database Models for Kallithea <=1.3.X
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.model.db_1_4_0
15 kallithea.model.db_1_4_0
16 ~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Database Models for RhodeCode <=1.4.X
18 Database Models for Kallithea <=1.4.X
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -1173,16 +1173,16 b' class Permission(Base, BaseModel):'
1173 ('group.write', _('Repositories Group write access')),
1173 ('group.write', _('Repositories Group write access')),
1174 ('group.admin', _('Repositories Group admin access')),
1174 ('group.admin', _('Repositories Group admin access')),
1175
1175
1176 ('hg.admin', _('RhodeCode Administrator')),
1176 ('hg.admin', _('Kallithea Administrator')),
1177 ('hg.create.none', _('Repository creation disabled')),
1177 ('hg.create.none', _('Repository creation disabled')),
1178 ('hg.create.repository', _('Repository creation enabled')),
1178 ('hg.create.repository', _('Repository creation enabled')),
1179 ('hg.fork.none', _('Repository forking disabled')),
1179 ('hg.fork.none', _('Repository forking disabled')),
1180 ('hg.fork.repository', _('Repository forking enabled')),
1180 ('hg.fork.repository', _('Repository forking enabled')),
1181 ('hg.register.none', _('Register disabled')),
1181 ('hg.register.none', _('Register disabled')),
1182 ('hg.register.manual_activate', _('Register new user with RhodeCode '
1182 ('hg.register.manual_activate', _('Register new user with Kallithea '
1183 'with manual activation')),
1183 'with manual activation')),
1184
1184
1185 ('hg.register.auto_activate', _('Register new user with RhodeCode '
1185 ('hg.register.auto_activate', _('Register new user with Kallithea '
1186 'with auto activation')),
1186 'with auto activation')),
1187 ]
1187 ]
1188
1188
@@ -15,7 +15,7 b''
15 kallithea.model.db_1_5_0
15 kallithea.model.db_1_5_0
16 ~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Database Models for RhodeCode <=1.5.2
18 Database Models for Kallithea <=1.5.2
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -1192,16 +1192,16 b' class Permission(Base, BaseModel):'
1192 ('group.write', _('Repositories Group write access')),
1192 ('group.write', _('Repositories Group write access')),
1193 ('group.admin', _('Repositories Group admin access')),
1193 ('group.admin', _('Repositories Group admin access')),
1194
1194
1195 ('hg.admin', _('RhodeCode Administrator')),
1195 ('hg.admin', _('Kallithea Administrator')),
1196 ('hg.create.none', _('Repository creation disabled')),
1196 ('hg.create.none', _('Repository creation disabled')),
1197 ('hg.create.repository', _('Repository creation enabled')),
1197 ('hg.create.repository', _('Repository creation enabled')),
1198 ('hg.fork.none', _('Repository forking disabled')),
1198 ('hg.fork.none', _('Repository forking disabled')),
1199 ('hg.fork.repository', _('Repository forking enabled')),
1199 ('hg.fork.repository', _('Repository forking enabled')),
1200 ('hg.register.none', _('Register disabled')),
1200 ('hg.register.none', _('Register disabled')),
1201 ('hg.register.manual_activate', _('Register new user with RhodeCode '
1201 ('hg.register.manual_activate', _('Register new user with Kallithea '
1202 'with manual activation')),
1202 'with manual activation')),
1203
1203
1204 ('hg.register.auto_activate', _('Register new user with RhodeCode '
1204 ('hg.register.auto_activate', _('Register new user with Kallithea '
1205 'with auto activation')),
1205 'with auto activation')),
1206 ]
1206 ]
1207
1207
@@ -15,7 +15,7 b''
15 kallithea.model.db_1_5_2
15 kallithea.model.db_1_5_2
16 ~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Database Models for RhodeCode <=1.5.X
18 Database Models for Kallithea <=1.5.X
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -1312,16 +1312,16 b' class Permission(Base, BaseModel):'
1312 ('group.write', _('Repositories Group write access')),
1312 ('group.write', _('Repositories Group write access')),
1313 ('group.admin', _('Repositories Group admin access')),
1313 ('group.admin', _('Repositories Group admin access')),
1314
1314
1315 ('hg.admin', _('RhodeCode Administrator')),
1315 ('hg.admin', _('Kallithea Administrator')),
1316 ('hg.create.none', _('Repository creation disabled')),
1316 ('hg.create.none', _('Repository creation disabled')),
1317 ('hg.create.repository', _('Repository creation enabled')),
1317 ('hg.create.repository', _('Repository creation enabled')),
1318 ('hg.fork.none', _('Repository forking disabled')),
1318 ('hg.fork.none', _('Repository forking disabled')),
1319 ('hg.fork.repository', _('Repository forking enabled')),
1319 ('hg.fork.repository', _('Repository forking enabled')),
1320 ('hg.register.none', _('Register disabled')),
1320 ('hg.register.none', _('Register disabled')),
1321 ('hg.register.manual_activate', _('Register new user with RhodeCode '
1321 ('hg.register.manual_activate', _('Register new user with Kallithea '
1322 'with manual activation')),
1322 'with manual activation')),
1323
1323
1324 ('hg.register.auto_activate', _('Register new user with RhodeCode '
1324 ('hg.register.auto_activate', _('Register new user with Kallithea '
1325 'with auto activation')),
1325 'with auto activation')),
1326 ]
1326 ]
1327
1327
@@ -15,7 +15,7 b''
15 kallithea.model.db_1_6_0
15 kallithea.model.db_1_6_0
16 ~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Database Models for RhodeCode <=1.5.X
18 Database Models for Kallithea <=1.5.X
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -1397,16 +1397,16 b' class Permission(Base, BaseModel):'
1397 ('group.write', _('Repository group write access')),
1397 ('group.write', _('Repository group write access')),
1398 ('group.admin', _('Repository group admin access')),
1398 ('group.admin', _('Repository group admin access')),
1399
1399
1400 ('hg.admin', _('RhodeCode Administrator')),
1400 ('hg.admin', _('Kallithea Administrator')),
1401 ('hg.create.none', _('Repository creation disabled')),
1401 ('hg.create.none', _('Repository creation disabled')),
1402 ('hg.create.repository', _('Repository creation enabled')),
1402 ('hg.create.repository', _('Repository creation enabled')),
1403 ('hg.fork.none', _('Repository forking disabled')),
1403 ('hg.fork.none', _('Repository forking disabled')),
1404 ('hg.fork.repository', _('Repository forking enabled')),
1404 ('hg.fork.repository', _('Repository forking enabled')),
1405 ('hg.register.none', _('Register disabled')),
1405 ('hg.register.none', _('Register disabled')),
1406 ('hg.register.manual_activate', _('Register new user with RhodeCode '
1406 ('hg.register.manual_activate', _('Register new user with Kallithea '
1407 'with manual activation')),
1407 'with manual activation')),
1408
1408
1409 ('hg.register.auto_activate', _('Register new user with RhodeCode '
1409 ('hg.register.auto_activate', _('Register new user with Kallithea '
1410 'with auto activation')),
1410 'with auto activation')),
1411 ]
1411 ]
1412
1412
@@ -15,7 +15,7 b''
15 kallithea.model.db
15 kallithea.model.db
16 ~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~
17
17
18 Database Models for RhodeCode
18 Database Models for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -1405,7 +1405,7 b' class Permission(Base, BaseModel):'
1405 'mysql_charset': 'utf8'},
1405 'mysql_charset': 'utf8'},
1406 )
1406 )
1407 PERMS = [
1407 PERMS = [
1408 ('hg.admin', _('RhodeCode Administrator')),
1408 ('hg.admin', _('Kallithea Administrator')),
1409
1409
1410 ('repository.none', _('Repository no access')),
1410 ('repository.none', _('Repository no access')),
1411 ('repository.read', _('Repository read access')),
1411 ('repository.read', _('Repository read access')),
@@ -15,7 +15,7 b''
15 kallithea.model.db
15 kallithea.model.db
16 ~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~
17
17
18 Database Models for RhodeCode
18 Database Models for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -1451,7 +1451,7 b' class Permission(Base, BaseModel):'
1451 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1451 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1452 )
1452 )
1453 PERMS = [
1453 PERMS = [
1454 ('hg.admin', _('RhodeCode Administrator')),
1454 ('hg.admin', _('Kallithea Administrator')),
1455
1455
1456 ('repository.none', _('Repository no access')),
1456 ('repository.none', _('Repository no access')),
1457 ('repository.read', _('Repository read access')),
1457 ('repository.read', _('Repository read access')),
@@ -15,7 +15,7 b''
15 kallithea.model.db
15 kallithea.model.db
16 ~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~
17
17
18 Database Models for RhodeCode
18 Database Models for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -230,7 +230,7 b' class Setting(Base, BaseModel):'
230 @classmethod
230 @classmethod
231 def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
231 def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
232 """
232 """
233 Creates or updates RhodeCode setting. If updates is triggered it will only
233 Creates or updates Kallithea setting. If updates is triggered it will only
234 update parameters that are explicityl set Optional instance will be skipped
234 update parameters that are explicityl set Optional instance will be skipped
235
235
236 :param key:
236 :param key:
@@ -1508,7 +1508,7 b' class Permission(Base, BaseModel):'
1508 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1508 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1509 )
1509 )
1510 PERMS = [
1510 PERMS = [
1511 ('hg.admin', _('RhodeCode Administrator')),
1511 ('hg.admin', _('Kallithea Administrator')),
1512
1512
1513 ('repository.none', _('Repository no access')),
1513 ('repository.none', _('Repository no access')),
1514 ('repository.read', _('Repository read access')),
1514 ('repository.read', _('Repository read access')),
@@ -15,7 +15,7 b''
15 kallithea.model.db
15 kallithea.model.db
16 ~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~
17
17
18 Database Models for RhodeCode
18 Database Models for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -233,7 +233,7 b' class Setting(Base, BaseModel):'
233 @classmethod
233 @classmethod
234 def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
234 def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
235 """
235 """
236 Creates or updates RhodeCode setting. If updates is triggered it will only
236 Creates or updates Kallithea setting. If updates is triggered it will only
237 update parameters that are explicityl set Optional instance will be skipped
237 update parameters that are explicityl set Optional instance will be skipped
238
238
239 :param key:
239 :param key:
@@ -1509,7 +1509,7 b' class Permission(Base, BaseModel):'
1509 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1509 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1510 )
1510 )
1511 PERMS = [
1511 PERMS = [
1512 ('hg.admin', _('RhodeCode Administrator')),
1512 ('hg.admin', _('Kallithea Administrator')),
1513
1513
1514 ('repository.none', _('Repository no access')),
1514 ('repository.none', _('Repository no access')),
1515 ('repository.read', _('Repository read access')),
1515 ('repository.read', _('Repository read access')),
@@ -15,7 +15,7 b''
15 kallithea.model.db
15 kallithea.model.db
16 ~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~
17
17
18 Database Models for RhodeCode
18 Database Models for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -233,7 +233,7 b' class Setting(Base, BaseModel):'
233 @classmethod
233 @classmethod
234 def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
234 def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
235 """
235 """
236 Creates or updates RhodeCode setting. If updates is triggered it will only
236 Creates or updates Kallithea setting. If updates is triggered it will only
237 update parameters that are explicityl set Optional instance will be skipped
237 update parameters that are explicityl set Optional instance will be skipped
238
238
239 :param key:
239 :param key:
@@ -1530,7 +1530,7 b' class Permission(Base, BaseModel):'
1530 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1530 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1531 )
1531 )
1532 PERMS = [
1532 PERMS = [
1533 ('hg.admin', _('RhodeCode Administrator')),
1533 ('hg.admin', _('Kallithea Administrator')),
1534
1534
1535 ('repository.none', _('Repository no access')),
1535 ('repository.none', _('Repository no access')),
1536 ('repository.read', _('Repository read access')),
1536 ('repository.read', _('Repository read access')),
@@ -15,7 +15,7 b''
15 kallithea.model.db
15 kallithea.model.db
16 ~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~
17
17
18 Database Models for RhodeCode
18 Database Models for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -236,7 +236,7 b' class Setting(Base, BaseModel):'
236 @classmethod
236 @classmethod
237 def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
237 def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
238 """
238 """
239 Creates or updates RhodeCode setting. If updates is triggered it will only
239 Creates or updates Kallithea setting. If updates is triggered it will only
240 update parameters that are explicityl set Optional instance will be skipped
240 update parameters that are explicityl set Optional instance will be skipped
241
241
242 :param key:
242 :param key:
@@ -1569,7 +1569,7 b' class Permission(Base, BaseModel):'
1569 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1569 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1570 )
1570 )
1571 PERMS = [
1571 PERMS = [
1572 ('hg.admin', _('RhodeCode Administrator')),
1572 ('hg.admin', _('Kallithea Administrator')),
1573
1573
1574 ('repository.none', _('Repository no access')),
1574 ('repository.none', _('Repository no access')),
1575 ('repository.read', _('Repository read access')),
1575 ('repository.read', _('Repository read access')),
@@ -15,7 +15,7 b''
15 kallithea.model.db
15 kallithea.model.db
16 ~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~
17
17
18 Database Models for RhodeCode
18 Database Models for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -237,7 +237,7 b' class Setting(Base, BaseModel):'
237 @classmethod
237 @classmethod
238 def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
238 def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
239 """
239 """
240 Creates or updates RhodeCode setting. If updates is triggered it will only
240 Creates or updates Kallithea setting. If updates is triggered it will only
241 update parameters that are explicityl set Optional instance will be skipped
241 update parameters that are explicityl set Optional instance will be skipped
242
242
243 :param key:
243 :param key:
@@ -1619,7 +1619,7 b' class Permission(Base, BaseModel):'
1619 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1619 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1620 )
1620 )
1621 PERMS = [
1621 PERMS = [
1622 ('hg.admin', _('RhodeCode Administrator')),
1622 ('hg.admin', _('Kallithea Administrator')),
1623
1623
1624 ('repository.none', _('Repository no access')),
1624 ('repository.none', _('Repository no access')),
1625 ('repository.read', _('Repository read access')),
1625 ('repository.read', _('Repository read access')),
@@ -15,7 +15,7 b''
15 kallithea.model.db
15 kallithea.model.db
16 ~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~
17
17
18 Database Models for RhodeCode
18 Database Models for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -237,7 +237,7 b' class Setting(Base, BaseModel):'
237 @classmethod
237 @classmethod
238 def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
238 def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
239 """
239 """
240 Creates or updates RhodeCode setting. If updates is triggered it will only
240 Creates or updates Kallithea setting. If updates is triggered it will only
241 update parameters that are explicityl set Optional instance will be skipped
241 update parameters that are explicityl set Optional instance will be skipped
242
242
243 :param key:
243 :param key:
@@ -1646,7 +1646,7 b' class Permission(Base, BaseModel):'
1646 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1646 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1647 )
1647 )
1648 PERMS = [
1648 PERMS = [
1649 ('hg.admin', _('RhodeCode Administrator')),
1649 ('hg.admin', _('Kallithea Administrator')),
1650
1650
1651 ('repository.none', _('Repository no access')),
1651 ('repository.none', _('Repository no access')),
1652 ('repository.read', _('Repository read access')),
1652 ('repository.read', _('Repository read access')),
@@ -72,7 +72,7 b' def fixups(models, _SESSION):'
72 # fix certain key to new defaults
72 # fix certain key to new defaults
73 if name in ['title', 'show_public_icon']:
73 if name in ['title', 'show_public_icon']:
74 # change title if it's only the default
74 # change title if it's only the default
75 if name == 'title' and setting.app_settings_value == 'RhodeCode':
75 if name == 'title' and setting.app_settings_value == 'Kallithea':
76 setting.app_settings_value = default
76 setting.app_settings_value = default
77 else:
77 else:
78 setting.app_settings_value = default
78 setting.app_settings_value = default
@@ -15,7 +15,7 b''
15 kallithea.lib.exceptions
15 kallithea.lib.exceptions
16 ~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Set of custom exceptions used in RhodeCode
18 Set of custom exceptions used in Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -74,7 +74,7 b' class NonRelativePathError(Exception):'
74
74
75 class HTTPLockedRC(HTTPClientError):
75 class HTTPLockedRC(HTTPClientError):
76 """
76 """
77 Special Exception For locked Repos in RhodeCode, the return code can
77 Special Exception For locked Repos in Kallithea, the return code can
78 be overwritten by _code keyword argument passed into constructors
78 be overwritten by _code keyword argument passed into constructors
79 """
79 """
80 code = 423
80 code = 423
@@ -468,7 +468,7 b' def email_or_none(author):'
468 # extract email from the commit string
468 # extract email from the commit string
469 _email = email(author)
469 _email = email(author)
470 if _email != '':
470 if _email != '':
471 # check it against RhodeCode database, and use the MAIN email for this
471 # check it against Kallithea database, and use the MAIN email for this
472 # user
472 # user
473 user = User.get_by_email(_email, case_insensitive=True, cache=True)
473 user = User.get_by_email(_email, case_insensitive=True, cache=True)
474 if user is not None:
474 if user is not None:
@@ -776,7 +776,7 b' def action_parser(user_log, feed=False, '
776 get_pull_request, 'icon-check'),
776 get_pull_request, 'icon-check'),
777 'push': (_('[pushed] into'),
777 'push': (_('[pushed] into'),
778 get_cs_links, 'icon-arrow-up'),
778 get_cs_links, 'icon-arrow-up'),
779 'push_local': (_('[committed via RhodeCode] into repository'),
779 'push_local': (_('[committed via Kallithea] into repository'),
780 get_cs_links, 'icon-pencil icon-pencil-colored'),
780 get_cs_links, 'icon-pencil icon-pencil-colored'),
781 'push_remote': (_('[pulled from remote] into repository'),
781 'push_remote': (_('[pulled from remote] into repository'),
782 get_cs_links, 'icon-arrow-up'),
782 get_cs_links, 'icon-arrow-up'),
@@ -15,7 +15,7 b''
15 kallithea.lib.hooks
15 kallithea.lib.hooks
16 ~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~
17
17
18 Hooks runned by rhodecode
18 Hooks runned by kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.lib.indexers.__init__
15 kallithea.lib.indexers.__init__
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Whoosh indexing module for RhodeCode
18 Whoosh indexing module for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -158,7 +158,7 b' class SimpleGit(BaseVCSController):'
158 return HTTPForbidden()(environ, start_response)
158 return HTTPForbidden()(environ, start_response)
159
159
160 # extras are injected into UI object and later available
160 # extras are injected into UI object and later available
161 # in hooks executed by rhodecode
161 # in hooks executed by kallithea
162 from kallithea import CONFIG
162 from kallithea import CONFIG
163 server_url = get_server_url(environ)
163 server_url = get_server_url(environ)
164 extras = {
164 extras = {
@@ -162,7 +162,7 b' class SimpleHg(BaseVCSController):'
162 return HTTPForbidden()(environ, start_response)
162 return HTTPForbidden()(environ, start_response)
163
163
164 # extras are injected into mercurial UI object and later available
164 # extras are injected into mercurial UI object and later available
165 # in hg hooks executed by rhodecode
165 # in hg hooks executed by kallithea
166 from kallithea import CONFIG
166 from kallithea import CONFIG
167 server_url = get_server_url(environ)
167 server_url = get_server_url(environ)
168 extras = {
168 extras = {
@@ -15,7 +15,7 b''
15 kallithea.lib.paster_commands.cache_keys
15 kallithea.lib.paster_commands.cache_keys
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 cleanup-keys paster command for RhodeCode
18 cleanup-keys paster command for Kallithea
19
19
20
20
21 This file was forked by the Kallithea project in July 2014.
21 This file was forked by the Kallithea project in July 2014.
@@ -50,7 +50,7 b' class Command(BasePasterCommand):'
50 min_args = 1
50 min_args = 1
51
51
52 usage = "CONFIG_FILE"
52 usage = "CONFIG_FILE"
53 group_name = "RhodeCode"
53 group_name = "Kallithea"
54 takes_config_file = -1
54 takes_config_file = -1
55 parser = BasePasterCommand.standard_parser(verbose=True)
55 parser = BasePasterCommand.standard_parser(verbose=True)
56 summary = "Cache keys utils"
56 summary = "Cache keys utils"
@@ -15,7 +15,7 b''
15 kallithea.lib.paster_commands.ishell
15 kallithea.lib.paster_commands.ishell
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 interactive shell paster command for RhodeCode
18 interactive shell paster command for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -47,7 +47,7 b' class Command(BasePasterCommand):'
47 min_args = 1
47 min_args = 1
48
48
49 usage = "CONFIG_FILE"
49 usage = "CONFIG_FILE"
50 group_name = "RhodeCode"
50 group_name = "Kallithea"
51 takes_config_file = -1
51 takes_config_file = -1
52 parser = BasePasterCommand.standard_parser(verbose=True)
52 parser = BasePasterCommand.standard_parser(verbose=True)
53 summary = "Interactive shell"
53 summary = "Interactive shell"
@@ -69,7 +69,7 b' class Command(BasePasterCommand):'
69 from IPython.config.loader import Config
69 from IPython.config.loader import Config
70 cfg = Config()
70 cfg = Config()
71 cfg.InteractiveShellEmbed.confirm_exit = False
71 cfg.InteractiveShellEmbed.confirm_exit = False
72 embed(config=cfg, banner1="RhodeCode IShell.")
72 embed(config=cfg, banner1="Kallithea IShell.")
73 except ImportError:
73 except ImportError:
74 print 'ipython installation required for ishell'
74 print 'ipython installation required for ishell'
75 sys.exit(-1)
75 sys.exit(-1)
@@ -15,7 +15,7 b''
15 kallithea.lib.paster_commands.make_index
15 kallithea.lib.paster_commands.make_index
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 make-index paster command for RhodeCode
18 make-index paster command for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -50,7 +50,7 b' class Command(BasePasterCommand):'
50 min_args = 1
50 min_args = 1
51
51
52 usage = "CONFIG_FILE"
52 usage = "CONFIG_FILE"
53 group_name = "RhodeCode"
53 group_name = "Kallithea"
54 takes_config_file = -1
54 takes_config_file = -1
55 parser = BasePasterCommand.standard_parser(verbose=True)
55 parser = BasePasterCommand.standard_parser(verbose=True)
56 summary = "Creates or updates full text search index"
56 summary = "Creates or updates full text search index"
@@ -15,7 +15,7 b''
15 kallithea.lib.paster_commands.make_rcextensions
15 kallithea.lib.paster_commands.make_rcextensions
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 make-rcext paster command for RhodeCode
18 make-rcext paster command for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -49,10 +49,10 b' class Command(BasePasterCommand):'
49 min_args = 1
49 min_args = 1
50
50
51 usage = "CONFIG_FILE"
51 usage = "CONFIG_FILE"
52 group_name = "RhodeCode"
52 group_name = "Kallithea"
53 takes_config_file = -1
53 takes_config_file = -1
54 parser = BasePasterCommand.standard_parser(verbose=True)
54 parser = BasePasterCommand.standard_parser(verbose=True)
55 summary = "Creates additional extensions for rhodecode"
55 summary = "Creates additional extensions for kallithea"
56
56
57 def command(self):
57 def command(self):
58 logging.config.fileConfig(self.path_to_ini_file)
58 logging.config.fileConfig(self.path_to_ini_file)
@@ -15,7 +15,7 b''
15 kallithea.lib.paster_commands.make_rcextensions
15 kallithea.lib.paster_commands.make_rcextensions
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 repo-scan paster command for RhodeCode
18 repo-scan paster command for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -48,7 +48,7 b' class Command(BasePasterCommand):'
48 min_args = 1
48 min_args = 1
49
49
50 usage = "CONFIG_FILE"
50 usage = "CONFIG_FILE"
51 group_name = "RhodeCode"
51 group_name = "Kallithea"
52 takes_config_file = -1
52 takes_config_file = -1
53 parser = BasePasterCommand.standard_parser(verbose=True)
53 parser = BasePasterCommand.standard_parser(verbose=True)
54 summary = "Rescan default location for new repositories"
54 summary = "Rescan default location for new repositories"
@@ -69,5 +69,5 b' class Command(BasePasterCommand):'
69 '--delete-obsolete',
69 '--delete-obsolete',
70 action='store_true',
70 action='store_true',
71 help="Use this flag do delete repositories that are "
71 help="Use this flag do delete repositories that are "
72 "present in RhodeCode database but not on the filesystem",
72 "present in Kallithea database but not on the filesystem",
73 )
73 )
@@ -17,11 +17,11 b' class Command(AbstractInstallCommand):'
17 min_args = 1
17 min_args = 1
18 summary = "Setup an application, given a config file"
18 summary = "Setup an application, given a config file"
19 usage = "CONFIG_FILE"
19 usage = "CONFIG_FILE"
20 group_name = "RhodeCode"
20 group_name = "Kallithea"
21
21
22 description = """\
22 description = """\
23
23
24 Setup RhodeCode according to its configuration file. This is
24 Setup Kallithea according to its configuration file. This is
25 the second part of a two-phase web application installation
25 the second part of a two-phase web application installation
26 process (the first phase is prepare-app). The setup process
26 process (the first phase is prepare-app). The setup process
27 consist of things like setting up databases, creating super user
27 consist of things like setting up databases, creating super user
@@ -15,7 +15,7 b''
15 kallithea.lib.paster_commands.make_rcextensions
15 kallithea.lib.paster_commands.make_rcextensions
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 uodate-repoinfo paster command for RhodeCode
18 uodate-repoinfo paster command for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -51,7 +51,7 b' class Command(BasePasterCommand):'
51 min_args = 1
51 min_args = 1
52
52
53 usage = "CONFIG_FILE"
53 usage = "CONFIG_FILE"
54 group_name = "RhodeCode"
54 group_name = "Kallithea"
55 takes_config_file = -1
55 takes_config_file = -1
56 parser = BasePasterCommand.standard_parser(verbose=True)
56 parser = BasePasterCommand.standard_parser(verbose=True)
57 summary = "Updates repositories caches for last changeset"
57 summary = "Updates repositories caches for last changeset"
@@ -15,7 +15,7 b''
15 kallithea.lib.rcmail.smtp_mailer
15 kallithea.lib.rcmail.smtp_mailer
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Simple smtp mailer used in RhodeCode
18 Simple smtp mailer used in Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.lib.utils
15 kallithea.lib.utils
16 ~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~
17
17
18 Utilities library for RhodeCode
18 Utilities library for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -387,7 +387,7 b" def make_ui(read_from='file', path=None,"
387 baseui.setconfig(safe_str(ui_.ui_section), safe_str(ui_.ui_key),
387 baseui.setconfig(safe_str(ui_.ui_section), safe_str(ui_.ui_key),
388 safe_str(ui_.ui_value))
388 safe_str(ui_.ui_value))
389 if ui_.ui_key == 'push_ssl':
389 if ui_.ui_key == 'push_ssl':
390 # force set push_ssl requirement to False, rhodecode
390 # force set push_ssl requirement to False, kallithea
391 # handles that
391 # handles that
392 baseui.setconfig(safe_str(ui_.ui_section), safe_str(ui_.ui_key),
392 baseui.setconfig(safe_str(ui_.ui_section), safe_str(ui_.ui_key),
393 False)
393 False)
@@ -410,7 +410,7 b' def set_app_settings(config):'
410
410
411 def set_vcs_config(config):
411 def set_vcs_config(config):
412 """
412 """
413 Patch VCS config with some RhodeCode specific stuff
413 Patch VCS config with some Kallithea specific stuff
414
414
415 :param config: kallithea.CONFIG
415 :param config: kallithea.CONFIG
416 """
416 """
@@ -499,7 +499,7 b' def repo2db_mapper(initial_repo_list, re'
499 group = map_groups(name)
499 group = map_groups(name)
500 unicode_name = safe_unicode(name)
500 unicode_name = safe_unicode(name)
501 db_repo = repo_model.get_by_repo_name(unicode_name)
501 db_repo = repo_model.get_by_repo_name(unicode_name)
502 # found repo that is on filesystem not in RhodeCode database
502 # found repo that is on filesystem not in Kallithea database
503 if not db_repo:
503 if not db_repo:
504 log.info('repository %s not found, creating now' % name)
504 log.info('repository %s not found, creating now' % name)
505 added.append(name)
505 added.append(name)
@@ -795,7 +795,7 b' class BasePasterCommand(Command):'
795 def check_git_version():
795 def check_git_version():
796 """
796 """
797 Checks what version of git is installed in system, and issues a warning
797 Checks what version of git is installed in system, and issues a warning
798 if it's too old for RhodeCode to properly work.
798 if it's too old for Kallithea to properly work.
799 """
799 """
800 from kallithea import BACKENDS
800 from kallithea import BACKENDS
801 from kallithea.lib.vcs.backends.git.repository import GitRepository
801 from kallithea.lib.vcs.backends.git.repository import GitRepository
@@ -826,7 +826,7 b' def check_git_version():'
826 if stderr:
826 if stderr:
827 log.warning('Unable to detect git version, org error was: %r' % stderr)
827 log.warning('Unable to detect git version, org error was: %r' % stderr)
828 elif to_old_git:
828 elif to_old_git:
829 log.warning('RhodeCode detected git version %s, which is too old '
829 log.warning('Kallithea detected git version %s, which is too old '
830 'for the system to function properly. Make sure '
830 'for the system to function properly. Make sure '
831 'its version is at least %s' % (ver, req_ver))
831 'its version is at least %s' % (ver, req_ver))
832 return _ver
832 return _ver
@@ -675,7 +675,7 b' def suuid(url=None, truncate_to=22, alph'
675
675
676 def get_current_authuser():
676 def get_current_authuser():
677 """
677 """
678 Gets rhodecode user from threadlocal tmpl_context variable if it's
678 Gets kallithea user from threadlocal tmpl_context variable if it's
679 defined, else returns None.
679 defined, else returns None.
680 """
680 """
681 from pylons import tmpl_context
681 from pylons import tmpl_context
@@ -66,7 +66,7 b' def init_model(engine):'
66
66
67 class BaseModel(object):
67 class BaseModel(object):
68 """
68 """
69 Base Model for all RhodeCode models, it adds sql alchemy session
69 Base Model for all Kallithea models, it adds sql alchemy session
70 into instance of model
70 into instance of model
71
71
72 :param sa: If passed it reuses this session instead of creating a new one
72 :param sa: If passed it reuses this session instead of creating a new one
@@ -15,7 +15,7 b''
15 kallithea.model.api_key
15 kallithea.model.api_key
16 ~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 api key model for RhodeCode
18 api key model for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.model.comment
15 kallithea.model.comment
16 ~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 comments model for RhodeCode
18 comments model for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -97,7 +97,7 b' class ChangesetCommentsModel(BaseModel):'
97 (user.username, h.short_id(revision))
97 (user.username, h.short_id(revision))
98 # get the current participants of this changeset
98 # get the current participants of this changeset
99 recipients = ChangesetComment.get_users(revision=revision)
99 recipients = ChangesetComment.get_users(revision=revision)
100 # add changeset author if it's in rhodecode system
100 # add changeset author if it's in kallithea system
101 cs_author = User.get_from_cs_author(cs.author)
101 cs_author = User.get_from_cs_author(cs.author)
102 if not cs_author:
102 if not cs_author:
103 #use repo owner if we cannot extract the author correctly
103 #use repo owner if we cannot extract the author correctly
@@ -15,7 +15,7 b''
15 kallithea.model.db
15 kallithea.model.db
16 ~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~
17
17
18 Database Models for RhodeCode
18 Database Models for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -237,7 +237,7 b' class Setting(Base, BaseModel):'
237 @classmethod
237 @classmethod
238 def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
238 def create_or_update(cls, key, val=Optional(''), type=Optional('unicode')):
239 """
239 """
240 Creates or updates RhodeCode setting. If updates is triggered it will only
240 Creates or updates Kallithea setting. If updates is triggered it will only
241 update parameters that are explicityl set Optional instance will be skipped
241 update parameters that are explicityl set Optional instance will be skipped
242
242
243 :param key:
243 :param key:
@@ -1656,7 +1656,7 b' class Permission(Base, BaseModel):'
1656 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1656 'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
1657 )
1657 )
1658 PERMS = [
1658 PERMS = [
1659 ('hg.admin', _('RhodeCode Administrator')),
1659 ('hg.admin', _('Kallithea Administrator')),
1660
1660
1661 ('repository.none', _('Repository no access')),
1661 ('repository.none', _('Repository no access')),
1662 ('repository.read', _('Repository read access')),
1662 ('repository.read', _('Repository read access')),
@@ -15,7 +15,7 b''
15 kallithea.model.gist
15 kallithea.model.gist
16 ~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~
17
17
18 gist model for RhodeCode
18 gist model for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -158,7 +158,7 b' class GistModel(BaseModel):'
158 message += 's: ' if len(processed_mapping) > 1 else ': '
158 message += 's: ' if len(processed_mapping) > 1 else ': '
159 message += ', '.join([x for x in processed_mapping])
159 message += ', '.join([x for x in processed_mapping])
160
160
161 #fake RhodeCode Repository object
161 #fake Kallithea Repository object
162 fake_repo = AttributeDict(dict(
162 fake_repo = AttributeDict(dict(
163 repo_name=gist_repo_path,
163 repo_name=gist_repo_path,
164 scm_instance_no_cache=lambda: repo,
164 scm_instance_no_cache=lambda: repo,
@@ -222,7 +222,7 b' class GistModel(BaseModel):'
222 message += 's: ' if len(gist_mapping) > 1 else ': '
222 message += 's: ' if len(gist_mapping) > 1 else ': '
223 message += ', '.join([x for x in gist_mapping])
223 message += ', '.join([x for x in gist_mapping])
224
224
225 #fake RhodeCode Repository object
225 #fake Kallithea Repository object
226 fake_repo = AttributeDict(dict(
226 fake_repo = AttributeDict(dict(
227 repo_name=gist_repo.path,
227 repo_name=gist_repo.path,
228 scm_instance_no_cache=lambda: gist_repo,
228 scm_instance_no_cache=lambda: gist_repo,
@@ -231,7 +231,7 b' class NotificationModel(BaseModel):'
231 _n.TYPE_CHANGESET_COMMENT: _('%(user)s commented on changeset at %(when)s'),
231 _n.TYPE_CHANGESET_COMMENT: _('%(user)s commented on changeset at %(when)s'),
232 _n.TYPE_MESSAGE: _('%(user)s sent message at %(when)s'),
232 _n.TYPE_MESSAGE: _('%(user)s sent message at %(when)s'),
233 _n.TYPE_MENTION: _('%(user)s mentioned you at %(when)s'),
233 _n.TYPE_MENTION: _('%(user)s mentioned you at %(when)s'),
234 _n.TYPE_REGISTRATION: _('%(user)s registered in RhodeCode at %(when)s'),
234 _n.TYPE_REGISTRATION: _('%(user)s registered in Kallithea at %(when)s'),
235 _n.TYPE_PULL_REQUEST: _('%(user)s opened new pull request at %(when)s'),
235 _n.TYPE_PULL_REQUEST: _('%(user)s opened new pull request at %(when)s'),
236 _n.TYPE_PULL_REQUEST_COMMENT: _('%(user)s commented on pull request at %(when)s')
236 _n.TYPE_PULL_REQUEST_COMMENT: _('%(user)s commented on pull request at %(when)s')
237 }
237 }
@@ -15,7 +15,7 b''
15 kallithea.model.permission
15 kallithea.model.permission
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 permissions model for RhodeCode
18 permissions model for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -41,7 +41,7 b' log = logging.getLogger(__name__)'
41
41
42 class PermissionModel(BaseModel):
42 class PermissionModel(BaseModel):
43 """
43 """
44 Permissions model for RhodeCode
44 Permissions model for Kallithea
45 """
45 """
46
46
47 cls = Permission
47 cls = Permission
@@ -15,7 +15,7 b''
15 kallithea.model.pull_request
15 kallithea.model.pull_request
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 pull request model for RhodeCode
18 pull request model for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.model.repo
15 kallithea.model.repo
16 ~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~
17
17
18 Repository model for rhodecode
18 Repository model for kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -734,7 +734,7 b' class RepoModel(BaseModel):'
734 repo = backend(repo_path, create=True, src_url=clone_uri, baseui=baseui)
734 repo = backend(repo_path, create=True, src_url=clone_uri, baseui=baseui)
735 elif repo_type == 'git':
735 elif repo_type == 'git':
736 repo = backend(repo_path, create=True, src_url=clone_uri, bare=True)
736 repo = backend(repo_path, create=True, src_url=clone_uri, bare=True)
737 # add rhodecode hook into this repo
737 # add kallithea hook into this repo
738 ScmModel().install_git_hook(repo=repo)
738 ScmModel().install_git_hook(repo=repo)
739 else:
739 else:
740 raise Exception('Not supported repo_type %s expected hg/git' % repo_type)
740 raise Exception('Not supported repo_type %s expected hg/git' % repo_type)
@@ -764,7 +764,7 b' class RepoModel(BaseModel):'
764 """
764 """
765 removes repo from filesystem, the removal is acctually made by
765 removes repo from filesystem, the removal is acctually made by
766 added rm__ prefix into dir, and rename internat .hg/.git dirs so this
766 added rm__ prefix into dir, and rename internat .hg/.git dirs so this
767 repository is no longer valid for rhodecode, can be undeleted later on
767 repository is no longer valid for kallithea, can be undeleted later on
768 by reverting the renames on this repository
768 by reverting the renames on this repository
769
769
770 :param repo: repo object
770 :param repo: repo object
@@ -15,7 +15,7 b''
15 kallithea.model.user_group
15 kallithea.model.user_group
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 repo group model for RhodeCode
18 repo group model for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.model.users_group
15 kallithea.model.users_group
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 repository permission model for RhodeCode
18 repository permission model for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -15,7 +15,7 b''
15 kallithea.model.scm
15 kallithea.model.scm
16 ~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~
17
17
18 Scm model for RhodeCode
18 Scm model for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -280,7 +280,7 b' class ScmModel(BaseModel):'
280
280
281 for name, path in get_filesystem_repos(repos_path, recursive=True):
281 for name, path in get_filesystem_repos(repos_path, recursive=True):
282 # name need to be decomposed and put back together using the /
282 # name need to be decomposed and put back together using the /
283 # since this is internal storage separator for rhodecode
283 # since this is internal storage separator for kallithea
284 name = Repository.normalize_repo_name(name)
284 name = Repository.normalize_repo_name(name)
285
285
286 try:
286 try:
@@ -613,8 +613,8 b' class ScmModel(BaseModel):'
613 """
613 """
614 Commits given multiple nodes into repo
614 Commits given multiple nodes into repo
615
615
616 :param user: RhodeCode User object or user_id, the commiter
616 :param user: Kallithea User object or user_id, the commiter
617 :param repo: RhodeCode Repository object
617 :param repo: Kallithea Repository object
618 :param message: commit message
618 :param message: commit message
619 :param nodes: mapping {filename:{'content':content},...}
619 :param nodes: mapping {filename:{'content':content},...}
620 :param parent_cs: parent changeset, can be empty than it's initial commit
620 :param parent_cs: parent changeset, can be empty than it's initial commit
@@ -738,8 +738,8 b' class ScmModel(BaseModel):'
738 """
738 """
739 Deletes given multiple nodes into repo
739 Deletes given multiple nodes into repo
740
740
741 :param user: RhodeCode User object or user_id, the commiter
741 :param user: Kallithea User object or user_id, the commiter
742 :param repo: RhodeCode Repository object
742 :param repo: Kallithea Repository object
743 :param message: commit message
743 :param message: commit message
744 :param nodes: mapping {filename:{'content':content},...}
744 :param nodes: mapping {filename:{'content':content},...}
745 :param parent_cs: parent changeset, can be empty than it's initial commit
745 :param parent_cs: parent changeset, can be empty than it's initial commit
@@ -834,7 +834,7 b' class ScmModel(BaseModel):'
834
834
835 def install_git_hook(self, repo, force_create=False):
835 def install_git_hook(self, repo, force_create=False):
836 """
836 """
837 Creates a rhodecode hook inside a git repository
837 Creates a kallithea hook inside a git repository
838
838
839 :param repo: Instance of VCS repo
839 :param repo: Instance of VCS repo
840 :param force_create: Create even if same name hook exists
840 :param force_create: Create even if same name hook exists
@@ -858,8 +858,8 b' class ScmModel(BaseModel):'
858 has_hook = False
858 has_hook = False
859 log.debug('Installing git hook in repo %s' % repo)
859 log.debug('Installing git hook in repo %s' % repo)
860 if os.path.exists(_hook_file):
860 if os.path.exists(_hook_file):
861 # let's take a look at this hook, maybe it's rhodecode ?
861 # let's take a look at this hook, maybe it's kallithea ?
862 log.debug('hook exists, checking if it is from rhodecode')
862 log.debug('hook exists, checking if it is from kallithea')
863 with open(_hook_file, 'rb') as f:
863 with open(_hook_file, 'rb') as f:
864 data = f.read()
864 data = f.read()
865 matches = re.compile(r'(?:%s)\s*=\s*(.*)'
865 matches = re.compile(r'(?:%s)\s*=\s*(.*)'
@@ -867,7 +867,7 b' class ScmModel(BaseModel):'
867 if matches:
867 if matches:
868 try:
868 try:
869 ver = matches.groups()[0]
869 ver = matches.groups()[0]
870 log.debug('got %s it is rhodecode' % (ver))
870 log.debug('got %s it is kallithea' % (ver))
871 has_hook = True
871 has_hook = True
872 except Exception:
872 except Exception:
873 log.error(traceback.format_exc())
873 log.error(traceback.format_exc())
@@ -15,7 +15,7 b''
15 kallithea.model.user
15 kallithea.model.user
16 ~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~
17
17
18 users model for RhodeCode
18 users model for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -141,7 +141,7 b' class UserModel(BaseModel):'
141 # raises UserCreationError if it's not allowed
141 # raises UserCreationError if it's not allowed
142 check_allowed_create_user(user_data, cur_user)
142 check_allowed_create_user(user_data, cur_user)
143
143
144 log.debug('Checking for %s account in RhodeCode database' % username)
144 log.debug('Checking for %s account in Kallithea database' % username)
145 user = User.get_by_username(username, case_insensitive=True)
145 user = User.get_by_username(username, case_insensitive=True)
146 if user is None:
146 if user is None:
147 log.debug('creating new user %s' % username)
147 log.debug('creating new user %s' % username)
@@ -331,7 +331,7 b' class UserModel(BaseModel):'
331 pre_db = False
331 pre_db = False
332 run_task(tasks.send_email, user_email,
332 run_task(tasks.send_email, user_email,
333 _('Your new password'),
333 _('Your new password'),
334 _('Your new RhodeCode password:%s') % (new_passwd,))
334 _('Your new Kallithea password:%s') % (new_passwd,))
335 log.info('send new password mail to %s' % user_email)
335 log.info('send new password mail to %s' % user_email)
336
336
337 except Exception:
337 except Exception:
@@ -15,7 +15,7 b''
15 kallithea.model.users_group
15 kallithea.model.users_group
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 user group model for RhodeCode
18 user group model for Kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -1,5 +1,5 b''
1 /**
1 /**
2 RhodeCode JS Files
2 Kallithea JS Files
3 **/
3 **/
4
4
5 if (typeof console == "undefined" || typeof console.log == "undefined"){
5 if (typeof console == "undefined" || typeof console.log == "undefined"){
@@ -33,7 +33,7 b''
33 <div class="field">
33 <div class="field">
34 <div class="label"><label for="auth_plugins">${_("Enabled Plugins")}</label></div>
34 <div class="label"><label for="auth_plugins">${_("Enabled Plugins")}</label></div>
35 <div class="input">${h.text("auth_plugins", class_='large')}
35 <div class="input">${h.text("auth_plugins", class_='large')}
36 <span class="help-block">${_('Comma separated list of plugins. Order of plugins is also order in which RhodeCode will try to authenticate user')}</span>
36 <span class="help-block">${_('Comma separated list of plugins. Order of plugins is also order in which Kallithea will try to authenticate user')}</span>
37 <div style="padding:10px 0px 10px 0px;font-weight: bold">${_('Available built-in plugins')}</div>
37 <div style="padding:10px 0px 10px 0px;font-weight: bold">${_('Available built-in plugins')}</div>
38 <ul>
38 <ul>
39 %for plugin_path in c.available_plugins:
39 %for plugin_path in c.available_plugins:
@@ -10,7 +10,7 b''
10 <div class="checkbox">
10 <div class="checkbox">
11 ${h.checkbox('anonymous',True)}
11 ${h.checkbox('anonymous',True)}
12 </div>
12 </div>
13 <span class="help-block">${h.literal(_('Allow access to RhodeCode without need to log in. Anonymous users use %s user permissions' % (h.link_to('*default*',h.url('admin_permissions_perms')))))}</span>
13 <span class="help-block">${h.literal(_('Allow access to Kallithea without need to log in. Anonymous users use %s user permissions' % (h.link_to('*default*',h.url('admin_permissions_perms')))))}</span>
14 </div>
14 </div>
15 </div>
15 </div>
16 <div class="field">
16 <div class="field">
@@ -39,7 +39,7 b''
39 </div>
39 </div>
40 <div id="progress_error" style="display: none;">
40 <div id="progress_error" style="display: none;">
41 <div style="font-weight: bold; color:#aa1111">
41 <div style="font-weight: bold; color:#aa1111">
42 ${_("We're sorry but error occured during this operation. Please check your RhodeCode server logs, or contact administrator.")}
42 ${_("We're sorry but error occured during this operation. Please check your Kallithea server logs, or contact administrator.")}
43 </div>
43 </div>
44 </div>
44 </div>
45 </div>
45 </div>
@@ -91,7 +91,7 b''
91 %endif
91 %endif
92 <div class="field" style="border:none;color:#888">
92 <div class="field" style="border:none;color:#888">
93 <ul>
93 <ul>
94 <li>${_('This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems. If you need to fully delete it from file system please do it manually')}</li>
94 <li>${_('This repository will be renamed in a special way in order to be unaccesible for Kallithea and VCS systems. If you need to fully delete it from file system please do it manually')}</li>
95 </ul>
95 </ul>
96 </div>
96 </div>
97 ${h.end_form()}
97 ${h.end_form()}
@@ -2,7 +2,7 b''
2 <%
2 <%
3 elems = [
3 elems = [
4 (_('Email prefix'), c.rhodecode_ini.get('email_prefix'), ''),
4 (_('Email prefix'), c.rhodecode_ini.get('email_prefix'), ''),
5 (_('RhodeCode email from'), c.rhodecode_ini.get('app_email_from'), ''),
5 (_('Kallithea email from'), c.rhodecode_ini.get('app_email_from'), ''),
6 (_('Error email from'), c.rhodecode_ini.get('error_email_from'), ''),
6 (_('Error email from'), c.rhodecode_ini.get('error_email_from'), ''),
7 (_('Error email recipients'), c.rhodecode_ini.get('email_to'), ''),
7 (_('Error email recipients'), c.rhodecode_ini.get('email_to'), ''),
8
8
@@ -9,7 +9,7 b''
9 </div>
9 </div>
10 <div class="input">
10 <div class="input">
11 ${h.text('rhodecode_title',size=30)}
11 ${h.text('rhodecode_title',size=30)}
12 <span class="help-block">${_('Set a custom title for your RhodeCode Service.')}</span>
12 <span class="help-block">${_('Set a custom title for your Kallithea Service.')}</span>
13 </div>
13 </div>
14 </div>
14 </div>
15
15
@@ -22,7 +22,7 b''
22 ${h.checkbox('hooks',True)}
22 ${h.checkbox('hooks',True)}
23 <label for="hooks"> ${_('Install GIT hooks')} </label>
23 <label for="hooks"> ${_('Install GIT hooks')} </label>
24 </div>
24 </div>
25 <span class="help-block">${_('Verify if RhodeCodes GIT hooks are installed for each repository. Current hooks will be updated to latest version')}</span>
25 <span class="help-block">${_('Verify if Kallitheas GIT hooks are installed for each repository. Current hooks will be updated to latest version')}</span>
26 </div>
26 </div>
27
27
28 </div>
28 </div>
@@ -12,7 +12,7 b''
12 <label for="full_index">${_('Build from scratch')}</label>
12 <label for="full_index">${_('Build from scratch')}</label>
13
13
14 </div>
14 </div>
15 <span class="help-block">${_('This option completely reindex all the files within RhodeCode for proper fulltext search capabilities.')}</span>
15 <span class="help-block">${_('This option completely reindex all the files within Kallithea for proper fulltext search capabilities.')}</span>
16
16
17 </div>
17 </div>
18 </div>
18 </div>
@@ -1,7 +1,7 b''
1 <dl class="dl-horizontal">
1 <dl class="dl-horizontal">
2 <%
2 <%
3 elems = [
3 elems = [
4 (_('RhodeCode version'), h.literal('%s <b><span style="color:#036185; text-decoration: underline;cursor: pointer" id="check_for_update" >%s</span></b>' % (c.kallithea_version, _('check for updates'))), ''),
4 (_('Kallithea version'), h.literal('%s <b><span style="color:#036185; text-decoration: underline;cursor: pointer" id="check_for_update" >%s</span></b>' % (c.kallithea_version, _('check for updates'))), ''),
5 (_('Python version'), c.py_version, ''),
5 (_('Python version'), c.py_version, ''),
6 (_('Platform'), c.platform, ''),
6 (_('Platform'), c.platform, ''),
7 (_('GIT version'), c.git_version, ''),
7 (_('GIT version'), c.git_version, ''),
@@ -10,7 +10,7 b''
10 ${h.checkbox('web_push_ssl', 'True')}
10 ${h.checkbox('web_push_ssl', 'True')}
11 <label for="web_push_ssl">${_('Require SSL for vcs operations')}</label>
11 <label for="web_push_ssl">${_('Require SSL for vcs operations')}</label>
12 </div>
12 </div>
13 <span class="help-block">${_('Activate to set RhodeCode to require SSL for pushing or pulling. If SSL certificate is missing it will return a HTTP Error 406: Not Acceptable.')}</span>
13 <span class="help-block">${_('Activate to set Kallithea to require SSL for pushing or pulling. If SSL certificate is missing it will return a HTTP Error 406: Not Acceptable.')}</span>
14 </div>
14 </div>
15 </div>
15 </div>
16
16
@@ -66,7 +66,7 b''
66 <div class="input">
66 <div class="input">
67 ${h.text('paths_root_path',size=60,readonly="readonly", class_="disabled")}
67 ${h.text('paths_root_path',size=60,readonly="readonly", class_="disabled")}
68 <span id="path_unlock" class="tooltip" style="cursor: pointer"
68 <span id="path_unlock" class="tooltip" style="cursor: pointer"
69 title="${h.tooltip(_('Click to unlock. You must restart RhodeCode in order to make this setting take effect.'))}">
69 title="${h.tooltip(_('Click to unlock. You must restart Kallithea in order to make this setting take effect.'))}">
70 <div class="btn btn-small"><i id="path_unlock_icon" class="icon-lock"></i></div>
70 <div class="btn btn-small"><i id="path_unlock_icon" class="icon-lock"></i></div>
71 </span>
71 </span>
72 <span class="help-block">${_('Filesystem location where repositories should be stored. After changing this value a restart and rescan of the repository folder are required.')}</span>
72 <span class="help-block">${_('Filesystem location where repositories should be stored. After changing this value a restart and rescan of the repository folder are required.')}</span>
@@ -15,13 +15,13 b''
15 <span class="help-block">${_('Allows storing additional customized fields per repository.')}</span>
15 <span class="help-block">${_('Allows storing additional customized fields per repository.')}</span>
16 <div class="checkbox">
16 <div class="checkbox">
17 ${h.checkbox('rhodecode_show_version','True')}
17 ${h.checkbox('rhodecode_show_version','True')}
18 <label for="rhodecode_show_version">${_('Show RhodeCode version')}</label>
18 <label for="rhodecode_show_version">${_('Show Kallithea version')}</label>
19 </div>
19 </div>
20 <span class="help-block">${_('Shows or hides a version number of RhodeCode displayed in the footer.')}</span>
20 <span class="help-block">${_('Shows or hides a version number of Kallithea displayed in the footer.')}</span>
21
21
22 <div class="checkbox">
22 <div class="checkbox">
23 ${h.checkbox('rhodecode_use_gravatar','True')}
23 ${h.checkbox('rhodecode_use_gravatar','True')}
24 <label for="rhodecode_use_gravatar">${_('Use Gravatars in RhodeCode')}</label>
24 <label for="rhodecode_use_gravatar">${_('Use Gravatars in Kallithea')}</label>
25 </div>
25 </div>
26 </div>
26 </div>
27 <div class="field">
27 <div class="field">
@@ -29,20 +29,20 b''
29 ${h.text('rhodecode_gravatar_url', size=80)}
29 ${h.text('rhodecode_gravatar_url', size=80)}
30 <span class="help-block">${_('''Gravatar url allows you to use other avatar server application.
30 <span class="help-block">${_('''Gravatar url allows you to use other avatar server application.
31 Following variables of the URL will be replaced accordingly.
31 Following variables of the URL will be replaced accordingly.
32 {scheme} 'http' or 'https' sent from running RhodeCode server,
32 {scheme} 'http' or 'https' sent from running Kallithea server,
33 {email} user email,
33 {email} user email,
34 {md5email} md5 hash of the user email (like at gravatar.com),
34 {md5email} md5 hash of the user email (like at gravatar.com),
35 {size} size of the image that is expected from the server application,
35 {size} size of the image that is expected from the server application,
36 {netloc} network location/server host of running RhodeCode server''')}</span>
36 {netloc} network location/server host of running Kallithea server''')}</span>
37 </div>
37 </div>
38 </div>
38 </div>
39 <div class="field">
39 <div class="field">
40 <div class="input">
40 <div class="input">
41 ${h.text('rhodecode_clone_uri_tmpl', size=80)}
41 ${h.text('rhodecode_clone_uri_tmpl', size=80)}
42 <span class="help-block">${_('''Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:
42 <span class="help-block">${_('''Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:
43 {scheme} 'http' or 'https' sent from running RhodeCode server,
43 {scheme} 'http' or 'https' sent from running Kallithea server,
44 {user} current user username,
44 {user} current user username,
45 {netloc} network location/server host of running RhodeCode server,
45 {netloc} network location/server host of running Kallithea server,
46 {repo} full repository name,
46 {repo} full repository name,
47 {repoid} ID of repository, can be used to contruct clone-by-id''')}</span>
47 {repoid} ID of repository, can be used to contruct clone-by-id''')}</span>
48 </div>
48 </div>
@@ -6,7 +6,7 b''
6 <div id="header-inner" class="title">
6 <div id="header-inner" class="title">
7 <div id="logo">
7 <div id="logo">
8 <div class="header">
8 <div class="header">
9 <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
9 <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="Kallithea"/></a>
10 </div>
10 </div>
11 %if c.site_name:
11 %if c.site_name:
12 <div class="branding">- ${c.site_name}</div>
12 <div class="branding">- ${c.site_name}</div>
@@ -83,7 +83,7 b''
83 %else:
83 %else:
84
84
85 %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
85 %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
86 <h4>${_('Add or upload files directly via RhodeCode')}</h4>
86 <h4>${_('Add or upload files directly via Kallithea')}</h4>
87 <div style="margin: 20px 30px;">
87 <div style="margin: 20px 30px;">
88 <div id="add_node_id" class="add_node">
88 <div id="add_node_id" class="add_node">
89 <a class="btn btn-mini" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='', anchor='edit')}">${_('Add New File')}</a>
89 <a class="btn btn-mini" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='', anchor='edit')}">${_('Add New File')}</a>
@@ -66,7 +66,7 b''
66 <div class="comment-help">${_('Commenting on line {1}.')}
66 <div class="comment-help">${_('Commenting on line {1}.')}
67 ${(_('Comments parsed using %s syntax with %s support.') % (
67 ${(_('Comments parsed using %s syntax with %s support.') % (
68 ('<a href="%s">RST</a>' % h.url('rst_help')),
68 ('<a href="%s">RST</a>' % h.url('rst_help')),
69 ('<span style="color:#003367" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user'))
69 ('<span style="color:#003367" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this Kallithea user'))
70 )
70 )
71 )|n
71 )|n
72 }
72 }
@@ -152,7 +152,7 b''
152 <div class="comment-help">
152 <div class="comment-help">
153 ${(_('Comments parsed using %s syntax with %s support.') % (('<a href="%s">RST</a>' % h.url('rst_help')),
153 ${(_('Comments parsed using %s syntax with %s support.') % (('<a href="%s">RST</a>' % h.url('rst_help')),
154 '<span style="color:#003367" class="tooltip" title="%s">@mention</span>' %
154 '<span style="color:#003367" class="tooltip" title="%s">@mention</span>' %
155 _('Use @username inside this text to send notification to this RhodeCode user')))|n}
155 _('Use @username inside this text to send notification to this Kallithea user')))|n}
156 %if change_status:
156 %if change_status:
157 | <a id="show_changeset_link" onClick="change_status_show();">
157 | <a id="show_changeset_link" onClick="change_status_show();">
158 %if is_pr:
158 %if is_pr:
@@ -5,5 +5,5 b''
5 --
5 --
6 <br/>
6 <br/>
7 <br/>
7 <br/>
8 <b>${_('This is a notification from RhodeCode.')}</b>
8 <b>${_('This is a notification from Kallithea.')}</b>
9 </div>
9 </div>
@@ -13,7 +13,7 b''
13 <div id="header-inner" class="title">
13 <div id="header-inner" class="title">
14 <div id="logo">
14 <div id="logo">
15 <div class="header">
15 <div class="header">
16 <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
16 <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="Kallithea"/></a>
17 </div>
17 </div>
18 %if c.site_name:
18 %if c.site_name:
19 <div class="branding">- ${c.site_name}</div>
19 <div class="branding">- ${c.site_name}</div>
@@ -13,7 +13,7 b''
13 <div id="header-inner" class="title">
13 <div id="header-inner" class="title">
14 <div id="logo">
14 <div id="logo">
15 <div class="header">
15 <div class="header">
16 <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
16 <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="Kallithea"/></a>
17 </div>
17 </div>
18 %if c.site_name:
18 %if c.site_name:
19 <div class="branding">- ${c.site_name}</div>
19 <div class="branding">- ${c.site_name}</div>
@@ -11,7 +11,7 b''
11 <div id="header-inner" class="title">
11 <div id="header-inner" class="title">
12 <div id="logo">
12 <div id="logo">
13 <div class="header">
13 <div class="header">
14 <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a>
14 <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="Kallithea"/></a>
15 </div>
15 </div>
16 %if c.site_name:
16 %if c.site_name:
17 <div class="branding">- ${c.site_name}</div>
17 <div class="branding">- ${c.site_name}</div>
@@ -1076,7 +1076,7 b' class BaseTestApi(object):'
1076 owner=owner)
1076 owner=owner)
1077 response = api_call(self, params)
1077 response = api_call(self, params)
1078
1078
1079 expected = 'Only RhodeCode admin can specify `owner` param'
1079 expected = 'Only Kallithea admin can specify `owner` param'
1080 self._compare_error(id_, expected, given=response.body)
1080 self._compare_error(id_, expected, given=response.body)
1081 fixture.destroy_repo(repo_name)
1081 fixture.destroy_repo(repo_name)
1082
1082
@@ -1285,7 +1285,7 b' class BaseTestApi(object):'
1285 owner=TEST_USER_ADMIN_LOGIN,
1285 owner=TEST_USER_ADMIN_LOGIN,
1286 )
1286 )
1287 response = api_call(self, params)
1287 response = api_call(self, params)
1288 expected = 'Only RhodeCode admin can specify `owner` param'
1288 expected = 'Only Kallithea admin can specify `owner` param'
1289 self._compare_error(id_, expected, given=response.body)
1289 self._compare_error(id_, expected, given=response.body)
1290 fixture.destroy_repo(fork_name)
1290 fixture.destroy_repo(fork_name)
1291
1291
@@ -151,7 +151,7 b' class TestGistsController(TestController'
151 gist = _create_gist('gist-show-me')
151 gist = _create_gist('gist-show-me')
152 response = self.app.get(url('gist', gist_id=gist.gist_access_id))
152 response = self.app.get(url('gist', gist_id=gist.gist_access_id))
153 response.mustcontain('added file: gist-show-me<')
153 response.mustcontain('added file: gist-show-me<')
154 response.mustcontain('test_admin (RhodeCode Admin) - created')
154 response.mustcontain('test_admin (Kallithea Admin) - created')
155 response.mustcontain('gist-desc')
155 response.mustcontain('gist-desc')
156 response.mustcontain('<div class="btn btn-mini btn-success disabled">Public Gist</div>')
156 response.mustcontain('<div class="btn btn-mini btn-success disabled">Public Gist</div>')
157
157
@@ -76,8 +76,8 b' class TestAdminSettingsController(TestCo'
76
76
77 def test_ga_code_active(self):
77 def test_ga_code_active(self):
78 self.log_user()
78 self.log_user()
79 old_title = 'RhodeCode'
79 old_title = 'Kallithea'
80 old_realm = 'RhodeCode authentication'
80 old_realm = 'Kallithea authentication'
81 new_ga_code = 'ga-test-123456789'
81 new_ga_code = 'ga-test-123456789'
82 response = self.app.post(url('admin_settings_global'),
82 response = self.app.post(url('admin_settings_global'),
83 params=dict(rhodecode_title=old_title,
83 params=dict(rhodecode_title=old_title,
@@ -97,8 +97,8 b' class TestAdminSettingsController(TestCo'
97
97
98 def test_ga_code_inactive(self):
98 def test_ga_code_inactive(self):
99 self.log_user()
99 self.log_user()
100 old_title = 'RhodeCode'
100 old_title = 'Kallithea'
101 old_realm = 'RhodeCode authentication'
101 old_realm = 'Kallithea authentication'
102 new_ga_code = ''
102 new_ga_code = ''
103 response = self.app.post(url('admin_settings_global'),
103 response = self.app.post(url('admin_settings_global'),
104 params=dict(rhodecode_title=old_title,
104 params=dict(rhodecode_title=old_title,
@@ -117,8 +117,8 b' class TestAdminSettingsController(TestCo'
117
117
118 def test_captcha_activate(self):
118 def test_captcha_activate(self):
119 self.log_user()
119 self.log_user()
120 old_title = 'RhodeCode'
120 old_title = 'Kallithea'
121 old_realm = 'RhodeCode authentication'
121 old_realm = 'Kallithea authentication'
122 new_ga_code = ''
122 new_ga_code = ''
123 response = self.app.post(url('admin_settings_global'),
123 response = self.app.post(url('admin_settings_global'),
124 params=dict(rhodecode_title=old_title,
124 params=dict(rhodecode_title=old_title,
@@ -137,8 +137,8 b' class TestAdminSettingsController(TestCo'
137
137
138 def test_captcha_deactivate(self):
138 def test_captcha_deactivate(self):
139 self.log_user()
139 self.log_user()
140 old_title = 'RhodeCode'
140 old_title = 'Kallithea'
141 old_realm = 'RhodeCode authentication'
141 old_realm = 'Kallithea authentication'
142 new_ga_code = ''
142 new_ga_code = ''
143 response = self.app.post(url('admin_settings_global'),
143 response = self.app.post(url('admin_settings_global'),
144 params=dict(rhodecode_title=old_title,
144 params=dict(rhodecode_title=old_title,
@@ -157,9 +157,9 b' class TestAdminSettingsController(TestCo'
157
157
158 def test_title_change(self):
158 def test_title_change(self):
159 self.log_user()
159 self.log_user()
160 old_title = 'RhodeCode'
160 old_title = 'Kallithea'
161 new_title = old_title + '_changed'
161 new_title = old_title + '_changed'
162 old_realm = 'RhodeCode authentication'
162 old_realm = 'Kallithea authentication'
163
163
164 for new_title in ['Changed', 'Żółwik', old_title]:
164 for new_title in ['Changed', 'Żółwik', old_title]:
165 response = self.app.post(url('admin_settings_global'),
165 response = self.app.post(url('admin_settings_global'),
@@ -221,7 +221,7 b' class TestLoginController(TestController'
221 'lastname': lastname,
221 'lastname': lastname,
222 'admin': True}) # This should be overriden
222 'admin': True}) # This should be overriden
223 self.assertEqual(response.status, '302 Found')
223 self.assertEqual(response.status, '302 Found')
224 self.checkSessionFlash(response, 'You have successfully registered into RhodeCode')
224 self.checkSessionFlash(response, 'You have successfully registered into Kallithea')
225
225
226 ret = Session().query(User).filter(User.username == 'test_regular4').one()
226 ret = Session().query(User).filter(User.username == 'test_regular4').one()
227 self.assertEqual(ret.username, username)
227 self.assertEqual(ret.username, username)
@@ -15,7 +15,7 b''
15 kallithea.tests.test_libs
15 kallithea.tests.test_libs
16 ~~~~~~~~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~~~~~~~~
17
17
18 Package for testing various lib/helper functions in rhodecode
18 Package for testing various lib/helper functions in kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -61,5 +61,5 b' PACKAGE_DIR = os.path.abspath(os.path.jo'
61 shutil.copy(jn(THIS, 'aconfig'), _dest)
61 shutil.copy(jn(THIS, 'aconfig'), _dest)
62 TEST_USER_CONFIG_FILE = _dest
62 TEST_USER_CONFIG_FILE = _dest
63
63
64 #overide default configurations with rhodecode ones
64 #overide default configurations with kallithea ones
65 from kallithea.tests import *
65 from kallithea.tests import *
@@ -15,7 +15,7 b''
15 kallithea.websetup
15 kallithea.websetup
16 ~~~~~~~~~~~~~~~~~~
16 ~~~~~~~~~~~~~~~~~~
17
17
18 Weboperations and setup for rhodecode
18 Weboperations and setup for kallithea
19
19
20 This file was forked by the Kallithea project in July 2014.
20 This file was forked by the Kallithea project in July 2014.
21 Original author and date, and relevant copyright and licensing information is below:
21 Original author and date, and relevant copyright and licensing information is below:
@@ -36,7 +36,7 b' log = logging.getLogger(__name__)'
36
36
37
37
38 def setup_app(command, conf, vars):
38 def setup_app(command, conf, vars):
39 """Place any commands to setup rhodecode here"""
39 """Place any commands to setup kallithea here"""
40 dbconf = conf['sqlalchemy.db1.url']
40 dbconf = conf['sqlalchemy.db1.url']
41 dbmanage = DbManage(log_sql=True, dbconf=dbconf, root=conf['here'],
41 dbmanage = DbManage(log_sql=True, dbconf=dbconf, root=conf['here'],
42 tests=False, cli_args=command.options.__dict__)
42 tests=False, cli_args=command.options.__dict__)
@@ -1,6 +1,6 b''
1 ################################################################################
1 ################################################################################
2 ################################################################################
2 ################################################################################
3 # RhodeCode - Pylons environment configuration #
3 # Kallithea - Pylons environment configuration #
4 # #
4 # #
5 # The %(here)s variable will be replaced with the parent directory of this file#
5 # The %(here)s variable will be replaced with the parent directory of this file#
6 ################################################################################
6 ################################################################################
@@ -11,13 +11,13 b' pdebug = false'
11 ################################################################################
11 ################################################################################
12 ## Uncomment and replace with the address which should receive ##
12 ## Uncomment and replace with the address which should receive ##
13 ## any error reports after application crash ##
13 ## any error reports after application crash ##
14 ## Additionally those settings will be used by RhodeCode mailing system ##
14 ## Additionally those settings will be used by Kallithea mailing system ##
15 ################################################################################
15 ################################################################################
16 #email_to = admin@localhost
16 #email_to = admin@localhost
17 #error_email_from = paste_error@localhost
17 #error_email_from = paste_error@localhost
18 #app_email_from = kallithea-noreply@localhost
18 #app_email_from = kallithea-noreply@localhost
19 #error_message =
19 #error_message =
20 #email_prefix = [RhodeCode]
20 #email_prefix = [Kallithea]
21
21
22 #smtp_server = mail.server.com
22 #smtp_server = mail.server.com
23 #smtp_username =
23 #smtp_username =
@@ -161,7 +161,7 b' cut_off_limit = 256000'
161 ## use cache version of scm repo everywhere
161 ## use cache version of scm repo everywhere
162 vcs_full_cache = true
162 vcs_full_cache = true
163
163
164 ## force https in RhodeCode, fixes https redirects, assumes it's always https
164 ## force https in Kallithea, fixes https redirects, assumes it's always https
165 force_https = false
165 force_https = false
166
166
167 ## use Strict-Transport-Security headers
167 ## use Strict-Transport-Security headers
@@ -192,7 +192,7 b' show_revision_number = true'
192 ## gist URL alias, used to create nicer urls for gist. This should be an
192 ## gist URL alias, used to create nicer urls for gist. This should be an
193 ## url that does rewrites to _admin/gists/<gistid>.
193 ## url that does rewrites to _admin/gists/<gistid>.
194 ## example: http://gist.kallithea.server/{gistid}. Empty means use the internal
194 ## example: http://gist.kallithea.server/{gistid}. Empty means use the internal
195 ## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid>
195 ## Kallithea url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid>
196 gist_alias_url =
196 gist_alias_url =
197
197
198 ## white list of API enabled controllers. This allows to add list of
198 ## white list of API enabled controllers. This allows to add list of
@@ -212,8 +212,8 b' api_access_controllers_whitelist ='
212 ## {email} user email
212 ## {email} user email
213 ## {md5email} md5 hash of the user email (like at gravatar.com)
213 ## {md5email} md5 hash of the user email (like at gravatar.com)
214 ## {size} size of the image that is expected from the server application
214 ## {size} size of the image that is expected from the server application
215 ## {scheme} http/https from RhodeCode server
215 ## {scheme} http/https from Kallithea server
216 ## {netloc} network location from RhodeCode server
216 ## {netloc} network location from Kallithea server
217 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
217 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
218 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
218 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
219
219
@@ -236,7 +236,7 b' default_encoding = utf8'
236
236
237 #clone_uri = {scheme}://{user}{pass}{netloc}{path}
237 #clone_uri = {scheme}://{user}{pass}{netloc}{path}
238
238
239 ## issue tracker for RhodeCode (leave blank to disable, absent for default)
239 ## issue tracker for Kallithea (leave blank to disable, absent for default)
240 #bugtracker = https://bitbucket.org/conservancy/kallithea/issues
240 #bugtracker = https://bitbucket.org/conservancy/kallithea/issues
241
241
242 ## issue tracking mapping for commits messages
242 ## issue tracking mapping for commits messages
@@ -400,7 +400,7 b' beaker.session.auto = False'
400 ### [errormator] ###
400 ### [errormator] ###
401 ####################
401 ####################
402
402
403 ## Errormator is tailored to work with RhodeCode, see
403 ## Errormator is tailored to work with Kallithea, see
404 ## http://errormator.com for details how to obtain an account
404 ## http://errormator.com for details how to obtain an account
405 ## you must install python package `errormator_client` to make it work
405 ## you must install python package `errormator_client` to make it work
406
406
@@ -4,7 +4,7 b' import sys'
4 import platform
4 import platform
5
5
6 if sys.version_info < (2, 5):
6 if sys.version_info < (2, 5):
7 raise Exception('RhodeCode requires python 2.5 or later')
7 raise Exception('Kallithea requires python 2.5 or later')
8
8
9
9
10 here = os.path.abspath(os.path.dirname(__file__))
10 here = os.path.abspath(os.path.dirname(__file__))
@@ -97,7 +97,7 b' data_files = []'
97 # additional files that goes into package itself
97 # additional files that goes into package itself
98 package_data = {'kallithea': ['i18n/*/LC_MESSAGES/*.mo', ], }
98 package_data = {'kallithea': ['i18n/*/LC_MESSAGES/*.mo', ], }
99
99
100 description = ('RhodeCode is a fast and powerful management tool '
100 description = ('Kallithea is a fast and powerful management tool '
101 'for Mercurial and GIT with a built in push/pull server, '
101 'for Mercurial and GIT with a built in push/pull server, '
102 'full text search and code-review.')
102 'full text search and code-review.')
103
103
@@ -131,7 +131,7 b' except ImportError:'
131 packages = find_packages(exclude=['ez_setup'])
131 packages = find_packages(exclude=['ez_setup'])
132
132
133 setup(
133 setup(
134 name='RhodeCode',
134 name='Kallithea',
135 version=__version__,
135 version=__version__,
136 description=description,
136 description=description,
137 long_description=long_description,
137 long_description=long_description,
@@ -1,6 +1,6 b''
1 ################################################################################
1 ################################################################################
2 ################################################################################
2 ################################################################################
3 # RhodeCode - Pylons environment configuration #
3 # Kallithea - Pylons environment configuration #
4 # #
4 # #
5 # The %(here)s variable will be replaced with the parent directory of this file#
5 # The %(here)s variable will be replaced with the parent directory of this file#
6 ################################################################################
6 ################################################################################
@@ -11,13 +11,13 b' pdebug = false'
11 ################################################################################
11 ################################################################################
12 ## Uncomment and replace with the address which should receive ##
12 ## Uncomment and replace with the address which should receive ##
13 ## any error reports after application crash ##
13 ## any error reports after application crash ##
14 ## Additionally those settings will be used by RhodeCode mailing system ##
14 ## Additionally those settings will be used by Kallithea mailing system ##
15 ################################################################################
15 ################################################################################
16 #email_to = admin@localhost
16 #email_to = admin@localhost
17 #error_email_from = paste_error@localhost
17 #error_email_from = paste_error@localhost
18 #app_email_from = kallithea-noreply@localhost
18 #app_email_from = kallithea-noreply@localhost
19 #error_message =
19 #error_message =
20 #email_prefix = [RhodeCode]
20 #email_prefix = [Kallithea]
21
21
22 #smtp_server = mail.server.com
22 #smtp_server = mail.server.com
23 #smtp_username =
23 #smtp_username =
@@ -84,7 +84,7 b' cut_off_limit = 256000'
84 ## use cache version of scm repo everywhere
84 ## use cache version of scm repo everywhere
85 vcs_full_cache = false
85 vcs_full_cache = false
86
86
87 ## force https in RhodeCode, fixes https redirects, assumes it's always https
87 ## force https in Kallithea, fixes https redirects, assumes it's always https
88 force_https = false
88 force_https = false
89
89
90 ## use Strict-Transport-Security headers
90 ## use Strict-Transport-Security headers
@@ -121,8 +121,8 b' show_revision_number = true'
121 ## {email} user email
121 ## {email} user email
122 ## {md5email} md5 hash of the user email (like at gravatar.com)
122 ## {md5email} md5 hash of the user email (like at gravatar.com)
123 ## {size} size of the image that is expected from the server application
123 ## {size} size of the image that is expected from the server application
124 ## {scheme} http/https from RhodeCode server
124 ## {scheme} http/https from Kallithea server
125 ## {netloc} network location from RhodeCode server
125 ## {netloc} network location from Kallithea server
126 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
126 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
127 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
127 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
128
128
@@ -298,7 +298,7 b' beaker.session.auto = False'
298 ### [errormator] ###
298 ### [errormator] ###
299 ####################
299 ####################
300
300
301 ## Errormator is tailored to work with RhodeCode, see
301 ## Errormator is tailored to work with Kallithea, see
302 ## http://errormator.com for details how to obtain an account
302 ## http://errormator.com for details how to obtain an account
303 ## you must install python package `errormator_client` to make it work
303 ## you must install python package `errormator_client` to make it work
304
304
General Comments 0
You need to be logged in to leave comments. Login now