Mercurial > kallithea
changeset 8538:8811e5208599 i18n
Merge from stable
line wrap: on
line diff
--- a/.hgtags Mon Dec 21 01:13:25 2020 +0100 +++ b/.hgtags Wed May 12 01:33:29 2021 +0200 @@ -78,3 +78,5 @@ aa0a637fa6f635a5e024fa56b19ed2a2dacca857 0.5.2 9f5ca9088067618d79129d224c35c818bd2d2f12 0.6.0 a22edac2be58eaf68d1940d4dfeb88fadbabb43a 0.6.1 +22bfca5da6f56738f6220d24bb6ce2f9bc4f9b1e 0.6.2 +213450cbdc11fff8508ba25101dc05ab74048e55 0.6.3
--- a/CONTRIBUTORS Mon Dec 21 01:13:25 2020 +0100 +++ b/CONTRIBUTORS Wed May 12 01:33:29 2021 +0200 @@ -6,6 +6,7 @@ Allan Nordhøy <epost@anotheragency.no> 2017-2020 Anton Schur <tonich.sh@gmail.com> 2017 2020 ssantos <ssantos@web.de> 2018-2020 + Manuel Jacob <me@manueljacob.de> 2019-2020 Private <adamantine.sword@gmail.com> 2019-2020 David Ignjić <ignjic@gmail.com> 2020 Dennis Fink <dennis.fink@c3l.lu> 2020 @@ -21,7 +22,6 @@ Elizabeth Sherrock <lizzyd710@gmail.com> 2019 Hüseyin Tunç <huseyin.tunc@bulutfon.com> 2019 leela <53352@protonmail.com> 2019 - Manuel Jacob <me@manueljacob.de> 2019 Mateusz Mendel <mendelm9@gmail.com> 2019 Nathan <bonnemainsnathan@gmail.com> 2019 Oleksandr Shtalinberg <o.shtalinberg@gmail.com> 2019
--- a/README.rst Mon Dec 21 01:13:25 2020 +0100 +++ b/README.rst Wed May 12 01:33:29 2021 +0200 @@ -135,9 +135,8 @@ - Follow Kallithea on Twitter, **@KallitheaSCM**. -- The `old issue tracker <https://bitbucket.org/conservancy/kallithea/issues>`_ - is defunct after it was deleted by Bitbucket_. For now, please report issues - on the mailing list. +- Please report issues on the mailing list. An archive of the old issue tracker + is available at: https://kallithea-scm.org/bitbucket-archive/issues/index.html .. note::
--- a/development.ini Mon Dec 21 01:13:25 2020 +0100 +++ b/development.ini Wed May 12 01:33:29 2021 +0200 @@ -259,7 +259,7 @@ ## Example: use the message queue on the local virtual host 'kallitheavhost' as the RabbitMQ user 'kallithea': celery.broker_url = amqp://kallithea:thepassword@localhost:5672/kallitheavhost -celery.result.backend = db+sqlite:///celery-results.db +celery.result_backend = db+sqlite:///celery-results.db #celery.amqp.task.result.expires = 18000
--- a/docs/contributing.rst Mon Dec 21 01:13:25 2020 +0100 +++ b/docs/contributing.rst Wed May 12 01:33:29 2021 +0200 @@ -15,9 +15,7 @@ https://kallithea-scm.org/repos/kallithea/, our self-hosted instance of Kallithea. -For now, we use Bitbucket_ for `pull requests`_ and `issue tracking`_. The -issue tracker is for tracking bugs, not for support, discussion, or ideas -- -please use the `mailing list`_ or :ref:`IRC <readme>` to reach the community. +Please use the `mailing list`_ to send patches or report issues. We use Weblate_ to translate the user interface messages into languages other than English. Join our project on `Hosted Weblate`_ to help us. @@ -42,11 +40,6 @@ gearbox serve -c my.ini --reload & firefox http://127.0.0.1:5000/ -If you plan to use Bitbucket_ for sending contributions, you can also fork -Kallithea on Bitbucket_ first (https://bitbucket.org/conservancy/kallithea) and -then replace the clone step above by a clone of your fork. In this case, please -see :ref:`contributing-guidelines` below for configuring your fork correctly. - Contribution flow ----------------- @@ -73,8 +66,7 @@ ./scripts/run-all-cleanup When you are completely ready, you can send your changes to the community for -review and inclusion. Most commonly used methods are sending patches to the -mailing list (via ``hg email``) or by creating a pull request on Bitbucket_. +review and inclusion, via the mailing list (via ``hg email``). .. _contributing-tests: @@ -155,18 +147,9 @@ lot about preservation of copyright and license information for existing code that is brought into the project. -Contributions will be accepted in most formats -- such as pull requests on -Bitbucket, something hosted on your own Kallithea instance, or patches sent by +Contributions will be accepted in most formats -- such as commits hosted on your own Kallithea instance, or patches sent by email to the `kallithea-general`_ mailing list. -When contributing via Bitbucket, please make your fork of -https://bitbucket.org/conservancy/kallithea/ `non-publishing`_ -- it is one of -the settings on "Repository details" page. This ensures your commits are in -"draft" phase and makes it easier for you to address feedback and for project -maintainers to integrate your changes. - -.. _non-publishing: https://www.mercurial-scm.org/wiki/Phases#Publishing_Repository - Make sure to test your changes both manually and with the automatic tests before posting. @@ -300,26 +283,14 @@ ``pip``) and restart Kallithea (in debug mode). -"Roadmap" ---------- - -We do not have a road map but are waiting for your contributions. Refer to the -wiki_ for some ideas of places we might want to go -- contributions in these -areas are very welcome. - - Thank you for your contribution! -------------------------------- .. _Weblate: http://weblate.org/ -.. _issue tracking: https://bitbucket.org/conservancy/kallithea/issues?status=new&status=open -.. _pull requests: https://bitbucket.org/conservancy/kallithea/pull-requests -.. _bitbucket: http://bitbucket.org/ .. _mailing list: http://lists.sfconservancy.org/mailman/listinfo/kallithea-general .. _kallithea-general: http://lists.sfconservancy.org/mailman/listinfo/kallithea-general .. _Hosted Weblate: https://hosted.weblate.org/projects/kallithea/kallithea/ -.. _wiki: https://bitbucket.org/conservancy/kallithea/wiki/Home .. _DebugBar: https://github.com/TurboGears/tgext.debugbar .. _Quick Start: https://www.mercurial-scm.org/wiki/QuickStart .. _Beginners Guide: https://www.mercurial-scm.org/wiki/BeginnersGuides
--- a/docs/index.rst Mon Dec 21 01:13:25 2020 +0100 +++ b/docs/index.rst Wed May 12 01:33:29 2021 +0200 @@ -81,7 +81,6 @@ .. _python: http://www.python.org/ .. _django: http://www.djangoproject.com/ .. _mercurial: https://www.mercurial-scm.org/ -.. _bitbucket: http://bitbucket.org/ .. _subversion: http://subversion.tigris.org/ .. _git: http://git-scm.com/ .. _celery: http://celeryproject.org/
--- a/kallithea/__init__.py Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/__init__.py Wed May 12 01:33:29 2021 +0200 @@ -34,7 +34,7 @@ if sys.version_info < (3, 6): raise Exception('Kallithea requires python 3.6 or later') -VERSION = (0, 6, 1) +VERSION = (0, 6, 3) BACKENDS = { 'hg': 'Mercurial repository', 'git': 'Git repository',
--- a/kallithea/bin/kallithea_cli_front_end.py Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/bin/kallithea_cli_front_end.py Wed May 12 01:33:29 2021 +0200 @@ -57,7 +57,7 @@ '-f', 'html', '-a', '.code-highlight'], stdout=f) - lesscpath = os.path.join(front_end_dir, 'node_modules', '.bin', 'lessc') + lesscpath = os.path.join(front_end_dir, 'node_modules', 'less', 'bin', 'lessc') lesspath = os.path.join(front_end_dir, 'main.less') csspath = os.path.join(public_dir, 'css', 'style.css') subprocess.check_call([lesscpath, '--source-map', @@ -91,7 +91,7 @@ shutil.copytree(os.path.join(front_end_dir, 'node_modules', 'codemirror'), os.path.join(public_dir, 'codemirror')) click.echo("Generating LICENSES.txt") - license_checker_path = os.path.join(front_end_dir, 'node_modules', '.bin', 'license-checker') + license_checker_path = os.path.join(front_end_dir, 'node_modules', 'license-checker', 'bin', 'license-checker') check_licensing_json_path = os.path.join(tmp_dir, 'licensing.json') licensing_txt_path = os.path.join(public_dir, 'LICENSES.txt') subprocess.check_call([license_checker_path, '--json', '--out', check_licensing_json_path],
--- a/kallithea/controllers/admin/repo_groups.py Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/controllers/admin/repo_groups.py Wed May 12 01:33:29 2021 +0200 @@ -117,7 +117,7 @@ children_groups = [g.name for g in repo_gr.parents] + [repo_gr.name] repo_count = repo_gr.repositories.count() repo_groups_data.append({ - "raw_name": repo_gr.group_name, + "raw_name": h.escape(repo_gr.group_name), "group_name": repo_group_name(repo_gr.group_name, children_groups), "desc": h.escape(repo_gr.group_description), "repos": repo_count, @@ -174,14 +174,14 @@ raise HTTPFound(location=url('repos_group_home', group_name=gr.group_name)) def new(self): + parent_group_id = safe_int(request.GET.get('parent_group') or '-1') if HasPermissionAny('hg.admin')('group create'): # we're global admin, we're ok and we can create TOP level groups pass else: # we pass in parent group into creation form, thus we know # what would be the group, we can check perms here ! - group_id = safe_int(request.GET.get('parent_group')) - group = RepoGroup.get(group_id) if group_id else None + group = RepoGroup.get(parent_group_id) if parent_group_id else None group_name = group.group_name if group else None if HasRepoGroupPermissionLevel('admin')(group_name, 'group create'): pass @@ -189,7 +189,13 @@ raise HTTPForbidden() self.__load_defaults() - return render('admin/repo_groups/repo_group_add.html') + return htmlfill.render( + render('admin/repo_groups/repo_group_add.html'), + defaults={'parent_group_id': parent_group_id}, + errors={}, + prefix_error=False, + encoding="UTF-8", + force_defaults=False) @HasRepoGroupPermissionLevelDecorator('admin') def update(self, group_name):
--- a/kallithea/controllers/admin/repos.py Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/controllers/admin/repos.py Wed May 12 01:33:29 2021 +0200 @@ -157,7 +157,9 @@ if prg is None or not any(rgc[0] == prg.group_id for rgc in c.repo_groups): raise HTTPForbidden - defaults.update({'repo_group': parent_group}) + else: + parent_group = '-1' + defaults.update({'repo_group': parent_group}) return htmlfill.render( render('admin/repos/repo_add.html'),
--- a/kallithea/controllers/api/api.py Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/controllers/api/api.py Wed May 12 01:33:29 2021 +0200 @@ -1167,7 +1167,7 @@ 'failed to get repo: `%s` nodes' % repo.repo_name ) - @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository') + # permission check inside def create_repo(self, repo_name, owner=Optional(OAttr('apiuser')), repo_type=Optional('hg'), description=Optional(''), private=Optional(False), clone_uri=Optional(None), @@ -1224,6 +1224,19 @@ } """ + group_name = None + repo_name_parts = repo_name.split('/') + if len(repo_name_parts) > 1: + group_name = '/'.join(repo_name_parts[:-1]) + repo_group = RepoGroup.get_by_group_name(group_name) + if repo_group is None: + raise JSONRPCError("repo group `%s` not found" % group_name) + if not(HasPermissionAny('hg.admin')() or HasRepoGroupPermissionLevel('write')(group_name)): + raise JSONRPCError("no permission to create repo in %s" % group_name) + else: + if not HasPermissionAny('hg.admin', 'hg.create.repository')(): + raise JSONRPCError("no permission to create top level repo") + if not HasPermissionAny('hg.admin')(): if not isinstance(owner, Optional): # forbid setting owner for non-admins @@ -1254,13 +1267,6 @@ copy_permissions = Optional.extract(copy_permissions) try: - repo_name_parts = repo_name.split('/') - repo_group = None - if len(repo_name_parts) > 1: - group_name = '/'.join(repo_name_parts[:-1]) - repo_group = RepoGroup.get_by_group_name(group_name) - if repo_group is None: - raise JSONRPCError("repo group `%s` not found" % group_name) data = dict( repo_name=repo_name_parts[-1], repo_name_full=repo_name, @@ -1269,14 +1275,14 @@ owner=owner, repo_private=private, clone_uri=clone_uri, - repo_group=repo_group, + repo_group=group_name, repo_landing_rev=landing_rev, enable_statistics=enable_statistics, enable_downloads=enable_downloads, repo_copy_permissions=copy_permissions, ) - task = RepoModel().create(form_data=data, cur_user=owner) + task = RepoModel().create(form_data=data, cur_user=owner.username) task_id = task.task_id # no commit, it's done in RepoModel, or async via celery return dict( @@ -1319,10 +1325,10 @@ if not HasRepoPermissionLevel('admin')(repo.repo_name): raise JSONRPCError('repository `%s` does not exist' % (repoid,)) - if (name != repo.repo_name and + if (name != repo.repo_name and repo.group_id is None and not HasPermissionAny('hg.create.repository')() ): - raise JSONRPCError('no permission to create (or move) repositories') + raise JSONRPCError('no permission to create (or move) top level repositories') if not isinstance(owner, Optional): # forbid setting owner for non-admins @@ -1333,7 +1339,10 @@ updates = {} repo_group = group if not isinstance(repo_group, Optional): - repo_group = get_repo_group_or_error(repo_group) + repo_group = get_repo_group_or_error(repo_group) # TODO: repos can thus currently not be moved to root + if repo_group.group_id != repo.group_id: + if not(HasPermissionAny('hg.admin')() or HasRepoGroupPermissionLevel('write')(repo_group.group_name)): + raise JSONRPCError("no permission to create (or move) repo in %s" % repo_group.group_name) repo_group = repo_group.group_id try: store_update(updates, name, 'repo_name') @@ -1356,6 +1365,7 @@ log.error(traceback.format_exc()) raise JSONRPCError('failed to update repo `%s`' % repoid) + # permission check inside @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository') def fork_repo(self, repoid, fork_name, owner=Optional(OAttr('apiuser')), @@ -1410,6 +1420,19 @@ type_ = 'fork' if _repo.fork else 'repo' raise JSONRPCError("%s `%s` already exist" % (type_, fork_name)) + group_name = None + fork_name_parts = fork_name.split('/') + if len(fork_name_parts) > 1: + group_name = '/'.join(fork_name_parts[:-1]) + repo_group = RepoGroup.get_by_group_name(group_name) + if repo_group is None: + raise JSONRPCError("repo group `%s` not found" % group_name) + if not(HasPermissionAny('hg.admin')() or HasRepoGroupPermissionLevel('write')(group_name)): + raise JSONRPCError("no permission to create repo in %s" % group_name) + else: + if not HasPermissionAny('hg.admin', 'hg.create.repository')(): + raise JSONRPCError("no permission to create top level repo") + if HasPermissionAny('hg.admin')(): pass elif HasRepoPermissionLevel('read')(repo.repo_name): @@ -1418,9 +1441,6 @@ raise JSONRPCError( 'Only Kallithea admin can specify `owner` param' ) - - if not HasPermissionAny('hg.create.repository')(): - raise JSONRPCError('no permission to create repositories') else: raise JSONRPCError('repository `%s` does not exist' % (repoid,)) @@ -1430,18 +1450,10 @@ owner = get_user_or_error(owner) try: - fork_name_parts = fork_name.split('/') - repo_group = None - if len(fork_name_parts) > 1: - group_name = '/'.join(fork_name_parts[:-1]) - repo_group = RepoGroup.get_by_group_name(group_name) - if repo_group is None: - raise JSONRPCError("repo group `%s` not found" % group_name) - form_data = dict( repo_name=fork_name_parts[-1], repo_name_full=fork_name, - repo_group=repo_group, + repo_group=group_name, repo_type=repo.repo_type, description=Optional.extract(description), private=Optional.extract(private), @@ -1450,7 +1462,7 @@ update_after_clone=False, fork_parent_id=repo.repo_id, ) - task = RepoModel().create_fork(form_data, cur_user=owner) + task = RepoModel().create_fork(form_data, cur_user=owner.username) # no commit, it's done in RepoModel, or async via celery task_id = task.task_id return dict(
--- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2017-08-20 10:44+0000\n" "Last-Translator: Viktar Vauchkevich <victorenator@gmail.com>\n" "Language-Team: Belarusian <https://hosted.weblate.org/projects/kallithea/" @@ -705,11 +705,11 @@ msgid "Allowed with automatic account activation" msgstr "Дазволена, з аўтаматычнай актывацыяй уліковага запісу" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "Ручная актывацыя вонкавага ўліковага запісу" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "Аўтаматычная актывацыя вонкавага ўліковага запісу" @@ -741,48 +741,48 @@ msgid "Created repository group %s" msgstr "Створаная новая група рэпазітароў %s" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "Група рэпазітароў %s абноўленая" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Адбылася памылка пры абнаўленні групы рэпазітароў %s" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Група ўтрымлівае %s рэпазітароў і не можа быць выдаленая" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Група ўтрымлівае ў сабе %s падгруп і не можа быць выдаленая" -#: kallithea/controllers/admin/repo_groups.py:258 +#: kallithea/controllers/admin/repo_groups.py:264 #, python-format msgid "Removed repository group %s" msgstr "Група рэпазітароў %s выдаленая" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Памылка пры выдаленні групы рэпазітароў %s" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "Адміністратар не можа адклікаць свае прывелеі" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "Прывілеі групы рэпазітароў абноўленыя" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "Памылка пры водгуку прывелея" @@ -792,109 +792,109 @@ msgid "Error creating repository %s" msgstr "Памылка пры стварэнні рэпазітара %s" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "Рэпазітар %s створаны з %s" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "Зроблены форк рэпазітара %s на %s" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Рэпазітар %s створаны" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Рэпазітар %s паспяхова абноўлены" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Памылка падчас абнаўлення рэпазітара %s" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "Форкі %s адлучаныя" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "Выдаленыя форки рэпазітара %s" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Рэпазітар %s выдалены" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Немагчыма выдаліць %s, ён усё яшчэ мае форкі" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "Памылка падчас выдалення %s" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Прывілеі рэпазітара абноўленыя" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, fuzzy, python-format #| msgid "An error occurred during creation of field" msgid "An error occurred during creation of field: %r" msgstr "Памылка пры стварэнні поля" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "Памылка пры выдаленні поля" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "-- Не форк --" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "Бачнасць рэпазітара ў публічным часопісе абноўлена" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "Памылка пры даданні рэпазітара ў агульнадаступны часопіс" -#: kallithea/controllers/admin/repos.py:467 +#: kallithea/controllers/admin/repos.py:469 msgid "Nothing" msgstr "Нічога" -#: kallithea/controllers/admin/repos.py:469 +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Рэпазітар %s адзначаны як форк %s" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "Памылка пры выкананні аперацыі" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "Занесеныя змены з аддаленага рэпазітара" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "Памылка пры занясенні змен з аддаленага рэпазітара" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "Адбылася памылка пры выдаленні статыстыкі рэпазітара" @@ -1380,133 +1380,133 @@ msgid "[Mention]" msgstr "[Згадванне]" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "верхні ўзровень" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "Адміністратар Kallithea" -#: kallithea/model/db.py:1544 +#: kallithea/model/db.py:1545 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1545 -#, fuzzy -msgid "Default user has read access to new repositories" -msgstr "Несанкцыянаваны доступ да рэсурсу" - #: kallithea/model/db.py:1546 #, fuzzy -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "Несанкцыянаваны доступ да рэсурсу" #: kallithea/model/db.py:1547 +#, fuzzy +msgid "Default user has write access to new repositories" +msgstr "Несанкцыянаваны доступ да рэсурсу" + +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 +#: kallithea/model/db.py:1560 msgid "Only admins can create repository groups" msgstr "Толькі адміністратары могуць ствараць групы репазітароў" -#: kallithea/model/db.py:1560 +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "Неадміністратары могуць ствараць групы репазітароў" -#: kallithea/model/db.py:1562 -msgid "Only admins can create user groups" -msgstr "Толькі адміністратары могуць ствараць групы карыстальнікаў" - #: kallithea/model/db.py:1563 +msgid "Only admins can create user groups" +msgstr "Толькі адміністратары могуць ствараць групы карыстальнікаў" + +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "Неадміністратары могуць ствараць групы карыстальнікаў" -#: kallithea/model/db.py:1565 -msgid "Only admins can create top level repositories" -msgstr "Толькі адміністратары могуць ствараць рэпазітары верхняга ўзроўню" - #: kallithea/model/db.py:1566 +msgid "Only admins can create top level repositories" +msgstr "Толькі адміністратары могуць ствараць рэпазітары верхняга ўзроўню" + +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "Неадміністратары могуць ствараць рэпазітары верхняга ўзроўню" -#: kallithea/model/db.py:1568 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - #: kallithea/model/db.py:1569 msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 +msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 +#: kallithea/model/db.py:1572 msgid "Only admins can fork repositories" msgstr "Месцазнаходжанне рэпазітароў" -#: kallithea/model/db.py:1572 +#: kallithea/model/db.py:1573 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1574 -msgid "Registration disabled" -msgstr "Рэгістрацыя адключаная" - #: kallithea/model/db.py:1575 +msgid "Registration disabled" +msgstr "Рэгістрацыя адключаная" + +#: kallithea/model/db.py:1576 msgid "User registration with manual account activation" msgstr "Рэгістрацыя карыстальніка з ручной актывацыяй уліковага запісу" -#: kallithea/model/db.py:1576 +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "Рэгістрацыя карыстальніка з аўтаматычнай актывацыяй" -#: kallithea/model/db.py:1992 +#: kallithea/model/db.py:1993 msgid "Not reviewed" msgstr "Не прагледжана" -#: kallithea/model/db.py:1993 +#: kallithea/model/db.py:1994 msgid "Under review" msgstr "На разглядзе" -#: kallithea/model/db.py:1994 +#: kallithea/model/db.py:1995 #, fuzzy #| msgid "Approved" msgid "Not approved" msgstr "Ухвалена" -#: kallithea/model/db.py:1995 +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "Ухвалена" @@ -2211,7 +2211,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2394,7 +2394,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2849,44 +2849,38 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "Стварэнне груп карыстальнікаў" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "Стварэнне форка рэпазітара" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "Рэгістрацыя" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "Актывацыя іншага ўліковага запісу" @@ -3538,7 +3532,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4345,6 +4339,13 @@ msgid "Changeset status: %s by %s" msgstr "Статус набору змен: %s ад %s" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +#| msgid "Commit messages" +msgid "(No commit message)" +msgstr "Паведамленні камітаў" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr "Разгарнуць паведамленне"
--- a/kallithea/i18n/bg/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/bg/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.4.99\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -678,11 +678,11 @@ msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "" @@ -714,48 +714,48 @@ msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 -#, python-format -msgid "This group contains %s subgroups and cannot be deleted" -msgstr "" - #: kallithea/controllers/admin/repo_groups.py:258 #, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:264 +#, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "" @@ -765,108 +765,108 @@ msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, python-format msgid "An error occurred during creation of field: %r" msgstr "" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:467 -msgid "Nothing" -msgstr "" - #: kallithea/controllers/admin/repos.py:469 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "" @@ -1334,129 +1334,129 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1544 -msgid "Default user has no access to new repositories" -msgstr "" - #: kallithea/model/db.py:1545 -msgid "Default user has read access to new repositories" +msgid "Default user has no access to new repositories" msgstr "" #: kallithea/model/db.py:1546 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1547 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1560 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1562 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1563 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1565 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1566 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1568 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - #: kallithea/model/db.py:1569 msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 +msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 -msgid "Only admins can fork repositories" -msgstr "" - #: kallithea/model/db.py:1572 +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1573 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1574 -msgid "Registration disabled" -msgstr "" - #: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" +msgid "Registration disabled" msgstr "" #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:1992 -msgid "Not reviewed" -msgstr "" - #: kallithea/model/db.py:1993 -msgid "Under review" +msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:1994 -msgid "Not approved" +msgid "Under review" msgstr "" #: kallithea/model/db.py:1995 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "" @@ -2117,7 +2117,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2300,7 +2300,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2731,44 +2731,38 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "" @@ -3398,7 +3392,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4183,6 +4177,11 @@ msgid "Changeset status: %s by %s" msgstr "" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "(No commit message)" +msgstr "" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr ""
--- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2015-11-12 08:51+0000\n" "Last-Translator: Michal Čihař <michal@cihar.com>\n" "Language-Team: Czech <https://hosted.weblate.org/projects/kallithea/" @@ -684,11 +684,11 @@ msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "" @@ -720,48 +720,48 @@ msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 -#, python-format -msgid "This group contains %s subgroups and cannot be deleted" -msgstr "" - #: kallithea/controllers/admin/repo_groups.py:258 #, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:264 +#, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "" @@ -771,109 +771,109 @@ msgid "Error creating repository %s" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, fuzzy, python-format #| msgid "Error occurred during gist creation" msgid "An error occurred during creation of field: %r" msgstr "Došlo k chybě při vytváření gist" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:467 +#: kallithea/controllers/admin/repos.py:469 msgid "Nothing" msgstr "Nic" -#: kallithea/controllers/admin/repos.py:469 +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "" @@ -1349,131 +1349,131 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1544 -msgid "Default user has no access to new repositories" -msgstr "" - #: kallithea/model/db.py:1545 -msgid "Default user has read access to new repositories" +msgid "Default user has no access to new repositories" msgstr "" #: kallithea/model/db.py:1546 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1547 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1560 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1562 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1563 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1565 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1566 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1568 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - #: kallithea/model/db.py:1569 msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 +msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 +#: kallithea/model/db.py:1572 #, fuzzy msgid "Only admins can fork repositories" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/model/db.py:1572 +#: kallithea/model/db.py:1573 #, fuzzy msgid "Non-admins can fork repositories" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/model/db.py:1574 +#: kallithea/model/db.py:1575 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" -msgstr "" - #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:1992 -msgid "Not reviewed" -msgstr "" - #: kallithea/model/db.py:1993 -msgid "Under review" +msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:1994 -msgid "Not approved" +msgid "Under review" msgstr "" #: kallithea/model/db.py:1995 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "" @@ -2137,7 +2137,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2321,7 +2321,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2757,44 +2757,38 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "" @@ -3442,7 +3436,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4235,6 +4229,11 @@ msgid "Changeset status: %s by %s" msgstr "Změny" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "(No commit message)" +msgstr "" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr ""
--- a/kallithea/i18n/da/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/da/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3.99\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2019-03-14 01:03+0000\n" "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n" "Language-Team: Danish <https://hosted.weblate.org/projects/kallithea/" @@ -703,11 +703,11 @@ msgid "Allowed with automatic account activation" msgstr "Tilladt med automatisk kontoaktivering" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "Manuel aktivering af ekstern konto" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "Automatisk aktivering af ekstern konto" @@ -739,48 +739,48 @@ msgid "Created repository group %s" msgstr "Oprettet repository-gruppen %s" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "Opdateret repository-gruppen %s" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Der opstod en fejl under opdatering af repository-gruppen %s" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Denne gruppe indeholder %s repositories og kan ikke slettes" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Denne gruppe indeholder %s undergrupper og kan ikke slettes" -#: kallithea/controllers/admin/repo_groups.py:258 +#: kallithea/controllers/admin/repo_groups.py:264 #, python-format msgid "Removed repository group %s" msgstr "Fjernet repository-gruppen %s" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Der opstod en fejl under sletning af repository-gruppen %s" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "Kan ikke tilbagekalde tilladelse for én selv som admin" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "Repository-gruppe tilladelser opdateret" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "Der opstod en fejl under tilbagekaldelse af tilladelse" @@ -790,111 +790,111 @@ msgid "Error creating repository %s" msgstr "Fejl ved oprettelse af repository %s" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "Oprettet repository %s fra %s" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "Forked repository %s som %s" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Oprettet repository %s" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Repository %s opdateret" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Der opstod en fejl under opdatering af repository %s" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "Fraskilt %s forks" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "Slettet %s forks" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Slettet repository %s" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Kan ikke slette repository %s, da den stadig har forks" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "Der opstod en fejl under sletning af %s" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Repository tilladelser opdateret" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "Feltvaliderings fejl: %s" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, python-format msgid "An error occurred during creation of field: %r" msgstr "Der opstod en fejl under oprettelse af felt: %r" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "Der opstod en fejl under fjernelse af feltet" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "-- Ikke en fork --" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "Opdateret repository's synlighed i den offentlige journal" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "" "Der opstod en fejl under indstilling af dette repository, i den " "offentlige journal" -#: kallithea/controllers/admin/repos.py:467 +#: kallithea/controllers/admin/repos.py:469 msgid "Nothing" msgstr "Intet" -#: kallithea/controllers/admin/repos.py:469 +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Mærket repository %s som fork af %s" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "Der opstod en fejl under denne operation" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 #, fuzzy msgid "Pulled from remote location" msgstr "Pulled fra remote placering" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "Der opstod en fejl under pull fra remote placering" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "Der opstod en fejl under sletning af repository statistik" @@ -1370,132 +1370,132 @@ msgid "[Mention]" msgstr "[Omtale]" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "top-niveau" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "Kallithea Administrator" -#: kallithea/model/db.py:1544 +#: kallithea/model/db.py:1545 msgid "Default user has no access to new repositories" msgstr "Standard-bruger har ikke adgang til nye repositories" -#: kallithea/model/db.py:1545 +#: kallithea/model/db.py:1546 msgid "Default user has read access to new repositories" msgstr "Standard-bruger har læse-adgang til nye repositories" -#: kallithea/model/db.py:1546 +#: kallithea/model/db.py:1547 msgid "Default user has write access to new repositories" msgstr "Standard-bruger har skrive-adgang til nye repositories" -#: kallithea/model/db.py:1547 +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "Standard-bruger har admin-adgang til nye repositories" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "Standard-bruger har ikke adgang til nye repository-grupper" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" -msgstr "Standard-bruger har læse-adgang til nye repository-grupper" +msgid "Default user has no access to new repository groups" +msgstr "Standard-bruger har ikke adgang til nye repository-grupper" #: kallithea/model/db.py:1551 +msgid "Default user has read access to new repository groups" +msgstr "Standard-bruger har læse-adgang til nye repository-grupper" + +#: kallithea/model/db.py:1552 msgid "Default user has write access to new repository groups" msgstr "Standard-bruger har skrive-adgang til nye repository-grupper" -#: kallithea/model/db.py:1552 +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "Standard-bruger har admin-adgang til nye repository-grupper" -#: kallithea/model/db.py:1554 +#: kallithea/model/db.py:1555 msgid "Default user has no access to new user groups" msgstr "Standard-bruger har ikke adgang til nye brugergrupper" -#: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" -msgstr "Standard-bruger har læse-adgang til nye brugergrupper" - #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" -msgstr "Standard-bruger har skrive-adgang til nye brugergrupper" +msgid "Default user has read access to new user groups" +msgstr "Standard-bruger har læse-adgang til nye brugergrupper" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "Standard-bruger har skrive-adgang til nye brugergrupper" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "Standard-bruger har admin-adgang til nye brugergrupper" -#: kallithea/model/db.py:1559 -msgid "Only admins can create repository groups" -msgstr "Kun administratorer kan oprette repository-grupper" - #: kallithea/model/db.py:1560 +msgid "Only admins can create repository groups" +msgstr "Kun administratorer kan oprette repository-grupper" + +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "Ikke-administratorer kan oprette repository-grupper" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1563 msgid "Only admins can create user groups" msgstr "Kun administratorer kan oprette brugergrupper" -#: kallithea/model/db.py:1563 +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "Ikke-administratorer kan oprette brugergrupper" -#: kallithea/model/db.py:1565 +#: kallithea/model/db.py:1566 msgid "Only admins can create top level repositories" msgstr "Kun administratorer kan oprette top-niveau repositories" -#: kallithea/model/db.py:1566 +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "Ikke-administratorer kan oprette top-niveau repositories" -#: kallithea/model/db.py:1568 +#: kallithea/model/db.py:1569 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" "Repository oprettelse aktiveret med skriveadgang til en repository-gruppe" -#: kallithea/model/db.py:1569 +#: kallithea/model/db.py:1570 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" "Repository oprettelse deaktiveret med skriveadgang til en repository-" "gruppe" -#: kallithea/model/db.py:1571 +#: kallithea/model/db.py:1572 msgid "Only admins can fork repositories" msgstr "Kun admins kan fork repositories" -#: kallithea/model/db.py:1572 +#: kallithea/model/db.py:1573 msgid "Non-admins can fork repositories" msgstr "Ikke-administratorer kan forke repositories" -#: kallithea/model/db.py:1574 +#: kallithea/model/db.py:1575 msgid "Registration disabled" msgstr "Registrering deaktiveret" -#: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" -msgstr "Brugerregistrering med manuel kontoaktivering" - #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "Brugerregistrering med manuel kontoaktivering" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "Brugerregistrering med automatisk kontoaktivering" -#: kallithea/model/db.py:1992 -msgid "Not reviewed" -msgstr "Ikke gennemgået" - #: kallithea/model/db.py:1993 -msgid "Under review" -msgstr "Under gennemgang" +msgid "Not reviewed" +msgstr "Ikke gennemgået" #: kallithea/model/db.py:1994 +msgid "Under review" +msgstr "Under gennemgang" + +#: kallithea/model/db.py:1995 msgid "Not approved" msgstr "Ikke godkendt" -#: kallithea/model/db.py:1995 +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "Godkendt" @@ -2165,7 +2165,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2348,7 +2348,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2779,44 +2779,38 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "" @@ -3446,7 +3440,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4231,6 +4225,11 @@ msgid "Changeset status: %s by %s" msgstr "" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "(No commit message)" +msgstr "" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr ""
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2020-12-21 05:29+0000\n" "Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n" "Language-Team: German <https://hosted.weblate.org/projects/kallithea/" @@ -717,11 +717,11 @@ msgid "Allowed with automatic account activation" msgstr "Erlaubt mit automatischer Kontoaktivierung" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "Manuelle Aktivierung externen Kontos" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "Automatische Aktivierung externen Kontos" @@ -753,48 +753,48 @@ msgid "Created repository group %s" msgstr "Repositoriumsgruppe %s erstellt" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "Repositoriumsgruppe %s aktualisiert" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Fehler bei der Aktualisierung der Repositoriumsgruppe %s" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Die Gruppe enthält %s Repositorys und kann nicht gelöscht werden" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Diese Gruppe enthält %s Untergruppen und kann nicht gelöscht werden" -#: kallithea/controllers/admin/repo_groups.py:258 +#: kallithea/controllers/admin/repo_groups.py:264 #, python-format msgid "Removed repository group %s" msgstr "Repositoriumsgruppe %s entfernt" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Fehler beim Löschen der Repositoriumsgruppe %s" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "Als Administrator kann man sich keine Berechtigungen entziehen" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "Berechtigungen der Repositoriumsgruppe aktualisiert" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "Fehler beim Entzug der Berechtigungen" @@ -804,113 +804,113 @@ msgid "Error creating repository %s" msgstr "Fehler beim Erstellen des Repositoriums %s" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "Repositorium %s von %s erstellt" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "Aufgespaltenes Repositorium %s zu %s" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Repositorium erzeugt %s" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Repository %s wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Fehler bei der Aktualisierung des Repositoriums %s" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "%s Spaltung abgetrennt" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "%s Spaltung gelöscht" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Repositorium %s gelöscht" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "%s konnte nicht gelöscht werden, da es noch Forks besitzt" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "Beim Löschen von %s trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Repositoriumsberechtigungen aktualisiert" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "Feldvalidierung fehlgeschlagen: %s" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, fuzzy, python-format #| msgid "An error occurred during creation of field" msgid "An error occurred during creation of field: %r" msgstr "Fehler während der Erzeugung des Feldes" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "Fehler beim Entfernen des Feldes" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "-- Keine Abspaltung --" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "Sichtbarkeit des Repositorys im Öffentlichen Logbuch aktualisiert" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "" "Es trat ein Fehler während der Aktualisierung der Sicherbarkeit dieses " "Repositorys im Öffentlichen Logbuch auf" -#: kallithea/controllers/admin/repos.py:467 +#: kallithea/controllers/admin/repos.py:469 msgid "Nothing" msgstr "Nichts" -#: kallithea/controllers/admin/repos.py:469 +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Markiere Repository %s als Abzweig von Repository %s" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "Während dieser operation trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "Von entferntem Ort übertragen" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "" "Es trat ein Fehler auf während das Repository von einem Entfernten " "Speicherort übertragen wurde" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "Während des löschens der Repository Statistiken trat ein Fehler auf" @@ -1405,136 +1405,136 @@ msgid "[Mention]" msgstr "[Mention]" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "höchste Ebene" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "Kallithea Administrator" -#: kallithea/model/db.py:1544 -msgid "Default user has no access to new repositories" -msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Repositories" - #: kallithea/model/db.py:1545 +msgid "Default user has no access to new repositories" +msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Repositories" + +#: kallithea/model/db.py:1546 msgid "Default user has read access to new repositories" msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repositories" -#: kallithea/model/db.py:1546 +#: kallithea/model/db.py:1547 msgid "Default user has write access to new repositories" msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Repositories" -#: kallithea/model/db.py:1547 +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "Der Standard-Benutzer hat Admin-Rechte auf neuen Repositories" -#: kallithea/model/db.py:1549 +#: kallithea/model/db.py:1550 msgid "Default user has no access to new repository groups" msgstr "" "Der Standard-Benutzer hat keinen Zugriff auf neue Repository-Gruppen" -#: kallithea/model/db.py:1550 +#: kallithea/model/db.py:1551 msgid "Default user has read access to new repository groups" msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repository-Gruppen" -#: kallithea/model/db.py:1551 +#: kallithea/model/db.py:1552 msgid "Default user has write access to new repository groups" msgstr "Der Standard-Benutzer Schreibrechte auf neuen Repository-Gruppen" -#: kallithea/model/db.py:1552 +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "Der Standard-Benutzer Admin-Rechte auf neuen Repository-Gruppen" -#: kallithea/model/db.py:1554 +#: kallithea/model/db.py:1555 msgid "Default user has no access to new user groups" msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Benutzer-Gruppen" -#: kallithea/model/db.py:1555 +#: kallithea/model/db.py:1556 msgid "Default user has read access to new user groups" msgstr "Der Standard-Benutzer hat Leserechte auf neuen Benutzer-Gruppen" -#: kallithea/model/db.py:1556 +#: kallithea/model/db.py:1557 msgid "Default user has write access to new user groups" msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Benutzer-Gruppen" -#: kallithea/model/db.py:1557 +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "Der Standard-Benutzer hat Admin-Rechte auf neuen Benutzer-Gruppen" -#: kallithea/model/db.py:1559 +#: kallithea/model/db.py:1560 msgid "Only admins can create repository groups" msgstr "Nur Admins können Repository-Gruppen erstellen" -#: kallithea/model/db.py:1560 +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "Nicht-Admins können Repository-Gruppen erstellen" -#: kallithea/model/db.py:1562 -msgid "Only admins can create user groups" -msgstr "Nur Admins können Benutzer-Gruppen erstellen" - #: kallithea/model/db.py:1563 +msgid "Only admins can create user groups" +msgstr "Nur Admins können Benutzer-Gruppen erstellen" + +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "Nicht-Admins können Benutzer-Gruppen erstellen" -#: kallithea/model/db.py:1565 +#: kallithea/model/db.py:1566 msgid "Only admins can create top level repositories" msgstr "Nur Admins können Repositories auf oberster Ebene erstellen" -#: kallithea/model/db.py:1566 +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "Nicht-Admins können Repositories oberster Ebene erstellen" -#: kallithea/model/db.py:1568 +#: kallithea/model/db.py:1569 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" "Erstellung von Repositories mit Schreibzugriff für Repositorygruppe " "aktiviert" -#: kallithea/model/db.py:1569 +#: kallithea/model/db.py:1570 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" "Erstellung von Repositories mit Schreibzugriff für Repositorygruppe " "deaktiviert" -#: kallithea/model/db.py:1571 +#: kallithea/model/db.py:1572 msgid "Only admins can fork repositories" msgstr "Nur Admins können Repositories forken" -#: kallithea/model/db.py:1572 +#: kallithea/model/db.py:1573 msgid "Non-admins can fork repositories" msgstr "Nicht-Admins können Repositorys forken" -#: kallithea/model/db.py:1574 +#: kallithea/model/db.py:1575 msgid "Registration disabled" msgstr "Registrierung deaktiviert" -#: kallithea/model/db.py:1575 +#: kallithea/model/db.py:1576 msgid "User registration with manual account activation" msgstr "Benutzerregistrierung mit manueller Kontoaktivierung" -#: kallithea/model/db.py:1576 +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "Benutzerregistrierung mit automatischer Kontoaktivierung" -#: kallithea/model/db.py:1992 +#: kallithea/model/db.py:1993 msgid "Not reviewed" msgstr "Nicht Begutachtet" -#: kallithea/model/db.py:1993 +#: kallithea/model/db.py:1994 msgid "Under review" msgstr "In Begutachtung" -#: kallithea/model/db.py:1994 +#: kallithea/model/db.py:1995 #, fuzzy #| msgid "Approved" msgid "Not approved" msgstr "Akzeptiert" -#: kallithea/model/db.py:1995 +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "Akzeptiert" @@ -2263,7 +2263,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2453,7 +2453,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2922,19 +2922,11 @@ "Aktiviere dies, damit Nicht-Administratoren Repositories auf der obersten " "Ebene erstellen können." -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" -"Hinweis: dadurch erhalten auch alle Benutzer API-Zugriff, um überall " -"Repositories zu erstellen. Das kann sich in zukünftigen Versionen ändern." - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "Repository-Erstellung mit Gruppen-Schreibzugriff" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " @@ -2944,31 +2936,31 @@ "einer Repository-Gruppe. Falls inaktiv, sind Gruppen-" "Schreibberechtigungen wirkungslos." -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "Benutzergruppen Erstellung" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" "Aktivieren Sie dies, damit Nicht-Administratoren Benutzergruppen " "erstellen können." -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "Repository-forking" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" "Aktivieren Sie dies, um Nichtadministratoren zu erlauben, Repositories zu " "forken." -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "Registrierung" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 #, fuzzy msgid "External auth account activation" msgstr "Externe Authentifizierung für Accounts aktivieren" @@ -4519,6 +4511,13 @@ msgid "Changeset status: %s by %s" msgstr "Setze Changesetstatus" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +#| msgid "Commit messages" +msgid "(No commit message)" +msgstr "Commit Nachrichten" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr "" @@ -5802,6 +5801,14 @@ msgid "Download %s as %s" msgstr "%s als %s herunterladen" +#~ msgid "" +#~ "Note: This will also give all users API access to create repositories " +#~ "everywhere. That might change in future versions." +#~ msgstr "" +#~ "Hinweis: dadurch erhalten auch alle Benutzer API-Zugriff, um überall " +#~ "Repositories zu erstellen. Das kann sich in zukünftigen Versionen " +#~ "ändern." + #~ msgid "Cache invalidation successful" #~ msgstr "Cache Entfernung war erfolgreich"
--- a/kallithea/i18n/el/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/el/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2021-05-10 09:32+0000\n" "Last-Translator: Eugenia Russell <eugenia.russell2019@gmail.com>\n" "Language-Team: Greek <https://hosted.weblate.org/projects/kallithea/" @@ -105,7 +105,8 @@ msgid "" "The request could not be understood by the server due to malformed syntax." msgstr "" -"Η αίτηση δεν μπόρεσε να ερμηνευτεί από τον εξυπηρετητή λόγω κακής διατύπωσης." +"Η αίτηση δεν μπόρεσε να ερμηνευτεί από τον εξυπηρετητή λόγω κακής " +"διατύπωσης." #: kallithea/controllers/error.py:84 msgid "Unauthorized access to resource" @@ -698,11 +699,11 @@ msgid "Allowed with automatic account activation" msgstr "Επιτρέπεται με αυτόματη ενεργοποίηση του λογαριασμού" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "Χειροποίητη ενεργοποίηση εξωτερικού λογαριασμού" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "Αυτόματη ενεργοποίηση εξωτερικού λογαριασμού" @@ -734,48 +735,48 @@ msgid "Created repository group %s" msgstr "Δημιουργήθηκε η ομάδα αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "Ενημερώθηκε η ομάδα αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Παρουσιάστηκε σφάλμα κατά την ενημέρωση της ομάδας αποθετηρίων %s" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Αυτή η ομάδα περιέχει %s αποθετήρια και δε μπορεί να διαγραφεί" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Αυτή η ομάδα περιέχει %s υποομάδες και δε μπορεί να διαγραφεί" -#: kallithea/controllers/admin/repo_groups.py:258 +#: kallithea/controllers/admin/repo_groups.py:264 #, python-format msgid "Removed repository group %s" msgstr "Αφαιρέθηκε η ομάδα αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Παρουσιάστηκε σφάλμα κατά τη διαγραφή της ομάδας αποθετηρίων %s" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "Δεν μπορείτε να ανακαλέσετε την άδεια σας ως διαχειριστής" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "Τα δικαιώματα της ομάδας αποθετηρίου ενημερώθηκαν" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "Παρουσιάστηκε σφάλμα κατά την ανάκληση του δικαιώματος" @@ -785,110 +786,110 @@ msgid "Error creating repository %s" msgstr "Σφάλμα κατά τη δημιουργία αποθετηρίου %s" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "Δημιουργήθηκε το αποθετήριο %s από το %s" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "Κλωνοποιήθηκε το αποθετηρίο %s ως %s" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Δημιουργήθηκε το αποθετήριο %s" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Το αποθετήριο %s ενημερώθηκε επιτυχώς" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Παρουσιάστηκε σφάλμα κατά την ενημέρωση του αποθετηρίου %s" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "Αποσυνδέθηκαν %s κλώνοι" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "Διαγράφηκαν %s κλώνοι" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Διαγράφηκε το αποθετήριο %s" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Δε μπορεί να διαγραφεί το αποθετήριο %s που ακόμα έχει κλώνους" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "Παρουσιάστηκε σφάλμα κατά την διαγραφή του %s" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Τα δικαιώματα του αποθετηρίου ενημερώθηκαν" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "Σφάλμα στην επιβεβαίωση του πεδίου: %s" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, python-format msgid "An error occurred during creation of field: %r" msgstr "Παρουσιάστηκε σφάλμα κατά τη δημιουργία πεδίου: %r" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "Παρουσιάστηκε σφάλμα κατά την απομάκρυνση του πεδίου" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "-- Όχι κλώνος --" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "Ενημερώθηκε η ορατότητα του αποθετηρίου στο δημόσιο ημερολόγιο" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "" "Παρουσιάστηκε σφάλμα κατά την τοποθέτηση αυτού το αποθετηρίου στο δημόσιο " "ημερολόγιο" -#: kallithea/controllers/admin/repos.py:467 +#: kallithea/controllers/admin/repos.py:469 msgid "Nothing" msgstr "Χωρίς" -#: kallithea/controllers/admin/repos.py:469 +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Σημειώθηκε το αποθετήριο %s σαν κλώνος του %s" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "Παρουσιάστηκε ένα σφάλμα κατά τη διάρκεια αυτής της λειτουργίας" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "Ελκύσθηκε από απομακρυσμένη τοποθεσία" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "Παρουσιάστηκε σφάλμα κατά την έλξη από την απομακρυσμένη τοποθεσία" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "" "Παρουσιάστηκε σφάλμα κατά τη διαγραφή των στατιστικών του αποθετηρίου" @@ -1375,145 +1376,145 @@ msgid "[Mention]" msgstr "[Αναφορά]" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "ανώτερο επίπεδο" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "Διαχειριστής Καλλιθέας" -#: kallithea/model/db.py:1544 +#: kallithea/model/db.py:1545 msgid "Default user has no access to new repositories" msgstr "Ο προεπιλεγμένος χρήστης δεν έχει πρόσβαση σε νέα αποθετήρια" -#: kallithea/model/db.py:1545 +#: kallithea/model/db.py:1546 msgid "Default user has read access to new repositories" msgstr "Ο προεπιλεγμένος χρήστης έχει πρόσβαση ανάγνωσης σε νέα αποθετήρια" -#: kallithea/model/db.py:1546 +#: kallithea/model/db.py:1547 msgid "Default user has write access to new repositories" msgstr "Ο προεπιλεγμένος χρήστης έχει πρόσβαση εγγραφής σε νέα αποθετήρια" -#: kallithea/model/db.py:1547 +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" "Ο προεπιλεγμένος χρήστης έχει πρόσβαση διαχειριστή σε νέα αποθετήρια" -#: kallithea/model/db.py:1549 +#: kallithea/model/db.py:1550 msgid "Default user has no access to new repository groups" msgstr "" "Ο προεπιλεγμένος χρήστης δεν έχει πρόσβαση σε νέες ομάδες αποθετηρίων" -#: kallithea/model/db.py:1550 +#: kallithea/model/db.py:1551 msgid "Default user has read access to new repository groups" msgstr "" "Ο προεπιλεγμένος χρήστης έχει πρόσβαση ανάγνωσης σε νέες ομάδες " "αποθετηρίων" -#: kallithea/model/db.py:1551 +#: kallithea/model/db.py:1552 msgid "Default user has write access to new repository groups" msgstr "" "Ο προεπιλεγμένος χρήστης έχει πρόσβαση εγγραφής σε νέες ομάδες αποθετηρίων" -#: kallithea/model/db.py:1552 +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" "Ο προεπιλεγμένος χρήστης έχει πρόσβαση διαχειριστή σε νέες ομάδες " "αποθετηρίων" -#: kallithea/model/db.py:1554 +#: kallithea/model/db.py:1555 msgid "Default user has no access to new user groups" msgstr "Ο προεπιλεγμένος χρήστης δεν έχει πρόσβαση σε νέες ομάδες χρηστών" -#: kallithea/model/db.py:1555 +#: kallithea/model/db.py:1556 msgid "Default user has read access to new user groups" msgstr "" "Ο προεπιλεγμένος χρήστης έχει πρόσβαση ανάγνωσης σε νέες ομάδες χρηστών" -#: kallithea/model/db.py:1556 +#: kallithea/model/db.py:1557 msgid "Default user has write access to new user groups" msgstr "" "Ο προεπιλεγμένος χρήστης έχει πρόσβαση εγγραφής σε νέες ομάδες χρηστών" -#: kallithea/model/db.py:1557 +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" "Ο προεπιλεγμένος χρήστης έχει πρόσβαση διαχειριστή σε νέες ομάδες χρηστών" -#: kallithea/model/db.py:1559 +#: kallithea/model/db.py:1560 msgid "Only admins can create repository groups" msgstr "Μόνο οι διαχειριστές μπορούν να δημιουργήσουν ομάδες αποθετηρίων" -#: kallithea/model/db.py:1560 +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "Οι μη διαχειριστές μπορούν να δημιουργήσουν ομάδες αποθετηρίων" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1563 msgid "Only admins can create user groups" msgstr "Μόνο οι διαχειριστές μπορούν να δημιουργήσουν ομάδες χρηστών" -#: kallithea/model/db.py:1563 +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "Οι μη διαχειριστές μπορούν να δημιουργήσουν ομάδες χρηστών" -#: kallithea/model/db.py:1565 +#: kallithea/model/db.py:1566 msgid "Only admins can create top level repositories" msgstr "" "Μόνο οι διαχειριστές μπορούν να δημιουργήσουν αποθετήρια ανώτατου επιπέδου" -#: kallithea/model/db.py:1566 +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" "Οι μη διαχειριστές μπορούν να δημιουργήσουν αποθετήρια ανώτατου επιπέδου" -#: kallithea/model/db.py:1568 +#: kallithea/model/db.py:1569 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" "Η δημιουργία αποθετηρίου είναι ενεργοποιημένη με δικαιώματα εγγραφής σε " "μια ομάδα αποθετηρίων" -#: kallithea/model/db.py:1569 +#: kallithea/model/db.py:1570 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" "Η δημιουργία αποθετηρίου απενεργοποιήθηκε με δικαιώματα εγγραφής σε μια " "ομάδα αποθετηρίων" -#: kallithea/model/db.py:1571 +#: kallithea/model/db.py:1572 msgid "Only admins can fork repositories" msgstr "Μόνο οι διαχειριστές μπορούν να κλωνοποιήσουν τα αποθετήρια" -#: kallithea/model/db.py:1572 +#: kallithea/model/db.py:1573 msgid "Non-admins can fork repositories" msgstr "Οι μη-διαχειριστές μπορούν να κλωνοποιήσουν αποθετήρια" -#: kallithea/model/db.py:1574 +#: kallithea/model/db.py:1575 msgid "Registration disabled" msgstr "Η εγγραφή απενεργοποιήθηκε" -#: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" -msgstr "Εγγραφή χρήστη με χειροκίνητη ενεργοποίηση λογαριασμού" - #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "Εγγραφή χρήστη με χειροκίνητη ενεργοποίηση λογαριασμού" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "Εγγραφή χρήστη με αυτόματη ενεργοποίηση λογαριασμού" -#: kallithea/model/db.py:1992 -msgid "Not reviewed" -msgstr "Δεν έχει ελεγχθεί" - #: kallithea/model/db.py:1993 -msgid "Under review" -msgstr "Υπό εξέταση" +msgid "Not reviewed" +msgstr "Δεν έχει ελεγχθεί" #: kallithea/model/db.py:1994 +msgid "Under review" +msgstr "Υπό εξέταση" + +#: kallithea/model/db.py:1995 msgid "Not approved" msgstr "Δεν έχει εγκριθεί" -#: kallithea/model/db.py:1995 +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "Εγκρίθηκε" @@ -2226,7 +2227,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2414,7 +2415,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2873,20 +2874,11 @@ "Ενεργοποιήστε αυτήν την επιλογή ώστε να επιτρέπεται σε μη διαχειριστές να " "δημιουργούν αποθετήρια στο ανώτερο επίπεδο." -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" -"Σημείωση: Αυτό θα δώσει επίσης σε όλους τους χρήστες πρόσβαση API για τη " -"δημιουργία αποθετηρίων παντού. Αυτό μπορεί να αλλάξει σε μελλοντικές " -"εκδόσεις." - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "Δημιουργία αποθετηρίου με πρόσβαση εγγραφής ομάδας" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " @@ -2896,31 +2888,31 @@ "δημιουργία αποθετηρίων εντός αυτής της ομάδας. Χωρίς αυτό, τα δικαιώματα " "ομαδικής εγγραφής δεν σημαίνουν τίποτα." -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "Δημιουργία ομάδας χρηστών" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" "Ενεργοποιήστε αυτήν την επιλογή για να επιτρέψετε σε μη διαχειριστές να " "δημιουργούν ομάδες χρηστών." -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "Κλωνοποίηση αποθετηρίου" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" "Ενεργοποιήστε για να επιτρέπεται στους μη-διαχειριστές να κλωνοποιούν " "αποθετήρια." -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "Εγγραφή" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "Ενεργοποίηση λογαριασμού εξωτερικού ελέγχου" @@ -3229,8 +3221,8 @@ #: kallithea/templates/admin/repos/repo_edit_advanced.html:7 msgid "Manually set this repository as a fork of another from the list." msgstr "" -"Ορίστε χειροκίνητα αυτό το αποθετήριο ως έναν κλώνο ενός άλλου από αυτόν τον " -"κατάλογο." +"Ορίστε χειροκίνητα αυτό το αποθετήριο ως έναν κλώνο ενός άλλου από αυτόν " +"τον κατάλογο." #: kallithea/templates/admin/repos/repo_edit_advanced.html:20 msgid "Public Journal Visibility" @@ -4455,6 +4447,13 @@ msgid "Changeset status: %s by %s" msgstr "Κατάσταση σετ αλλαγών: %s από %s" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +#| msgid "Commit messages" +msgid "(No commit message)" +msgstr "Μηνύματα commit" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr "Ανάπτυξη μηνύματος commit" @@ -5705,6 +5704,14 @@ msgid "Download %s as %s" msgstr "Λήψη %s ως %s" +#~ msgid "" +#~ "Note: This will also give all users API access to create repositories " +#~ "everywhere. That might change in future versions." +#~ msgstr "" +#~ "Σημείωση: Αυτό θα δώσει επίσης σε όλους τους χρήστες πρόσβαση API για " +#~ "τη δημιουργία αποθετηρίων παντού. Αυτό μπορεί να αλλάξει σε " +#~ "μελλοντικές εκδόσεις." + #~ msgid "Cache invalidation successful" #~ msgstr "Η ακύρωση της cache ήταν επιτυχής"
--- a/kallithea/i18n/es/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/es/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2018-04-18 11:43+0000\n" "Last-Translator: Jesús Sánchez <jsanchezfdz95@gmail.com>\n" "Language-Team: Spanish <https://hosted.weblate.org/projects/kallithea/" @@ -700,11 +700,11 @@ msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "" @@ -736,48 +736,48 @@ msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 -#, python-format -msgid "This group contains %s subgroups and cannot be deleted" -msgstr "" - #: kallithea/controllers/admin/repo_groups.py:258 #, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:264 +#, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "" @@ -787,109 +787,109 @@ msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, fuzzy, python-format #| msgid "An error occurred during repository forking %s" msgid "An error occurred during creation of field: %r" msgstr "Ocurrió un error mientras se bifurcaba el repositorio %s" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:467 -msgid "Nothing" -msgstr "" - #: kallithea/controllers/admin/repos.py:469 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "" @@ -1359,129 +1359,129 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1544 -msgid "Default user has no access to new repositories" -msgstr "" - #: kallithea/model/db.py:1545 -msgid "Default user has read access to new repositories" +msgid "Default user has no access to new repositories" msgstr "" #: kallithea/model/db.py:1546 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1547 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1560 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1562 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1563 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1565 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1566 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1568 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - #: kallithea/model/db.py:1569 msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 +msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 -msgid "Only admins can fork repositories" -msgstr "" - #: kallithea/model/db.py:1572 +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1573 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1574 -msgid "Registration disabled" -msgstr "" - #: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" +msgid "Registration disabled" msgstr "" #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:1992 -msgid "Not reviewed" -msgstr "" - #: kallithea/model/db.py:1993 -msgid "Under review" +msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:1994 -msgid "Not approved" +msgid "Under review" msgstr "" #: kallithea/model/db.py:1995 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "" @@ -2153,7 +2153,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2336,7 +2336,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2767,44 +2767,38 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "" @@ -3438,7 +3432,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4225,6 +4219,11 @@ msgid "Changeset status: %s by %s" msgstr "" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "(No commit message)" +msgstr "" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr ""
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2020-11-14 12:28+0000\n" "Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n" "Language-Team: French <https://hosted.weblate.org/projects/kallithea/" @@ -703,11 +703,11 @@ msgid "Allowed with automatic account activation" msgstr "Autorisé avec activation de compte automatique" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "Activation manuelle du compte externe" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "Activation automatique du compte externe" @@ -739,50 +739,50 @@ msgid "Created repository group %s" msgstr "Groupe de dépôts %s créé" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "Groupe de dépôts %s mis à jour" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" "Une erreur est survenue durant la mise à jour du groupe de dépôts %s" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Ce groupe contient %s dépôts et ne peut être supprimé" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Ce groupe contient %s sous-groupes et ne peut pas être supprimé" -#: kallithea/controllers/admin/repo_groups.py:258 +#: kallithea/controllers/admin/repo_groups.py:264 #, python-format msgid "Removed repository group %s" msgstr "Groupe de dépôts %s supprimé" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" "Une erreur est survenue durant la suppression du groupe de dépôts %s" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "Impossible de révoquer votre permission d'administrateur" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "Permissions du groupe de dépôts mises à jour" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "Une erreur est survenue durant la révocation de la permission" @@ -792,110 +792,110 @@ msgid "Error creating repository %s" msgstr "Erreur de création du dépôt %s" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "Dépôt %s créé depuis %s" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "dépôt %s forké en tant que %s" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Dépôt %s créé" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Dépôt %s mis à jour avec succès" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Une erreur est survenue durant la mise à jour du dépôt %s" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "%s forks détachés" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "%s forks supprimés" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Dépôt %s supprimé" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Impossible de supprimer le dépôt %s : des forks y sont attachés" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "Erreur pendant la suppression de %s" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Permissions du dépôt mises à jour" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "Erreur de validation du champ : %s" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, python-format msgid "An error occurred during creation of field: %r" msgstr "Une erreur est survenue durant la création du champ : %r" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "Une erreur est survenue durant la suppression du champ" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "-- Pas un fork --" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "La visibilité du dépôt dans le journal public a été mise à jour" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "" "Une erreur est survenue durant la configuration du journal public pour ce " "dépôt" -#: kallithea/controllers/admin/repos.py:467 +#: kallithea/controllers/admin/repos.py:469 msgid "Nothing" msgstr "[Aucun dépôt]" -#: kallithea/controllers/admin/repos.py:469 +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Le dépôt %s a été marké comme fork de %s" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "Une erreur est survenue durant cette opération" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "Les changements distants ont été récupérés" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "Une erreur est survenue durant le pull depuis la source distante" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "" "Une erreur est survenue durant la suppression des statistiques du dépôt" @@ -1389,154 +1389,154 @@ msgid "[Mention]" msgstr "[Mention]" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "niveau supérieur" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "Administrateur Kallithea" -#: kallithea/model/db.py:1544 +#: kallithea/model/db.py:1545 msgid "Default user has no access to new repositories" msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux dépôts" -#: kallithea/model/db.py:1545 +#: kallithea/model/db.py:1546 msgid "Default user has read access to new repositories" msgstr "L'utilisateur par défaut a un accès en lecture aux nouveaux dépôts" -#: kallithea/model/db.py:1546 +#: kallithea/model/db.py:1547 msgid "Default user has write access to new repositories" msgstr "L'utilisateur par défaut a un accès en écriture aux nouveaux dépôts" -#: kallithea/model/db.py:1547 +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" "L'utilisateur par défaut a un accès administrateur aux nouveaux dépôts" -#: kallithea/model/db.py:1549 +#: kallithea/model/db.py:1550 msgid "Default user has no access to new repository groups" msgstr "" "L'utilisateur par défaut n'a pas accès aux nouveaux groupes de dépôts" -#: kallithea/model/db.py:1550 +#: kallithea/model/db.py:1551 msgid "Default user has read access to new repository groups" msgstr "" "L'utilisateur par défaut a accès en lecture seule aux nouveaux groupes de " "dépôts" -#: kallithea/model/db.py:1551 +#: kallithea/model/db.py:1552 msgid "Default user has write access to new repository groups" msgstr "" "L'utilisateur par défaut a accès en écriture aux nouveaux groupes de " "dépôts" -#: kallithea/model/db.py:1552 +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" "L'utilisateur par défaut a accès administrateur aux nouveaux groupes de " "dépôts" -#: kallithea/model/db.py:1554 +#: kallithea/model/db.py:1555 msgid "Default user has no access to new user groups" msgstr "" "L'utilisateur par défaut n'a pas accès aux nouveaux groupes d'utilisateurs" -#: kallithea/model/db.py:1555 +#: kallithea/model/db.py:1556 msgid "Default user has read access to new user groups" msgstr "" "L'utilisateur par défaut a accès en lecture seule aux nouveaux groupes " "d'utilisateurs" -#: kallithea/model/db.py:1556 +#: kallithea/model/db.py:1557 msgid "Default user has write access to new user groups" msgstr "" "L'utilisateur par défaut a accès en écriture aux nouveaux groupes " "d'utilisateurs" -#: kallithea/model/db.py:1557 +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" "L'utilisateur par défaut a un accès administrateur aux nouveaux groupes " "d'utilisateurs" -#: kallithea/model/db.py:1559 +#: kallithea/model/db.py:1560 msgid "Only admins can create repository groups" msgstr "Seul un administrateur peut créer un groupe de dépôts" -#: kallithea/model/db.py:1560 +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "" "Les utilisateurs non-administrateurs peuvent créer des groupes de dépôts" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1563 msgid "Only admins can create user groups" msgstr "Seul un administrateur peut créer des groupes d'utilisateurs" -#: kallithea/model/db.py:1563 +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "" "Les utilisateurs non-administrateurs peuvent créer des groupes " "d'utilisateurs" -#: kallithea/model/db.py:1565 +#: kallithea/model/db.py:1566 msgid "Only admins can create top level repositories" msgstr "Seul un administrateur peut créer des dépôts de niveau supérieur" -#: kallithea/model/db.py:1566 +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" "Les utilisateurs non-administrateurs peuvent créer des dépôts de niveau " "supérieur" -#: kallithea/model/db.py:1568 +#: kallithea/model/db.py:1569 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" "Création de dépôts activée avec l'accès en écriture vers un groupe de " "dépôts" -#: kallithea/model/db.py:1569 +#: kallithea/model/db.py:1570 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" "Création de dépôts désactivée avec l'accès en écriture vers un groupe de " "dépôts" -#: kallithea/model/db.py:1571 +#: kallithea/model/db.py:1572 msgid "Only admins can fork repositories" msgstr "Seul un administrateur peut faire un fork de dépôt" -#: kallithea/model/db.py:1572 +#: kallithea/model/db.py:1573 msgid "Non-admins can fork repositories" msgstr "Les utilisateurs non-administrateurs peuvent faire un fork de dépôt" -#: kallithea/model/db.py:1574 +#: kallithea/model/db.py:1575 msgid "Registration disabled" msgstr "Enregistrement désactivé" -#: kallithea/model/db.py:1575 +#: kallithea/model/db.py:1576 msgid "User registration with manual account activation" msgstr "Enregistrement des utilisateurs avec activation de compte manuelle" -#: kallithea/model/db.py:1576 +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "" "Enregistrement des utilisateurs avec activation de compte automatique" -#: kallithea/model/db.py:1992 +#: kallithea/model/db.py:1993 msgid "Not reviewed" msgstr "Pas encore relue" -#: kallithea/model/db.py:1993 +#: kallithea/model/db.py:1994 msgid "Under review" msgstr "En cours de relecture" -#: kallithea/model/db.py:1994 +#: kallithea/model/db.py:1995 msgid "Not approved" msgstr "Non approuvée" -#: kallithea/model/db.py:1995 +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "Approuvée" @@ -2249,7 +2249,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2436,7 +2436,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2655,10 +2655,10 @@ "\n" "Comme les mots de passe, les clés API ne devraient donc jamais être " "diffusées à des tiers,\n" -"ni passés à des scripts ou services auxquels vous ne faites pas confiance. " -"Si cette diffusion a tout de même lieu,\n" -"vous pouvez réinitialiser la clé API sur cette page pour qu'elle ne puisse " -"plus être utilisée.\n" +"ni passés à des scripts ou services auxquels vous ne faites pas " +"confiance. Si cette diffusion a tout de même lieu,\n" +"vous pouvez réinitialiser la clé API sur cette page pour qu'elle ne " +"puisse plus être utilisée.\n" #: kallithea/templates/admin/my_account/my_account_emails.html:9 #: kallithea/templates/admin/users/user_edit_emails.html:9 @@ -2897,20 +2897,11 @@ "Activer pour autoriser les non-administrateurs à créer des dépôts au " "niveau supérieur." -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" -"Note : Cela autorisera également tous les utilisateurs à utiliser l'API " -"pour créer des dépôts partout. Ce comportement peut changer dans des " -"versions futures." - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "Création de dépôts avec l'accès en écriture du groupe" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " @@ -2920,30 +2911,30 @@ "créer des dépôts dans ce groupe. Sans ceci, le droit d'écriture pour les " "groupes n'a pas d'impact." -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "Création de groupes d'utilisateurs" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" "Activer pour autoriser les non-administrateurs à créer des groupes " "d'utilisateurs." -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "Fork de dépôt" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" "Activer pour autoriser les non-administrateurs à faire des fork de dépôt." -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "Enregistrement" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "Activation de l'authentification externe" @@ -3844,8 +3835,8 @@ "Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" "@{hostname}/{repo}'." msgstr "" -"Schéma de construction d'une URL de clone SSH, par exemple. " -"'ssh://{system_user}@{hostname}/{repo}'." +"Schéma de construction d'une URL de clone SSH, par exemple. 'ssh://" +"{system_user}@{hostname}/{repo}'." #: kallithea/templates/admin/settings/settings_visual.html:67 msgid "Repository page size" @@ -4486,6 +4477,13 @@ msgid "Changeset status: %s by %s" msgstr "Statut de changeset : %s par %s" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +#| msgid "Commit messages" +msgid "(No commit message)" +msgstr "Les messages de commit" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr "Développer le message de commit" @@ -5736,6 +5734,14 @@ msgid "Download %s as %s" msgstr "Télécharge %s comme %s" +#~ msgid "" +#~ "Note: This will also give all users API access to create repositories " +#~ "everywhere. That might change in future versions." +#~ msgstr "" +#~ "Note : Cela autorisera également tous les utilisateurs à utiliser " +#~ "l'API pour créer des dépôts partout. Ce comportement peut changer dans " +#~ "des versions futures." + #~ msgid "Cache invalidation successful" #~ msgstr "Invalidation du cache réalisée avec succès"
--- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2015-04-11 00:59+0200\n" "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n" "Language-Team: Hungarian <https://hosted.weblate.org/projects/kallithea/" @@ -678,11 +678,11 @@ msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "" @@ -714,48 +714,48 @@ msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 -#, python-format -msgid "This group contains %s subgroups and cannot be deleted" -msgstr "" - #: kallithea/controllers/admin/repo_groups.py:258 #, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:264 +#, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "" @@ -765,108 +765,108 @@ msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, python-format msgid "An error occurred during creation of field: %r" msgstr "" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:467 -msgid "Nothing" -msgstr "" - #: kallithea/controllers/admin/repos.py:469 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "" @@ -1335,129 +1335,129 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1544 -msgid "Default user has no access to new repositories" -msgstr "" - #: kallithea/model/db.py:1545 -msgid "Default user has read access to new repositories" +msgid "Default user has no access to new repositories" msgstr "" #: kallithea/model/db.py:1546 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1547 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1560 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1562 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1563 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1565 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1566 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1568 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - #: kallithea/model/db.py:1569 msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 +msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 -msgid "Only admins can fork repositories" -msgstr "" - #: kallithea/model/db.py:1572 +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1573 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1574 -msgid "Registration disabled" -msgstr "" - #: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" +msgid "Registration disabled" msgstr "" #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:1992 -msgid "Not reviewed" -msgstr "" - #: kallithea/model/db.py:1993 -msgid "Under review" +msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:1994 -msgid "Not approved" +msgid "Under review" msgstr "" #: kallithea/model/db.py:1995 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "" @@ -2118,7 +2118,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2301,7 +2301,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2732,44 +2732,38 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "" @@ -3407,7 +3401,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4192,6 +4186,11 @@ msgid "Changeset status: %s by %s" msgstr "" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "(No commit message)" +msgstr "" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr ""
--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2019-08-27 07:23+0000\n" "Last-Translator: leela <53352@protonmail.com>\n" "Language-Team: Japanese <https://hosted.weblate.org/projects/kallithea/" @@ -703,11 +703,11 @@ msgid "Allowed with automatic account activation" msgstr "自動でアカウントをアクティベートする" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "外部アカウントを手動でアクティベートする" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "外部アカウントを自動でアクティベートする" @@ -739,48 +739,48 @@ msgid "Created repository group %s" msgstr "リポジトリグループ %s を作成しました" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "リポジトリグループ %s を更新しました" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "リポジトリグループ %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "このグループは %s 個のリポジトリを含んでいるため削除できません" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "このグループは %s 個のサブグループを含んでいるため削除できません" -#: kallithea/controllers/admin/repo_groups.py:258 +#: kallithea/controllers/admin/repo_groups.py:264 #, python-format msgid "Removed repository group %s" msgstr "リポジトリグループ %s を削除しました" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "リポジトリグループ %s の削除中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "自分自身の管理者としての権限を取り消すことはできません" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "リポジトリグループ権限を更新しました" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "権限の取消中にエラーが発生しました" @@ -790,110 +790,110 @@ msgid "Error creating repository %s" msgstr "リポジトリ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "リポジトリ %s を %s から作成しました" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "リポジトリ %s を %s としてフォークしました" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "リポジトリ %s を作成しました" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "リポジトリ %s の更新に成功しました" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "リポジトリ %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "%s 個のフォークを切り離しました" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "%s 個のフォークを削除しました" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "リポジトリ %s を削除しました" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" "フォークしたリポジトリが存在するため、 リポジトリ %s は削除できません" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "%s の削除中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "リポジトリ権限を更新しました" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, fuzzy, python-format #| msgid "An error occurred during creation of field" msgid "An error occurred during creation of field: %r" msgstr "フィールドの作成中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "フィールドの削除中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "-- フォークではありません --" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "公開ジャーナルでのリポジトリの可視性を更新しました" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:467 +#: kallithea/controllers/admin/repos.py:469 msgid "Nothing" msgstr "ありません" -#: kallithea/controllers/admin/repos.py:469 +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "%s リポジトリを %s のフォークとする" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "操作中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "リモートから取得" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "リモートから取得中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "リポジトリステートの削除中にエラーが発生しました" @@ -1370,136 +1370,136 @@ msgid "[Mention]" msgstr "[Mention]" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "top level" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "Kallithea 管理者" -#: kallithea/model/db.py:1544 +#: kallithea/model/db.py:1545 msgid "Default user has no access to new repositories" msgstr "デフォルトユーザーは新しいリポジトリにアクセスできません" -#: kallithea/model/db.py:1545 +#: kallithea/model/db.py:1546 msgid "Default user has read access to new repositories" msgstr "" "デフォルトユーザーは新しいリポジトリに読み取りアクセスする権限があります" -#: kallithea/model/db.py:1546 +#: kallithea/model/db.py:1547 msgid "Default user has write access to new repositories" msgstr "" "デフォルトユーザーは新しいリポジトリに書き込みアクセスする権限があります" -#: kallithea/model/db.py:1547 +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 +#: kallithea/model/db.py:1560 msgid "Only admins can create repository groups" msgstr "管理者のみがリポジトリのグループを作成できます" -#: kallithea/model/db.py:1560 +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "非管理者がリポジトリのグループを作成できます" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1563 msgid "Only admins can create user groups" msgstr "管理者だけがユーザー グループを作成することができます" -#: kallithea/model/db.py:1563 +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "非管理者ユーザーがグループを作成することができます" -#: kallithea/model/db.py:1565 +#: kallithea/model/db.py:1566 msgid "Only admins can create top level repositories" msgstr "管理者だけがトップレベルにリポジトリを作成することができます" -#: kallithea/model/db.py:1566 +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "非管理者がトップレベルにリポジトリを作成することができます" -#: kallithea/model/db.py:1568 +#: kallithea/model/db.py:1569 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" -#: kallithea/model/db.py:1569 +#: kallithea/model/db.py:1570 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" -#: kallithea/model/db.py:1571 +#: kallithea/model/db.py:1572 msgid "Only admins can fork repositories" msgstr "管理者のみがリポジトリをフォークすることができます" -#: kallithea/model/db.py:1572 +#: kallithea/model/db.py:1573 #, fuzzy msgid "Non-admins can fork repositories" msgstr "非管理者がリポジトリをフォークすることができます" -#: kallithea/model/db.py:1574 +#: kallithea/model/db.py:1575 msgid "Registration disabled" msgstr "新規登録を無効にする" -#: kallithea/model/db.py:1575 +#: kallithea/model/db.py:1576 msgid "User registration with manual account activation" msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" -#: kallithea/model/db.py:1576 +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" -#: kallithea/model/db.py:1992 +#: kallithea/model/db.py:1993 msgid "Not reviewed" msgstr "未レビュー" -#: kallithea/model/db.py:1993 +#: kallithea/model/db.py:1994 msgid "Under review" msgstr "レビュー中" -#: kallithea/model/db.py:1994 +#: kallithea/model/db.py:1995 #, fuzzy #| msgid "Approved" msgid "Not approved" msgstr "承認" -#: kallithea/model/db.py:1995 +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "承認" @@ -2194,7 +2194,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2383,7 +2383,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2842,17 +2842,11 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "グループ書き込み権限でのリポジトリ作成" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 #, fuzzy msgid "" "With this, write permission to a repository group allows creating " @@ -2862,27 +2856,27 @@ "リポジトリグループに書き込みパーミッションを付与すると、グループ内にリポジ" "トリを作成できるようになります" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "ユーザーグループ作成" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "リポジトリのフォーク" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "新規登録" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "外部認証アカウントのアクティベート" @@ -4409,6 +4403,13 @@ msgid "Changeset status: %s by %s" msgstr "チェンジセットステータス: %s" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +#| msgid "Commit messages" +msgid "(No commit message)" +msgstr "コミットメッセージ" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr "コミットメッセージを展開"
--- a/kallithea/i18n/kallithea.pot Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/kallithea.pot Wed May 12 01:33:29 2021 +0200 @@ -1,21 +1,21 @@ # Translations template for Kallithea. -# Copyright (C) 2020 Various authors, licensing as GPLv3 +# Copyright (C) 2021 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2020. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2021. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Kallithea 0.6.1\n" +"Project-Id-Version: Kallithea 0.6.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.8.0\n" +"Generated-By: Babel 2.8.1\n" #: kallithea/controllers/changelog.py:67 #: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 @@ -674,11 +674,11 @@ msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "" @@ -710,48 +710,48 @@ msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 -#, python-format -msgid "This group contains %s subgroups and cannot be deleted" -msgstr "" - #: kallithea/controllers/admin/repo_groups.py:258 #, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:264 +#, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "" @@ -761,108 +761,108 @@ msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, python-format msgid "An error occurred during creation of field: %r" msgstr "" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:467 -msgid "Nothing" -msgstr "" - #: kallithea/controllers/admin/repos.py:469 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "" @@ -1327,127 +1327,127 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1544 -msgid "Default user has no access to new repositories" -msgstr "" - #: kallithea/model/db.py:1545 -msgid "Default user has read access to new repositories" +msgid "Default user has no access to new repositories" msgstr "" #: kallithea/model/db.py:1546 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1547 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1560 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1562 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1563 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1565 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1566 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1568 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - #: kallithea/model/db.py:1569 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 msgid "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 -msgid "Only admins can fork repositories" -msgstr "" - #: kallithea/model/db.py:1572 +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1573 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1574 -msgid "Registration disabled" -msgstr "" - #: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" +msgid "Registration disabled" msgstr "" #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:1992 -msgid "Not reviewed" -msgstr "" - #: kallithea/model/db.py:1993 -msgid "Under review" +msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:1994 -msgid "Not approved" +msgid "Under review" msgstr "" #: kallithea/model/db.py:1995 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "" @@ -2105,7 +2105,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2288,7 +2288,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2717,44 +2717,38 @@ msgid "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "" @@ -3381,7 +3375,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4161,6 +4155,11 @@ msgid "Changeset status: %s by %s" msgstr "" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "(No commit message)" +msgstr "" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr ""
--- a/kallithea/i18n/lb/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/lb/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -3,7 +3,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2020-04-13 19:42+0000\n" "Last-Translator: Dennis Fink <dennis.fink@c3l.lu>\n" "Language: lb\n" @@ -674,11 +674,11 @@ msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "" @@ -710,48 +710,48 @@ msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 -#, python-format -msgid "This group contains %s subgroups and cannot be deleted" -msgstr "" - #: kallithea/controllers/admin/repo_groups.py:258 #, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:264 +#, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "" @@ -761,108 +761,108 @@ msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Quell %s erstallt" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Quell %s geläscht" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, python-format msgid "An error occurred during creation of field: %r" msgstr "" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:467 +#: kallithea/controllers/admin/repos.py:469 msgid "Nothing" msgstr "Näischt" -#: kallithea/controllers/admin/repos.py:469 +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "" @@ -1330,129 +1330,129 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1544 -msgid "Default user has no access to new repositories" -msgstr "" - #: kallithea/model/db.py:1545 -msgid "Default user has read access to new repositories" +msgid "Default user has no access to new repositories" msgstr "" #: kallithea/model/db.py:1546 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1547 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1560 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1562 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1563 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1565 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1566 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1568 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - #: kallithea/model/db.py:1569 msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 +msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 -msgid "Only admins can fork repositories" -msgstr "" - #: kallithea/model/db.py:1572 +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1573 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1574 -msgid "Registration disabled" -msgstr "" - #: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" +msgid "Registration disabled" msgstr "" #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:1992 -msgid "Not reviewed" -msgstr "" - #: kallithea/model/db.py:1993 -msgid "Under review" +msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:1994 -msgid "Not approved" +msgid "Under review" msgstr "" #: kallithea/model/db.py:1995 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "" @@ -2113,7 +2113,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2296,7 +2296,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2727,44 +2727,38 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "" @@ -3394,7 +3388,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4179,6 +4173,11 @@ msgid "Changeset status: %s by %s" msgstr "" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "(No commit message)" +msgstr "" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr ""
--- a/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3.99\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2020-08-11 11:32+0000\n" "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n" "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/" @@ -702,11 +702,11 @@ msgid "Allowed with automatic account activation" msgstr "Tillatt med automatisk kontoaktivering" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "Manuell aktivering av ekstern konto" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "Automatisk aktivering av ekstern konto" @@ -739,49 +739,49 @@ msgid "Created repository group %s" msgstr "Opprettet pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "Oppdaterte pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Feil inntraff under oppdatering av pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Denne gruppen inneholder %s pakkebrønner og kan ikke slettes" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Denne grunnen inneholder %s undergrupper og kan ikke slettes" -#: kallithea/controllers/admin/repo_groups.py:258 +#: kallithea/controllers/admin/repo_groups.py:264 #, python-format msgid "Removed repository group %s" msgstr "Fjernet pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Feil inntraff under sletting av pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 #, fuzzy msgid "Cannot revoke permission for yourself as admin" msgstr "Kan ikke tilbakekalle egen administratortilgang" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "Pakkebrønnsgruppetilganger oppdatert" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "En feil inntraff under tilbakekalling av tilgang" @@ -791,111 +791,111 @@ msgid "Error creating repository %s" msgstr "Feil under opprettelse av pakkebrønnen %s" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "Opprettet pakkebrønnen %s fra %s" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "Forgrenet pakkebrønnen %s som %s" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Opprettet pakkebrønnen %s" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Pakkebrønnen %s ble oppdatert" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Feil under oppdatering av pakkebrønnen %s" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "Avhektet %s forgreninger" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "Slettet %s forgreninger" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Slettet pakkebrønnen %s" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Kan ikke slette pakkebrønne %s, som fremdeles har forgreninger" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "En feil inntraff under sletting av %s" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Pakkebrønnstilganger oppdatert" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, python-format msgid "An error occurred during creation of field: %r" msgstr "" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "Feil inntraff under fjerning av felt" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "-- Ikke en forgrening --" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "Oppdaterte pakkebrønnssynlighet i offentlig loggbok" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 #, fuzzy msgid "An error occurred during setting this repository in public journal" msgstr "" "En feil inntraff under innlemmelse av denne pakkebrønnen i offentlig " "loggbok" -#: kallithea/controllers/admin/repos.py:467 +#: kallithea/controllers/admin/repos.py:469 msgid "Nothing" msgstr "Ingenting" -#: kallithea/controllers/admin/repos.py:469 +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Markerte pakkebrønnen %s som en forgrening av %s" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "En feil inntraff under denne operasjonen" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "" @@ -1374,130 +1374,130 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "toppnivå" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "Kallithea-administrator" -#: kallithea/model/db.py:1544 +#: kallithea/model/db.py:1545 #, fuzzy msgid "Default user has no access to new repositories" msgstr "Forvalgt bruker har ingen tilgang til nye pakkebrønner" -#: kallithea/model/db.py:1545 +#: kallithea/model/db.py:1546 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1546 -msgid "Default user has write access to new repositories" -msgstr "" - #: kallithea/model/db.py:1547 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1560 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1562 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1563 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1565 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1566 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1568 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - #: kallithea/model/db.py:1569 msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 +msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 -msgid "Only admins can fork repositories" -msgstr "" - #: kallithea/model/db.py:1572 +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1573 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1574 -msgid "Registration disabled" -msgstr "" - #: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" +msgid "Registration disabled" msgstr "" #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:1992 -msgid "Not reviewed" -msgstr "" - #: kallithea/model/db.py:1993 -msgid "Under review" +msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:1994 +msgid "Under review" +msgstr "" + +#: kallithea/model/db.py:1995 msgid "Not approved" msgstr "Ikke godkjent" -#: kallithea/model/db.py:1995 +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "Godkjent" @@ -2166,7 +2166,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2349,7 +2349,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2787,44 +2787,38 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "Registrering" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "" @@ -3455,7 +3449,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4255,6 +4249,11 @@ msgid "Changeset status: %s by %s" msgstr "" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "(No commit message)" +msgstr "" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr ""
--- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2019-10-05 19:28+0000\n" "Last-Translator: Thomas De Schampheleire <patrickdepinguin@gmail.com>\n" "Language-Team: Flemish <https://hosted.weblate.org/projects/kallithea/" @@ -686,11 +686,11 @@ msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "" @@ -722,48 +722,48 @@ msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 -#, python-format -msgid "This group contains %s subgroups and cannot be deleted" -msgstr "" - #: kallithea/controllers/admin/repo_groups.py:258 #, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:264 +#, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "" @@ -773,108 +773,108 @@ msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, python-format msgid "An error occurred during creation of field: %r" msgstr "Er is een fout opgetreden tijdens het aanmaken van veld: %r" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:467 -msgid "Nothing" -msgstr "" - #: kallithea/controllers/admin/repos.py:469 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "" @@ -1342,129 +1342,129 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1544 -msgid "Default user has no access to new repositories" -msgstr "" - #: kallithea/model/db.py:1545 -msgid "Default user has read access to new repositories" +msgid "Default user has no access to new repositories" msgstr "" #: kallithea/model/db.py:1546 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1547 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1560 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1562 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1563 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1565 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1566 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1568 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - #: kallithea/model/db.py:1569 msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 +msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 -msgid "Only admins can fork repositories" -msgstr "" - #: kallithea/model/db.py:1572 +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1573 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1574 -msgid "Registration disabled" -msgstr "" - #: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" +msgid "Registration disabled" msgstr "" #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:1992 -msgid "Not reviewed" -msgstr "" - #: kallithea/model/db.py:1993 -msgid "Under review" +msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:1994 -msgid "Not approved" +msgid "Under review" msgstr "" #: kallithea/model/db.py:1995 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "" @@ -2126,7 +2126,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2309,7 +2309,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2740,44 +2740,38 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "" @@ -3407,7 +3401,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4192,6 +4186,11 @@ msgid "Changeset status: %s by %s" msgstr "Changeset status: %s door %s" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "(No commit message)" +msgstr "" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr ""
--- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2021-01-15 18:32+0000\n" "Last-Translator: robertus <robertuss12@gmail.com>\n" "Language-Team: Polish <https://hosted.weblate.org/projects/kallithea/" @@ -13,8 +13,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n" +"%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 4.5-dev\n" #: kallithea/controllers/changelog.py:67 @@ -691,11 +691,11 @@ msgid "Allowed with automatic account activation" msgstr "Dozwolona z automatyczną aktywacją konta" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "Ręczna aktywacja nowego konta" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "Automatyczna aktywacja nowego konta" @@ -727,48 +727,48 @@ msgid "Created repository group %s" msgstr "Utworzono grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "Zaktualizowano grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Wystąpił błąd podczas aktualizacji grupy repo %s" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta" -#: kallithea/controllers/admin/repo_groups.py:252 -#, python-format -msgid "This group contains %s subgroups and cannot be deleted" -msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta" - #: kallithea/controllers/admin/repo_groups.py:258 #, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta" + +#: kallithea/controllers/admin/repo_groups.py:264 +#, python-format msgid "Removed repository group %s" msgstr "Usunięto grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Wystąpił błąd podczas usuwania z repozytorium grupy %s" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "Nie można cofnąć zezwolenia dla admina jako admin" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "Aktualizacja uprawnień grup repozytorium" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "Wystąpił błąd podczas cofania zezwolenia" @@ -778,110 +778,110 @@ msgid "Error creating repository %s" msgstr "Błąd podczas tworzenia repozytorium %s" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "utworzone repozytorium %s z %s" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "Gałęzi %s w repozytorium %s" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Utworzone repozytorium %s" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Repozytorium %s zostało pomyślnie zaktualizowane" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Wystąpił błąd podczas aktualizacji repozytorium %s" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "Oderwane rozgałęzienie %s" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "Usunięte rozgałęzienia %s" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Usunięte repozytorium %s" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" "Nie można usunąć repozytorium %s nadal zawiera załączniki rozgałęzienia" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "Wystąpił błąd podczas usuwania %s" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Uprawnienia repozytorium zostały zaktualizowane" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "Błąd walidacji pola: %s" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, python-format msgid "An error occurred during creation of field: %r" msgstr "Wystąpił błąd podczas tworzenia pola: %r" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "Wystąpił błąd podczas usuwania pola" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "-- Brak rozgałęzienia --" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "Zaktualizowano widoczność stron w publicznym dzienniku" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "" "Wystąpił błąd podczas ustawiania tego repozytorium w dzienniku publicznym" -#: kallithea/controllers/admin/repos.py:467 +#: kallithea/controllers/admin/repos.py:469 msgid "Nothing" msgstr "Brak" -#: kallithea/controllers/admin/repos.py:469 +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Oznaczono %s repo jako rozwidlenie %s" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "Wystąpił błąd podczas tej operacji" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "Pobieranie z lokalizacji zdalnej" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk" @@ -893,7 +893,8 @@ msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" -msgstr "Nie można włączyć obsługi hgsubversion. Brak biblioteki „hgsubversion”" +msgstr "" +"Nie można włączyć obsługi hgsubversion. Brak biblioteki „hgsubversion”" #: kallithea/controllers/admin/settings.py:142 #: kallithea/controllers/admin/settings.py:234 @@ -1053,7 +1054,8 @@ msgid "" "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -"Wykryto wyciek tokenu CSRF — wszystkie tokeny formularza zostały unieważnione" +"Wykryto wyciek tokenu CSRF — wszystkie tokeny formularza zostały " +"unieważnione" #: kallithea/lib/base.py:580 #, fuzzy @@ -1286,8 +1288,8 @@ #, python-format msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" msgstr "" -"Nieprawidłowy klucz SSH - część kodowana base64 nie jest %r jak podano, ale " -"%r" +"Nieprawidłowy klucz SSH - część kodowana base64 nie jest %r jak podano, " +"ale %r" #: kallithea/lib/utils2.py:253 #, python-format @@ -1370,137 +1372,141 @@ msgid "[Mention]" msgstr "[Wymieniony]" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "najwyższy poziom" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "Administrator Kallithea" -#: kallithea/model/db.py:1544 +#: kallithea/model/db.py:1545 msgid "Default user has no access to new repositories" msgstr "Domyślny użytkownik nie ma dostępu do nowych repozytoriów" -#: kallithea/model/db.py:1545 +#: kallithea/model/db.py:1546 msgid "Default user has read access to new repositories" msgstr "Użytkownik domyślny ma dostęp do odczytu nowych repozytoriów" -#: kallithea/model/db.py:1546 +#: kallithea/model/db.py:1547 msgid "Default user has write access to new repositories" msgstr "Użytkownik domyślny ma dostęp do zapisu nowych repozytoriów" -#: kallithea/model/db.py:1547 +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" -msgstr "Domyślny użytkownik ma dostęp administracyjny do nowych repozytoriów" - -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "Domyślny użytkownik nie ma dostępu do nowych grup repozytoriów" +msgstr "" +"Domyślny użytkownik ma dostęp administracyjny do nowych repozytoriów" #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" -msgstr "Domyślny użytkownik ma dostęp do odczytu do nowych grup repozytoriów" +msgid "Default user has no access to new repository groups" +msgstr "Domyślny użytkownik nie ma dostępu do nowych grup repozytoriów" #: kallithea/model/db.py:1551 +msgid "Default user has read access to new repository groups" +msgstr "" +"Domyślny użytkownik ma dostęp do odczytu do nowych grup repozytoriów" + +#: kallithea/model/db.py:1552 msgid "Default user has write access to new repository groups" msgstr "Domyślny użytkownik ma dostęp do zapisu do nowych grup repozytoriów" -#: kallithea/model/db.py:1552 +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" "Domyślny użytkownik ma dostęp administracyjny do nowych grup repozytoriów" -#: kallithea/model/db.py:1554 +#: kallithea/model/db.py:1555 msgid "Default user has no access to new user groups" msgstr "Domyślny użytkownik nie ma dostępu do nowych grup użytkowników" -#: kallithea/model/db.py:1555 +#: kallithea/model/db.py:1556 msgid "Default user has read access to new user groups" -msgstr "Domyślny użytkownik ma dostęp do odczytu do nowych grup użytkowników" - -#: kallithea/model/db.py:1556 +msgstr "" +"Domyślny użytkownik ma dostęp do odczytu do nowych grup użytkowników" + +#: kallithea/model/db.py:1557 msgid "Default user has write access to new user groups" msgstr "Domyślny użytkownik ma dostęp do zapisu do nowych grup użytkowników" -#: kallithea/model/db.py:1557 +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" "Domyślny użytkownik ma dostęp administracyjny do nowych grup użytkowników" -#: kallithea/model/db.py:1559 +#: kallithea/model/db.py:1560 msgid "Only admins can create repository groups" msgstr "Tylko administratorzy mogą tworzyć grupy repozytoriów" -#: kallithea/model/db.py:1560 +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "" "Użytkownicy bez uprawnień administratora mogą tworzyć grupy repozytoriów" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1563 msgid "Only admins can create user groups" msgstr "Tylko administratorzy mogą tworzyć grupy użytkowników" -#: kallithea/model/db.py:1563 +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "" "Użytkownicy bez uprawnień administratora mogą tworzyć grupy użytkowników" -#: kallithea/model/db.py:1565 +#: kallithea/model/db.py:1566 msgid "Only admins can create top level repositories" msgstr "Tylko administratorzy mogą tworzyć repozytoria najwyższego poziomu" -#: kallithea/model/db.py:1566 +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" -"Osoby niebędące administratorami mogą tworzyć repozytoria najwyższego poziomu" - -#: kallithea/model/db.py:1568 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" +"Osoby niebędące administratorami mogą tworzyć repozytoria najwyższego " +"poziomu" #: kallithea/model/db.py:1569 msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 +msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 +#: kallithea/model/db.py:1572 #, fuzzy msgid "Only admins can fork repositories" msgstr "Tylko admini mogą rozgałęziać repozytoria" -#: kallithea/model/db.py:1572 +#: kallithea/model/db.py:1573 #, fuzzy msgid "Non-admins can fork repositories" msgstr "" "Użytkownicy bez uprawnień administratora mogą rozgałęziać repozytoria" -#: kallithea/model/db.py:1574 +#: kallithea/model/db.py:1575 msgid "Registration disabled" msgstr "Rejestracja wyłączona" -#: kallithea/model/db.py:1575 +#: kallithea/model/db.py:1576 msgid "User registration with manual account activation" msgstr "Rejestracja użytkownika z ręczną aktywacją konta" -#: kallithea/model/db.py:1576 +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" -#: kallithea/model/db.py:1992 +#: kallithea/model/db.py:1993 msgid "Not reviewed" msgstr "Brak Korekty" -#: kallithea/model/db.py:1993 +#: kallithea/model/db.py:1994 msgid "Under review" msgstr "Objęty Przeglądem" -#: kallithea/model/db.py:1994 +#: kallithea/model/db.py:1995 msgid "Not approved" msgstr "Niezaakceptowano" -#: kallithea/model/db.py:1995 +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "Zaakceptowano" @@ -1686,8 +1692,8 @@ "The password to your account %s has been changed using password reset " "form." msgstr "" -"Hasło do Twojego konta %s zostało zmienione za pomocą formularza resetowania " -"hasła." +"Hasło do Twojego konta %s zostało zmienione za pomocą formularza " +"resetowania hasła." #: kallithea/model/validators.py:53 kallithea/model/validators.py:54 msgid "Value cannot be an empty list" @@ -1797,8 +1803,8 @@ "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -"Nieprawidłowy adres URL repozytorium. Musi to być prawidłowy adres URL typu " -"http, https, ssh, svn + http lub svn + https" +"Nieprawidłowy adres URL repozytorium. Musi to być prawidłowy adres URL " +"typu http, https, ssh, svn + http lub svn + https" #: kallithea/model/validators.py:427 msgid "Fork has to be the same type as parent" @@ -2033,8 +2039,8 @@ "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "" -"Link do zresetowania hasła zostanie wysłany na adres e-mail znajdujący się w " -"systemie." +"Link do zresetowania hasła zostanie wysłany na adres e-mail znajdujący " +"się w systemie." #: kallithea/templates/password_reset_confirmation.html:23 #, python-format @@ -2046,8 +2052,8 @@ "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -"Zapamiętaj, że należy użyć do tego tej samej sesji przeglądarki, co użyta do " -"żądania zresetowania hasła." +"Zapamiętaj, że należy użyć do tego tej samej sesji przeglądarki, co użyta " +"do żądania zresetowania hasła." #: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" @@ -2199,7 +2205,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2384,7 +2390,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2837,44 +2843,38 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "Tworzenie grupy użytkowników" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "Rozwidlanie repozytorium" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "Rejestracja" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "Autoryzacja aktywacji zewnętrznego konta" @@ -3553,7 +3553,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4386,6 +4386,13 @@ msgid "Changeset status: %s by %s" msgstr "Status grupy zmian: %s przez %s" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +#| msgid "Commit messages" +msgid "(No commit message)" +msgstr "Komunikaty" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr ""
--- a/kallithea/i18n/pt/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/pt/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.6.1\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-06-18 16:35+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2021-05-10 09:32+0000\n" "Last-Translator: ssantos <ssantos@web.de>\n" "Language-Team: none\n" @@ -685,11 +685,11 @@ msgid "Allowed with automatic account activation" msgstr "Permitido com ativação automática de conta" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "Ativação manual de conta externa" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "Ativação automática de conta externa" @@ -721,48 +721,48 @@ msgid "Created repository group %s" msgstr "Grupo de repositórios %s criado" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "Grupo de repositórios %s atualizado" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Ocorreu um erro durante a atualização do grupo de repositórios %s" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Esse grupo contém %s repositórios e não pode ser apagado" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Este grupo contém %s subgrupos e não pode ser apagado" -#: kallithea/controllers/admin/repo_groups.py:258 +#: kallithea/controllers/admin/repo_groups.py:264 #, python-format msgid "Removed repository group %s" msgstr "Grupo de repositórios %s apagado" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Ocorreu um erro durante a exclusão do grupo de repositórios %s" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "Não pode revocar sua própria permissão de administrador" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "Permissões atualizadas do Grupo de Repositórios" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "Ocorreu um erro durante a revocação das permissões" @@ -772,108 +772,108 @@ msgid "Error creating repository %s" msgstr "Erro ao criar repositório %s" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "Repositório %s criado de %s" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "Repositório %s bifurcado como %s" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Repositório %s criado" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Repositório %s atualizado com sucesso" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Ocorreu um erro durante a atualização do repositório %s" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "%s bifurcações apagadas" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Repositório %s apagado" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "Ocorreu um erro durante a exclusão de %s" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Permissões do repositório atualizadas" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, python-format msgid "An error occurred during creation of field: %r" msgstr "" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "Ocorreu um erro durante a remoção do campo" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "Atualizada a visibilidade do repositório no diário público" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "Ocorreu um erro ao ajustar esse repositório no diário público" -#: kallithea/controllers/admin/repos.py:467 +#: kallithea/controllers/admin/repos.py:469 msgid "Nothing" msgstr "Nada" -#: kallithea/controllers/admin/repos.py:469 +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Marcado repositório %s como bifurcação de %s" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "Ocorreu um erro durante essa operação" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "Ocorreu um erro ao realizar pull de localização remota" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "Ocorreu um erro ao apagar as estatísticas de repositório" @@ -1348,129 +1348,129 @@ msgid "[Mention]" msgstr "[Menção]" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "nível superior" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "Administrador do Kallithea" -#: kallithea/model/db.py:1544 +#: kallithea/model/db.py:1545 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1545 -msgid "Default user has read access to new repositories" -msgstr "" - #: kallithea/model/db.py:1546 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1547 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1560 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1562 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1563 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1565 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1566 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1568 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - #: kallithea/model/db.py:1569 msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 +msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 -msgid "Only admins can fork repositories" -msgstr "" - #: kallithea/model/db.py:1572 +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1573 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1574 -msgid "Registration disabled" -msgstr "Registo desativado" - #: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" -msgstr "" +msgid "Registration disabled" +msgstr "Registo desativado" #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:1992 -msgid "Not reviewed" -msgstr "" - #: kallithea/model/db.py:1993 -msgid "Under review" +msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:1994 -msgid "Not approved" +msgid "Under review" msgstr "" #: kallithea/model/db.py:1995 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "Aprovado" @@ -2137,7 +2137,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2322,7 +2322,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2759,44 +2759,38 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "Criação de grupo de utilizadores" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "Bifurcação de repositório" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "Registo" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "Ativação de autenticação de conta externa" @@ -3430,7 +3424,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4223,6 +4217,13 @@ msgid "Changeset status: %s by %s" msgstr "" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +#| msgid "Commit messages" +msgid "(No commit message)" +msgstr "Mensagens de commit" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr ""
--- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: Marcin Kuźmiński <marcin@python-works.com>\n" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" @@ -703,11 +703,11 @@ msgid "Allowed with automatic account activation" msgstr "Permitido com ativação automática de conta" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "Ativação manual de conta externa" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "Ativação automática de conta externa" @@ -739,48 +739,48 @@ msgid "Created repository group %s" msgstr "Grupo de repositórios %s criado" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "Grupo de repositórios %s atualizado" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Ocorreu um erro durante a atualização do grupo de repositórios %s" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Esse grupo contém %s repositórios e não pode ser excluído" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Este grupo contém %s subgrupos e não pode ser excluído" -#: kallithea/controllers/admin/repo_groups.py:258 +#: kallithea/controllers/admin/repo_groups.py:264 #, python-format msgid "Removed repository group %s" msgstr "Grupo de repositórios %s excluído" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Ocorreu um erro durante a exclusão do grupo de repositórios %s" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "Você não pode revocar sua própria permissão de administrador" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "Permissões atualizadas do Grupo de Repositórios" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "Ocorreu um erro durante a revocação das permissões" @@ -790,110 +790,110 @@ msgid "Error creating repository %s" msgstr "Erro ao criar repositório %s" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "Repositório %s criado de %s" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "Repositório %s bifurcado como %s" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Repositório %s criado" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Repositório %s atualizado com sucesso" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Ocorreu um erro durante a atualização do repositório %s" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "%s bifurcações excluídas" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Repositório %s excluído" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, fuzzy, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" "Nao é possível excluir %s pois ele ainda contém bifurcações vinculadas" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "Ocorreu um erro durante a exclusão de %s" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Permissões do repositório atualizadas" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, fuzzy, python-format #| msgid "An error occurred during creation of field" msgid "An error occurred during creation of field: %r" msgstr "Ocorreu um erro durante a criação do campo" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "Ocorreu um erro durante a remoção do campo" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "Atualizada a visibilidade do repositório no diário público" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "Ocorreu um erro ao ajustar esse repositório no diário público" -#: kallithea/controllers/admin/repos.py:467 +#: kallithea/controllers/admin/repos.py:469 msgid "Nothing" msgstr "Nada" -#: kallithea/controllers/admin/repos.py:469 +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Marcado repositório %s como bifurcação de %s" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "Ocorreu um erro durante essa operação" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "Ocorreu um erro ao realizar pull de localização remota" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "Ocorreu um erro ao excluir estatísticas de repositório" @@ -1375,143 +1375,143 @@ msgid "[Mention]" msgstr "[Menção]" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "nível superior" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "Administrador do Kallithea" -#: kallithea/model/db.py:1544 +#: kallithea/model/db.py:1545 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1545 +#: kallithea/model/db.py:1546 #, fuzzy msgid "Default user has read access to new repositories" msgstr "Acesso não autorizado ao recurso" -#: kallithea/model/db.py:1546 +#: kallithea/model/db.py:1547 #, fuzzy msgid "Default user has write access to new repositories" msgstr "Acesso não autorizado ao recurso" -#: kallithea/model/db.py:1547 +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 +#: kallithea/model/db.py:1560 #, fuzzy msgid "Only admins can create repository groups" msgstr "Grupo de repositórios %s criado" -#: kallithea/model/db.py:1560 +#: kallithea/model/db.py:1561 #, fuzzy msgid "Non-admins can create repository groups" msgstr "Grupo de repositórios %s criado" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1563 #, fuzzy msgid "Only admins can create user groups" msgstr "Criar grupos de usuários" -#: kallithea/model/db.py:1563 +#: kallithea/model/db.py:1564 #, fuzzy msgid "Non-admins can create user groups" msgstr "Criar grupos de usuários" -#: kallithea/model/db.py:1565 +#: kallithea/model/db.py:1566 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1566 +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1568 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - #: kallithea/model/db.py:1569 msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 +msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 +#: kallithea/model/db.py:1572 #, fuzzy msgid "Only admins can fork repositories" msgstr "Criar repositórios" -#: kallithea/model/db.py:1572 +#: kallithea/model/db.py:1573 #, fuzzy msgid "Non-admins can fork repositories" msgstr "Invalidar o cache para todos os repositórios" -#: kallithea/model/db.py:1574 +#: kallithea/model/db.py:1575 msgid "Registration disabled" msgstr "Registro desatilitado" -#: kallithea/model/db.py:1575 +#: kallithea/model/db.py:1576 #, fuzzy msgid "User registration with manual account activation" msgstr "Registro de Usuário com ativação manual de conta" -#: kallithea/model/db.py:1576 +#: kallithea/model/db.py:1577 #, fuzzy msgid "User registration with automatic account activation" msgstr "Registro de Usuário com ativação automática de conta" -#: kallithea/model/db.py:1992 +#: kallithea/model/db.py:1993 #, fuzzy msgid "Not reviewed" msgstr "Não Revisado" -#: kallithea/model/db.py:1993 +#: kallithea/model/db.py:1994 #, fuzzy msgid "Under review" msgstr "Sob Revisão" -#: kallithea/model/db.py:1994 +#: kallithea/model/db.py:1995 #, fuzzy #| msgid "Approved" msgid "Not approved" msgstr "Aprovado" -#: kallithea/model/db.py:1995 +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "Aprovado" @@ -2211,7 +2211,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2398,7 +2398,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2861,44 +2861,38 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "Criação de grupo de usuários" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "Bifurcação de repositório" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "Registro" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "Ativação de autenticação de conta externa" @@ -3578,7 +3572,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4411,6 +4405,13 @@ msgid "Changeset status: %s by %s" msgstr "Estado do changeset: %s" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +#| msgid "Commit messages" +msgid "(No commit message)" +msgstr "Mensagens de commit" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr ""
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2021-02-14 06:50+0000\n" "Last-Translator: vs <vsuhachev@yandex.ru>\n" "Language-Team: Russian <https://hosted.weblate.org/projects/kallithea/" @@ -689,11 +689,11 @@ msgid "Allowed with automatic account activation" msgstr "Разрешена, с автоматической активацией учётной записи" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "Ручная активация внешней учетной записи" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "Автоматическая активация внешней учетной записи" @@ -725,48 +725,48 @@ msgid "Created repository group %s" msgstr "Создана новая группа репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "Группа репозиториев %s обновлена" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Произошла ошибка при обновлении группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Данная группа содержит %s репозитариев и не может быть удалена" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Группа содержит в себе %s подгрупп и не может быть удалён" -#: kallithea/controllers/admin/repo_groups.py:258 +#: kallithea/controllers/admin/repo_groups.py:264 #, python-format msgid "Removed repository group %s" msgstr "Группа репозиториев %s удалена" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Произошла ошибка при удалении группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "Администратор не может отозвать свои привелегии" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "Привилегии группы репозиториев обновлены" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "Произошла ошибка при отзыве привелегии" @@ -776,108 +776,108 @@ msgid "Error creating repository %s" msgstr "Произошла ошибка при создании репозитория %s" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "Репозиторий %s создан из %s" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "Создан форк репозитория %s с именем %s" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Репозиторий %s создан" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Репозитарий %s успешно обновлён" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Произошла ошибка во время обновления репозитория %s" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "Форки %s отсоединены" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "Удалены форки репозитория %s" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Репозиторий %s удалён" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Невозможно удалить репозиторий %s, поскольку существуют его форки" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "Произошла ошибка во время удаления %s" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Привилегии репозитория обновлены" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "Ошибка валидации поля: %s" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, python-format msgid "An error occurred during creation of field: %r" msgstr "Произошла ошибка при создании поля: %r" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "Произошла ошибка при удалении поля" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "-- Не является форком --" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "Видимость репозитория в публичном журнале обновлена" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "Произошла ошибка при установке репозитария в общедоступный журнал" -#: kallithea/controllers/admin/repos.py:467 +#: kallithea/controllers/admin/repos.py:469 msgid "Nothing" msgstr "Отсутствуют" -#: kallithea/controllers/admin/repos.py:469 +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Репозиторий %s отмечен как форк от %s" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "Произошла ошибка при выполнении операции" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "Получено из удалённого репозитория" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "Произошла ошибка при получении изменений из удалённого репозитория" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "Произошла ошибка при удалении статистики репозитория" @@ -1366,151 +1366,151 @@ msgid "[Mention]" msgstr "[Упоминание]" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "верхний уровень" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "Администратор Kallithea" -#: kallithea/model/db.py:1544 +#: kallithea/model/db.py:1545 msgid "Default user has no access to new repositories" msgstr "" "Неавторизованные пользователи не имеют прав доступа к новым репозиториям" -#: kallithea/model/db.py:1545 +#: kallithea/model/db.py:1546 msgid "Default user has read access to new repositories" msgstr "Неавторизованные пользователи имеют право чтения новых репозиториев" -#: kallithea/model/db.py:1546 +#: kallithea/model/db.py:1547 msgid "Default user has write access to new repositories" msgstr "" "Неавторизованные пользователи имеют право записи в новые репозитории" -#: kallithea/model/db.py:1547 +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" "Неавторизованные пользователи имеют права администратора к новым " "репозиториям" -#: kallithea/model/db.py:1549 +#: kallithea/model/db.py:1550 msgid "Default user has no access to new repository groups" msgstr "" "Неавторизованные пользователи не имеют прав доступа к новым группам " "репозиториев" -#: kallithea/model/db.py:1550 +#: kallithea/model/db.py:1551 msgid "Default user has read access to new repository groups" msgstr "" "Неавторизованные пользователи имеют право чтения в новых группах " "репозиториев" -#: kallithea/model/db.py:1551 +#: kallithea/model/db.py:1552 msgid "Default user has write access to new repository groups" msgstr "" "Неавторизованные пользователи имеют право записи в новых группах " "репозиториев" -#: kallithea/model/db.py:1552 +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" "Неавторизованные пользователи имеют права администратора к новым групппам " "репозиториев" -#: kallithea/model/db.py:1554 +#: kallithea/model/db.py:1555 msgid "Default user has no access to new user groups" msgstr "" "Неавторизованные пользователи не имеют прав доступа к новым группам " "пользователей" -#: kallithea/model/db.py:1555 +#: kallithea/model/db.py:1556 msgid "Default user has read access to new user groups" msgstr "" "Неавторизованные пользователи имеют право чтения в новых группах " "пользователей" -#: kallithea/model/db.py:1556 +#: kallithea/model/db.py:1557 msgid "Default user has write access to new user groups" msgstr "" "Неавторизованные пользователи имеют право записи в новых группах " "пользователей" -#: kallithea/model/db.py:1557 +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" "Неавторизованные пользователи имеют права администратора к новым групппам " "пользователей" -#: kallithea/model/db.py:1559 +#: kallithea/model/db.py:1560 msgid "Only admins can create repository groups" msgstr "Только администраторы могут создавать группы репозиториев" -#: kallithea/model/db.py:1560 +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "Группы репозиториев могут создаваться любыми пользователями" -#: kallithea/model/db.py:1562 -msgid "Only admins can create user groups" -msgstr "Группы пользователей могут создаваться только администраторами" - #: kallithea/model/db.py:1563 +msgid "Only admins can create user groups" +msgstr "Группы пользователей могут создаваться только администраторами" + +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "Группы пользователей могут создаваться любыми пользователями" -#: kallithea/model/db.py:1565 +#: kallithea/model/db.py:1566 msgid "Only admins can create top level repositories" msgstr "Только администраторы могут создавать репозитории верхнего уровня" -#: kallithea/model/db.py:1566 +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "Любой пользователь может создавать репозитории верхнего уровня" -#: kallithea/model/db.py:1568 +#: kallithea/model/db.py:1569 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" "Создание репозиториев доступно с правом на запись в группу репозиториев" -#: kallithea/model/db.py:1569 +#: kallithea/model/db.py:1570 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" "Создание репозиториев недоступно с правом на запись в группу репозиториев" -#: kallithea/model/db.py:1571 +#: kallithea/model/db.py:1572 msgid "Only admins can fork repositories" msgstr "Форки репозиториев могут создаваться только администраторами" -#: kallithea/model/db.py:1572 +#: kallithea/model/db.py:1573 msgid "Non-admins can fork repositories" msgstr "Форки репозиториев могут создаваться любыми пользователями" -#: kallithea/model/db.py:1574 +#: kallithea/model/db.py:1575 msgid "Registration disabled" msgstr "Регистрация отключена" -#: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" -msgstr "Регистрация пользователя с ручной активацией учётной записи" - #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "Регистрация пользователя с ручной активацией учётной записи" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "Регистрация пользователя с автоматической активацией" -#: kallithea/model/db.py:1992 -msgid "Not reviewed" -msgstr "Не проверено" - #: kallithea/model/db.py:1993 -msgid "Under review" -msgstr "На проверке" +msgid "Not reviewed" +msgstr "Не проверено" #: kallithea/model/db.py:1994 +msgid "Under review" +msgstr "На проверке" + +#: kallithea/model/db.py:1995 msgid "Not approved" msgstr "Не одобрено" -#: kallithea/model/db.py:1995 +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "Одобрено" @@ -2215,7 +2215,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2400,7 +2400,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2853,19 +2853,11 @@ "Включите, чтобы разрешить всем пользователям создавать репозитории на " "верхнем уровне." -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" -"Внимание: это также позволит всем пользователям с помощью API создавать " -"репозитории где угодно. Это может измениться в будущих версиях." - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "Создание репозитория с правом записи в группы" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " @@ -2875,30 +2867,30 @@ "репозитории в этой группе. Без неё, право записи в группу не имеет " "действия." -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "Создание групп пользователей" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" "Включите для возможности создавать группы пользователей любым " "пользователям." -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "Создание форка репозитория" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" "Включите для возможности создавать форки репозиториев любым пользователем." -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "Регистрация" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "Активация сторонней учетной записи" @@ -3503,8 +3495,8 @@ "pull. They can trigger Python functions or external applications." msgstr "" "Хуки используются для активации действий при определённых событиях, " -"например, при проталкивании (push) или получении (pull) изменений. По хуку " -"могут исполняться функции Python либо внешние приложения." +"например, при проталкивании (push) или получении (pull) изменений. По " +"хуку могут исполняться функции Python либо внешние приложения." #: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" @@ -4416,6 +4408,13 @@ msgid "Changeset status: %s by %s" msgstr "Статус набора изменений: %s от %s" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +#| msgid "Commit messages" +msgid "(No commit message)" +msgstr "Сообщения коммитов" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr "Развернуть сообщение фиксации" @@ -5664,6 +5663,14 @@ msgid "Download %s as %s" msgstr "Скачать %s как %s" +#~ msgid "" +#~ "Note: This will also give all users API access to create repositories " +#~ "everywhere. That might change in future versions." +#~ msgstr "" +#~ "Внимание: это также позволит всем пользователям с помощью API " +#~ "создавать репозитории где угодно. Это может измениться в будущих " +#~ "версиях." + #~ msgid "Cache invalidation successful" #~ msgstr "Кэш сброшен"
--- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2015-04-01 12:59+0200\n" "Last-Translator: Andrej Shadura <andrew@shadura.me>\n" "Language-Team: Slovak <https://hosted.weblate.org/projects/kallithea/" @@ -686,11 +686,11 @@ msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "" @@ -722,48 +722,48 @@ msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 -#, python-format -msgid "This group contains %s subgroups and cannot be deleted" -msgstr "" - #: kallithea/controllers/admin/repo_groups.py:258 #, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:264 +#, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "" @@ -773,109 +773,109 @@ msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, fuzzy, python-format #| msgid "Error occurred during gist creation" msgid "An error occurred during creation of field: %r" msgstr "Došlo k chybe pri vytváraní gist" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:467 +#: kallithea/controllers/admin/repos.py:469 msgid "Nothing" msgstr "Nič" -#: kallithea/controllers/admin/repos.py:469 +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "" @@ -1351,131 +1351,131 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1544 -msgid "Default user has no access to new repositories" -msgstr "" - #: kallithea/model/db.py:1545 -msgid "Default user has read access to new repositories" +msgid "Default user has no access to new repositories" msgstr "" #: kallithea/model/db.py:1546 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1547 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1560 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1562 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1563 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1565 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1566 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1568 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - #: kallithea/model/db.py:1569 msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 +msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 +#: kallithea/model/db.py:1572 #, fuzzy msgid "Only admins can fork repositories" msgstr "Repozitáre" -#: kallithea/model/db.py:1572 +#: kallithea/model/db.py:1573 #, fuzzy msgid "Non-admins can fork repositories" msgstr "Repozitáre" -#: kallithea/model/db.py:1574 +#: kallithea/model/db.py:1575 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" -msgstr "" - #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:1992 -msgid "Not reviewed" -msgstr "" - #: kallithea/model/db.py:1993 -msgid "Under review" +msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:1994 -msgid "Not approved" +msgid "Under review" msgstr "" #: kallithea/model/db.py:1995 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "" @@ -2139,7 +2139,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2323,7 +2323,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2757,44 +2757,38 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "" @@ -3439,7 +3433,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4231,6 +4225,11 @@ msgid "Changeset status: %s by %s" msgstr "Zmeny" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "(No commit message)" +msgstr "" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr ""
--- a/kallithea/i18n/tr/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/tr/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.4.99\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2019-11-05 08:03+0000\n" "Last-Translator: Hüseyin Tunç <huseyin.tunc@bulutfon.com>\n" "Language-Team: Turkish <https://hosted.weblate.org/projects/kallithea/" @@ -681,11 +681,11 @@ msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "" @@ -717,48 +717,48 @@ msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 -#, python-format -msgid "This group contains %s subgroups and cannot be deleted" -msgstr "" - #: kallithea/controllers/admin/repo_groups.py:258 #, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:264 +#, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "" @@ -768,108 +768,108 @@ msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, python-format msgid "An error occurred during creation of field: %r" msgstr "" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:467 -msgid "Nothing" -msgstr "" - #: kallithea/controllers/admin/repos.py:469 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "" @@ -1337,129 +1337,129 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1544 -msgid "Default user has no access to new repositories" -msgstr "" - #: kallithea/model/db.py:1545 -msgid "Default user has read access to new repositories" +msgid "Default user has no access to new repositories" msgstr "" #: kallithea/model/db.py:1546 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1547 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1560 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1562 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1563 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1565 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1566 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1568 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - #: kallithea/model/db.py:1569 msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 +msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 -msgid "Only admins can fork repositories" -msgstr "" - #: kallithea/model/db.py:1572 +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1573 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1574 -msgid "Registration disabled" -msgstr "" - #: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" +msgid "Registration disabled" msgstr "" #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:1992 -msgid "Not reviewed" -msgstr "" - #: kallithea/model/db.py:1993 -msgid "Under review" +msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:1994 -msgid "Not approved" +msgid "Under review" msgstr "" #: kallithea/model/db.py:1995 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "" @@ -2120,7 +2120,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2303,7 +2303,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2734,44 +2734,38 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "" @@ -3401,7 +3395,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4186,6 +4180,11 @@ msgid "Changeset status: %s by %s" msgstr "" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "(No commit message)" +msgstr "" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr ""
--- a/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3.2\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2019-11-13 10:04+0000\n" "Last-Translator: Oleksandr Shtalinberg <o.shtalinberg@gmail.com>\n" "Language-Team: Ukrainian <https://hosted.weblate.org/projects/kallithea/" @@ -687,11 +687,11 @@ msgid "Allowed with automatic account activation" msgstr "Дозволено з автоматичною активацію облікового запису" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "Ручна Активація зовнішнього акаунту" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "Автоматична Активація зовнішнього акаунту" @@ -723,48 +723,48 @@ msgid "Created repository group %s" msgstr "Створена група репозиторіїв %s" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "Оновлено групу репозиторіїв %s" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Сталася помилка при оновленні repository group %s" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Ця група містить %s репозиторії, і їх неможливо видалити" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Ця група містить %s підгрупи і не може бути видалена" -#: kallithea/controllers/admin/repo_groups.py:258 +#: kallithea/controllers/admin/repo_groups.py:264 #, python-format msgid "Removed repository group %s" msgstr "Видалена група репозиторіїв %s" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Сталася помилка під час видалення групи репохиторіїв %s" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "Неможливо відкликати дозвіл для себе як адміністратора" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "Оновлено дозволи групи репозиторіїв" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "Сталася помилка під час відкликання прав" @@ -774,109 +774,109 @@ msgid "Error creating repository %s" msgstr "Помилка створення репозиторію %s" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "Створено репозиторій %s з %s" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "Роздвоєно репозиторій %s як %s" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Створено репозиторій %s" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Репозиторій %s успішно оновлений" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Сталася помилка при оновленні репозиторію %s" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "Від'єднано %s forks" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "Видалено %s forks" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Видалений репозиторій %s" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Неможливо видалити репозиторій %s, що ще має forks" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "Сталася помилка під час видалення %s" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Права доступів до репозиторіїв оновлено" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "Помилка перевірки поля: %s" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, python-format msgid "An error occurred during creation of field: %r" msgstr "Сталася помилка під час створення поля: %r" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "Під час видалення поля виникла помилка" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "-- Не fork --" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "Оновлено видимість репозиторія в публічному журналі" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "" "Сталася помилка під час налаштувань цього репозиторію в публічному журналі" -#: kallithea/controllers/admin/repos.py:467 +#: kallithea/controllers/admin/repos.py:469 msgid "Nothing" msgstr "Нічого" -#: kallithea/controllers/admin/repos.py:469 +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Позначено репозиторій %s як відгалуження від %s" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "Сталася помилка під час виконання цієї операції" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "Витягнуто з віддаленого місця" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "Сталася помилка під час витягування з віддаленого розташування" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "Під час видалення статистики репозиторію сталася помилка" @@ -1356,133 +1356,133 @@ msgid "[Mention]" msgstr "[Згадування]" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "верхній рівень" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "Kallithea Адміністратор" -#: kallithea/model/db.py:1544 +#: kallithea/model/db.py:1545 msgid "Default user has no access to new repositories" msgstr "Користувач за промовчанням не має доступу до нових репозиторіїв" -#: kallithea/model/db.py:1545 +#: kallithea/model/db.py:1546 msgid "Default user has read access to new repositories" msgstr "" "Користувач за замовчанням має доступ на перегляд нових репозиторіїв" -#: kallithea/model/db.py:1546 +#: kallithea/model/db.py:1547 msgid "Default user has write access to new repositories" msgstr "" "Користувач за замовчуванням має доступ до запису до нових репозиторіїв" -#: kallithea/model/db.py:1547 +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" "Користувач за промовчанням має доступ адміністратора до нових репозиторіїв" -#: kallithea/model/db.py:1549 +#: kallithea/model/db.py:1550 msgid "Default user has no access to new repository groups" msgstr "" "Користувач за замовчуванням не має доступу до нових груп репозиторіїв" -#: kallithea/model/db.py:1550 +#: kallithea/model/db.py:1551 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1560 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1562 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1563 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1565 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1566 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1568 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - #: kallithea/model/db.py:1569 msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 +msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 -msgid "Only admins can fork repositories" -msgstr "" - #: kallithea/model/db.py:1572 +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1573 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1574 -msgid "Registration disabled" -msgstr "" - #: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" +msgid "Registration disabled" msgstr "" #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:1992 -msgid "Not reviewed" -msgstr "" - #: kallithea/model/db.py:1993 -msgid "Under review" +msgid "Not reviewed" msgstr "" #: kallithea/model/db.py:1994 -msgid "Not approved" +msgid "Under review" msgstr "" #: kallithea/model/db.py:1995 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "" @@ -2144,7 +2144,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2327,7 +2327,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2759,48 +2759,42 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "Створення сховища з доступом до групового записування" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "Створення групи користувачів" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" "Увімкніть цей параметр, щоб дозволити неадміністраторам створювати групи " "користувачів." -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "Репозиторій розгалуження" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" "Увімкніть цей параметр, щоб дозволити не-адміністраторам fork " "репозиторіїв." -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "Реєстрація" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "Активація облікового запису зовнішньої автентифікації" @@ -4254,6 +4248,13 @@ msgid "Changeset status: %s by %s" msgstr "" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +#| msgid "Expand commit message" +msgid "(No commit message)" +msgstr "Розгорнути повідомлення про фіксацію" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr "Розгорнути повідомлення про фіксацію"
--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2019-08-14 19:00+0000\n" "Last-Translator: Elizabeth Sherrock <lizzyd710@gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" @@ -693,11 +693,11 @@ msgid "Allowed with automatic account activation" msgstr "已允许自动激活账号" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "外部账号手动激活" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "外部账号自动激活" @@ -729,48 +729,48 @@ msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "这个组内有%s个版本库因而无法删除" -#: kallithea/controllers/admin/repo_groups.py:252 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:258 +#: kallithea/controllers/admin/repo_groups.py:264 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "" @@ -780,109 +780,109 @@ msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "版本库%s成功更新" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, fuzzy, python-format msgid "Cannot delete repository %s which still has forks" msgstr "无法删除%s因为它还有其他分复刻本库" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "在删除%s的时候发生错误" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, fuzzy, python-format #| msgid "An error occurred during deletion of user" msgid "An error occurred during creation of field: %r" msgstr "删除用户时发生错误" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "成功更新在公共日志中的可见性" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "设置版本库到公共日志时发生错误" -#: kallithea/controllers/admin/repos.py:467 +#: kallithea/controllers/admin/repos.py:469 msgid "Nothing" msgstr "无" -#: kallithea/controllers/admin/repos.py:469 +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "成功将版本库%s标记为复刻自%s" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "在搜索操作中发生错误" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "成功拉取自远程路径" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "从远程路径拉取时发生错误" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "删除版本库统计时发生错误" @@ -1351,139 +1351,139 @@ msgid "[Mention]" msgstr "[提及]" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "Kallithea 管理员" -#: kallithea/model/db.py:1544 +#: kallithea/model/db.py:1545 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1545 +#: kallithea/model/db.py:1546 #, fuzzy msgid "Default user has read access to new repositories" msgstr "未授权的资源访问" -#: kallithea/model/db.py:1546 +#: kallithea/model/db.py:1547 #, fuzzy msgid "Default user has write access to new repositories" msgstr "未授权的资源访问" -#: kallithea/model/db.py:1547 +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 +#: kallithea/model/db.py:1560 #, fuzzy msgid "Only admins can create repository groups" msgstr "没有在该版本库组中创建版本库的权限" -#: kallithea/model/db.py:1560 +#: kallithea/model/db.py:1561 #, fuzzy msgid "Non-admins can create repository groups" msgstr "没有在该版本库组中创建版本库的权限" -#: kallithea/model/db.py:1562 +#: kallithea/model/db.py:1563 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1563 +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1565 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1566 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1568 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - #: kallithea/model/db.py:1569 msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 +msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 +#: kallithea/model/db.py:1572 #, fuzzy msgid "Only admins can fork repositories" msgstr "创建版本库" -#: kallithea/model/db.py:1572 +#: kallithea/model/db.py:1573 #, fuzzy msgid "Non-admins can fork repositories" msgstr "创建版本库" -#: kallithea/model/db.py:1574 +#: kallithea/model/db.py:1575 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" -msgstr "" - #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:1992 +#: kallithea/model/db.py:1993 #, fuzzy msgid "Not reviewed" msgstr "未检视" -#: kallithea/model/db.py:1993 +#: kallithea/model/db.py:1994 #, fuzzy msgid "Under review" msgstr "检视中" -#: kallithea/model/db.py:1994 +#: kallithea/model/db.py:1995 #, fuzzy #| msgid "Approved" msgid "Not approved" msgstr "已批准" -#: kallithea/model/db.py:1995 +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "已批准" @@ -2171,7 +2171,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2356,7 +2356,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2806,44 +2806,38 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "版本库复刻" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "注册" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "" @@ -3507,7 +3501,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4324,6 +4318,13 @@ msgid "Changeset status: %s by %s" msgstr "修订集状态：%s 由 %s" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +#, fuzzy +#| msgid "Commit messages" +msgid "(No commit message)" +msgstr "提交信息" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr ""
--- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Wed May 12 01:33:29 2021 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-10-05 00:01+0200\n" +"POT-Creation-Date: 2021-05-12 01:32+0200\n" "PO-Revision-Date: 2017-03-10 18:26+0000\n" "Last-Translator: mao <mao@lins.fju.edu.tw>\n" "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/" @@ -683,11 +683,11 @@ msgid "Allowed with automatic account activation" msgstr "" -#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1578 +#: kallithea/controllers/admin/permissions.py:85 kallithea/model/db.py:1579 msgid "Manual activation of external account" msgstr "" -#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1579 +#: kallithea/controllers/admin/permissions.py:86 kallithea/model/db.py:1580 msgid "Automatic activation of external account" msgstr "" @@ -719,48 +719,48 @@ msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:219 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:235 +#: kallithea/controllers/admin/repo_groups.py:241 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:245 +#: kallithea/controllers/admin/repo_groups.py:251 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:252 -#, python-format -msgid "This group contains %s subgroups and cannot be deleted" -msgstr "" - #: kallithea/controllers/admin/repo_groups.py:258 #, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:264 +#, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:269 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:347 -#: kallithea/controllers/admin/repo_groups.py:377 +#: kallithea/controllers/admin/repo_groups.py:353 +#: kallithea/controllers/admin/repo_groups.py:383 #: kallithea/controllers/admin/user_groups.py:290 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:362 +#: kallithea/controllers/admin/repo_groups.py:368 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:394 -#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/repo_groups.py:400 +#: kallithea/controllers/admin/repos.py:359 #: kallithea/controllers/admin/user_groups.py:302 msgid "An error occurred during revoking of permission" msgstr "" @@ -770,108 +770,108 @@ msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:193 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:202 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:205 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:234 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" -#: kallithea/controllers/admin/repos.py:254 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:272 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:275 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:280 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:288 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:328 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:387 +#: kallithea/controllers/admin/repos.py:389 #, python-format msgid "Field validation error: %s" msgstr "" -#: kallithea/controllers/admin/repos.py:390 +#: kallithea/controllers/admin/repos.py:392 #, python-format msgid "An error occurred during creation of field: %r" msgstr "" -#: kallithea/controllers/admin/repos.py:401 +#: kallithea/controllers/admin/repos.py:403 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:415 +#: kallithea/controllers/admin/repos.py:417 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:447 +#: kallithea/controllers/admin/repos.py:449 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:451 +#: kallithea/controllers/admin/repos.py:453 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:467 -msgid "Nothing" -msgstr "" - #: kallithea/controllers/admin/repos.py:469 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:471 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:476 +#: kallithea/controllers/admin/repos.py:478 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:488 +#: kallithea/controllers/admin/repos.py:490 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:493 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:522 +#: kallithea/controllers/admin/repos.py:524 msgid "An error occurred during deletion of repository stats" msgstr "" @@ -1337,130 +1337,130 @@ msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1411 +#: kallithea/model/db.py:1412 msgid "top level" msgstr "" -#: kallithea/model/db.py:1542 +#: kallithea/model/db.py:1543 msgid "Kallithea Administrator" msgstr "" -#: kallithea/model/db.py:1544 -msgid "Default user has no access to new repositories" -msgstr "" - #: kallithea/model/db.py:1545 -msgid "Default user has read access to new repositories" +msgid "Default user has no access to new repositories" msgstr "" #: kallithea/model/db.py:1546 -msgid "Default user has write access to new repositories" +msgid "Default user has read access to new repositories" msgstr "" #: kallithea/model/db.py:1547 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1548 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1549 -msgid "Default user has no access to new repository groups" -msgstr "" - #: kallithea/model/db.py:1550 -msgid "Default user has read access to new repository groups" +msgid "Default user has no access to new repository groups" msgstr "" #: kallithea/model/db.py:1551 -msgid "Default user has write access to new repository groups" +msgid "Default user has read access to new repository groups" msgstr "" #: kallithea/model/db.py:1552 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1553 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1554 -msgid "Default user has no access to new user groups" -msgstr "" - #: kallithea/model/db.py:1555 -msgid "Default user has read access to new user groups" +msgid "Default user has no access to new user groups" msgstr "" #: kallithea/model/db.py:1556 -msgid "Default user has write access to new user groups" +msgid "Default user has read access to new user groups" msgstr "" #: kallithea/model/db.py:1557 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1558 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1559 -msgid "Only admins can create repository groups" -msgstr "" - #: kallithea/model/db.py:1560 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1561 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1562 -msgid "Only admins can create user groups" -msgstr "" - #: kallithea/model/db.py:1563 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1564 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1565 -msgid "Only admins can create top level repositories" -msgstr "" - #: kallithea/model/db.py:1566 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1567 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1568 -msgid "" -"Repository creation enabled with write permission to a repository group" -msgstr "" - #: kallithea/model/db.py:1569 msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1570 +msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" -#: kallithea/model/db.py:1571 +#: kallithea/model/db.py:1572 msgid "Only admins can fork repositories" msgstr "祗有管理者才能分歧版本庫" -#: kallithea/model/db.py:1572 +#: kallithea/model/db.py:1573 #, fuzzy msgid "Non-admins can fork repositories" msgstr "建立版本庫" -#: kallithea/model/db.py:1574 +#: kallithea/model/db.py:1575 msgid "Registration disabled" msgstr "" -#: kallithea/model/db.py:1575 -msgid "User registration with manual account activation" -msgstr "" - #: kallithea/model/db.py:1576 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1577 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:1992 -msgid "Not reviewed" -msgstr "未審核" - #: kallithea/model/db.py:1993 -msgid "Under review" -msgstr "審核中" +msgid "Not reviewed" +msgstr "未審核" #: kallithea/model/db.py:1994 -msgid "Not approved" -msgstr "" +msgid "Under review" +msgstr "審核中" #: kallithea/model/db.py:1995 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:1996 msgid "Approved" msgstr "" @@ -2129,7 +2129,7 @@ #: kallithea/templates/admin/defaults/defaults.html:59 #: kallithea/templates/admin/my_account/my_account_password.html:30 #: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 #: kallithea/templates/admin/repo_groups/repo_group_add.html:58 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:27 @@ -2314,7 +2314,7 @@ #: kallithea/templates/admin/my_account/my_account_password.html:31 #: kallithea/templates/admin/my_account/my_account_profile.html:48 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 -#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 #: kallithea/templates/admin/permissions/permissions_ips.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 #: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:28 @@ -2762,44 +2762,38 @@ "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:57 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:68 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:71 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:78 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:82 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 msgid "Registration" msgstr "註冊" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 msgid "External auth account activation" msgstr "" @@ -3457,7 +3451,7 @@ #: kallithea/templates/admin/settings/settings_search.html:12 msgid "" -"This option completely reindexeses all of the repositories for proper " +"This option completely reindexes all of the repositories for proper " "fulltext search capabilities." msgstr "" @@ -4261,6 +4255,11 @@ msgid "Changeset status: %s by %s" msgstr "尚未有任何變更" +#: kallithea/templates/changelog/changelog_table.html:58 +#: kallithea/templates/pullrequests/pullrequest_show.html:170 +msgid "(No commit message)" +msgstr "" + #: kallithea/templates/changelog/changelog_table.html:60 msgid "Expand commit message" msgstr ""
--- a/kallithea/lib/diffs.py Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/lib/diffs.py Wed May 12 01:33:29 2021 +0200 @@ -453,7 +453,7 @@ return self.adds, self.removes -_escape_re = re.compile(r'(&)|(<)|(>)|(\t)|(\r)|(?<=.)( \n| $)') +_escape_re = re.compile(r'(&)|(<)|(>)|(\t)(\n|$)?|(\r)|(?<=.)( \n| $)') def _escaper(string): @@ -470,10 +470,12 @@ if groups[2]: return '>' if groups[3]: + if groups[4] is not None: # end of line + return '<u>\t</u><i></i>' return '<u>\t</u>' - if groups[4]: + if groups[5]: return '<u class="cr"></u>' - if groups[5]: + if groups[6]: return ' <i></i>' assert False
--- a/kallithea/lib/middleware/pygrack.py Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/lib/middleware/pygrack.py Wed May 12 01:33:29 2021 +0200 @@ -125,7 +125,7 @@ log.error(traceback.format_exc()) raise exc.HTTPExpectationFailed() resp = Response() - resp.content_type = 'application/x-%s-advertisement' % str(git_command) + resp.content_type = 'application/x-%s-advertisement' % git_command resp.charset = None resp.app_iter = out return resp @@ -175,7 +175,7 @@ update_server_info(repo._repo) resp = Response() - resp.content_type = 'application/x-%s-result' % git_command.encode('utf-8') + resp.content_type = 'application/x-%s-result' % git_command resp.charset = None resp.app_iter = out return resp
--- a/kallithea/lib/paster_commands/template.ini.mako Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/lib/paster_commands/template.ini.mako Wed May 12 01:33:29 2021 +0200 @@ -334,7 +334,7 @@ <%text>##</%text> Example: use the message queue on the local virtual host 'kallitheavhost' as the RabbitMQ user 'kallithea': celery.broker_url = amqp://kallithea:thepassword@localhost:5672/kallitheavhost -celery.result.backend = db+sqlite:///celery-results.db +celery.result_backend = db+sqlite:///celery-results.db #celery.amqp.task.result.expires = 18000
--- a/kallithea/lib/utils.py Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/lib/utils.py Wed May 12 01:33:29 2021 +0200 @@ -349,7 +349,7 @@ if repo_path is not None: # Note: MercurialRepository / mercurial.localrepo.instance will do this too, so it will always be possible to override db settings or what is hardcoded above - baseui.readconfig(repo_path) + baseui.readconfig(safe_bytes(os.path.join(repo_path, '.hg', 'hgrc'))) assert baseui.plain() # set by hgcompat.monkey_do (invoked from import of vcs.backends.hg) to minimize potential impact of loading config files return baseui
--- a/kallithea/lib/vcs/backends/git/repository.py Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/lib/vcs/backends/git/repository.py Wed May 12 01:33:29 2021 +0200 @@ -159,14 +159,26 @@ when the return code is non 200 """ # check first if it's not an local url - if os.path.isdir(url) or url.startswith('file:'): + if os.path.isabs(url) and os.path.isdir(url): return True if url.startswith('git://'): + try: + _git_colon, _empty, _host, path = url.split('/', 3) + except ValueError: + raise urllib.error.URLError("Invalid URL: %r" % url) + # Mitigate problems elsewhere with incorrect handling of encoded paths. + # Don't trust urllib.parse.unquote but be prepared for more flexible implementations elsewhere. + # Space is the only allowed whitespace character - directly or % encoded. No other % or \ is allowed. + for c in path.replace('%20', ' '): + if c in '%\\': + raise urllib.error.URLError("Invalid escape character in path: '%s'" % c) + if c.isspace() and c != ' ': + raise urllib.error.URLError("Invalid whitespace character in path: %r" % c) return True - if '+' in url[:url.find('://')]: - url = url[url.find('+') + 1:] + if not url.startswith('http://') and not url.startswith('https://'): + raise urllib.error.URLError("Unsupported protocol in URL %s" % url) url_obj = mercurial.util.url(safe_bytes(url)) test_uri, handlers = get_urllib_request_handlers(url_obj)
--- a/kallithea/model/db.py Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/model/db.py Wed May 12 01:33:29 2021 +0200 @@ -1407,9 +1407,10 @@ def _generate_choice(cls, repo_group): """Return tuple with group_id and name as html literal""" from webhelpers2.html import literal + import kallithea.lib.helpers as h if repo_group is None: return (-1, '-- %s --' % _('top level')) - return repo_group.group_id, literal(cls.SEP.join(repo_group.full_path_splitted)) + return repo_group.group_id, literal(cls.SEP.join(h.html_escape(x) for x in repo_group.full_path_splitted)) @classmethod def groups_choices(cls, groups):
--- a/kallithea/model/repo.py Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/model/repo.py Wed May 12 01:33:29 2021 +0200 @@ -168,18 +168,18 @@ for gr in repo_groups_list or []: repos_data.append(dict( - raw_name='\0' + gr.name, # sort before repositories - just_name=gr.name, + raw_name='\0' + h.html_escape(gr.name), # sort before repositories + just_name=h.html_escape(gr.name), name=_render('group_name_html', group_name=gr.group_name, name=gr.name), - desc=gr.group_description)) + desc=desc(gr.group_description))) for repo in repos_list: if not HasRepoPermissionLevel('read')(repo.repo_name, 'get_repos_as_dict check'): continue cs_cache = repo.changeset_cache row = { - "raw_name": repo.repo_name, - "just_name": repo.just_name, + "raw_name": h.html_escape(repo.repo_name), + "just_name": h.html_escape(repo.just_name), "name": repo_lnk(repo.repo_name, repo.repo_type, repo.repo_state, repo.private, repo.fork), "following": following(
--- a/kallithea/templates/about.html Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/templates/about.html Wed May 12 01:33:29 2021 +0200 @@ -31,6 +31,7 @@ <li>Copyright © 2017–2020, Allan Nordhøy</li> <li>Copyright © 2017, 2020, Anton Schur</li> <li>Copyright © 2018–2020, ssantos</li> + <li>Copyright © 2019–2020, Manuel Jacob</li> <li>Copyright © 2019–2020, Private</li> <li>Copyright © 2020, David Ignjić</li> <li>Copyright © 2020, Dennis Fink</li> @@ -44,7 +45,6 @@ <li>Copyright © 2019, Elizabeth Sherrock</li> <li>Copyright © 2019, Hüseyin Tunç</li> <li>Copyright © 2019, leela</li> - <li>Copyright © 2019, Manuel Jacob</li> <li>Copyright © 2019, Mateusz Mendel</li> <li>Copyright © 2019, Nathan</li> <li>Copyright © 2019, Oleksandr Shtalinberg</li>
--- a/kallithea/templates/admin/permissions/permissions_globals.html Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/templates/admin/permissions/permissions_globals.html Wed May 12 01:33:29 2021 +0200 @@ -54,7 +54,6 @@ <div> ${h.select('default_repo_create','',c.repo_create_choices,class_='form-control')} <span class="help-block">${_('Enable this to allow non-admins to create repositories at the top level.')}</span> - <span class="help-block">${_('Note: This will also give all users API access to create repositories everywhere. That might change in future versions.')}</span> </div> </div> <div class="form-group">
--- a/kallithea/templates/admin/repo_groups/repo_group_add.html Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_group_add.html Wed May 12 01:33:29 2021 +0200 @@ -41,7 +41,7 @@ <div class="form-group"> <label class="control-label" for="parent_group_id">${_('Group parent')}:</label> <div> - ${h.select('parent_group_id',request.GET.get('parent_group'),c.repo_groups,class_='form-control')} + ${h.select('parent_group_id',None,c.repo_groups,class_='form-control')} </div> </div>
--- a/kallithea/templates/admin/repos/repo_add_base.html Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/templates/admin/repos/repo_add_base.html Wed May 12 01:33:29 2021 +0200 @@ -27,7 +27,7 @@ <div class="form-group"> <label class="control-label" for="repo_group">${_('Repository group')}:</label> <div> - ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_='form-control')} + ${h.select('repo_group',None,c.repo_groups,class_='form-control')} <span class="help-block">${_('Optionally select a group to put this repository into.')}</span> </div> </div>
--- a/kallithea/templates/changelog/changelog_table.html Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/templates/changelog/changelog_table.html Wed May 12 01:33:29 2021 +0200 @@ -55,7 +55,7 @@ <td class="date"> <div data-toggle="tooltip" title="${h.fmt_date(cs.date)}">${h.age(cs.date,True)}</div> </td> - <% message_lines = cs.message.splitlines() %> + <% message_lines = cs.message.strip().splitlines() or [_("(No commit message)")] %> %if len(message_lines) > 1: <td class="expand_commit" title="${_('Expand commit message')}"> <i class="icon-align-left"></i>
--- a/kallithea/templates/pullrequests/pullrequest_show.html Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Wed May 12 01:33:29 2021 +0200 @@ -167,7 +167,7 @@ </span> %endfor </div> - <div class="message">${h.urlify_text(cs.message.splitlines()[0], c.repo_name)}</div> + <div class="message">${h.urlify_text(cs.message.strip().split('\n')[0] or _("(No commit message)"), c.repo_name)}</div> </td> %endif </tr>
--- a/kallithea/tests/api/api_base.py Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/tests/api/api_base.py Wed May 12 01:33:29 2021 +0200 @@ -916,20 +916,11 @@ ) response = api_call(self, params) - # Current result when API access control is different from Web: - ret = { - 'msg': 'Created new repository `%s`' % repo_name, - 'success': True, - 'task': None, - } - expected = ret - self._compare_ok(id_, expected, given=response.body) + # API access control match Web access control: + expected = 'no permission to create repo in test_repo_group/api-repo-repo' + self._compare_error(id_, expected, given=response.body) + fixture.destroy_repo(repo_name) - - # Expected and arguably more correct result: - #expected = 'failed to create repository `%s`' % repo_name - #self._compare_error(id_, expected, given=response.body) - fixture.destroy_repo_group(repo_group_name) def test_api_create_repo_unknown_owner(self): @@ -1153,7 +1144,7 @@ finally: fixture.destroy_repo(repo_name) - def test_api_update_repo_regular_user_change_repo_name(self): + def test_api_update_repo_regular_user_change_top_level_repo_name(self): repo_name = 'admin_owned' new_repo_name = 'new_repo_name' fixture.create_repo(repo_name, repo_type=self.REPO_TYPE) @@ -1167,7 +1158,7 @@ repoid=repo_name, **updates) response = api_call(self, params) try: - expected = 'no permission to create (or move) repositories' + expected = 'no permission to create (or move) top level repositories' self._compare_error(id_, expected, given=response.body) finally: fixture.destroy_repo(repo_name) @@ -1298,6 +1289,9 @@ '%s/api-repo-fork' % TEST_REPO_GROUP, ]) def test_api_fork_repo_non_admin(self, fork_name): + RepoGroupModel().grant_user_permission(TEST_REPO_GROUP, + self.TEST_USER_LOGIN, + 'group.write') id_, params = _build_data(self.apikey_regular, 'fork_repo', repoid=self.REPO, fork_name=fork_name, @@ -1364,7 +1358,7 @@ fork_name=fork_name, ) response = api_call(self, params) - expected = 'no permission to create repositories' + expected = 'no permission to create top level repo' self._compare_error(id_, expected, given=response.body) fixture.destroy_repo(fork_name)
--- a/kallithea/tests/models/test_diff_parsers.py Mon Dec 21 01:13:25 2020 +0100 +++ b/kallithea/tests/models/test_diff_parsers.py Wed May 12 01:33:29 2021 +0200 @@ -297,13 +297,13 @@ assert s == r''' context ... ... '@@ -51,6 +51,13 @@\n' unmod 51 51 '<u>\t</u>begin();\n' -unmod 52 52 '<u>\t</u>\n' +unmod 52 52 '<u>\t</u><i></i>' add 53 '<u>\t</u>int foo;<u class="cr"></u>\n' add 54 '<u>\t</u>int bar; <u class="cr"></u>\n' add 55 '<u>\t</u>int baz;<u>\t</u><u class="cr"></u>\n' add 56 '<u>\t</u>int space; <i></i>' -add 57 '<u>\t</u>int tab;<u>\t</u>\n' -add 58 '<u>\t</u>\n' +add 57 '<u>\t</u>int tab;<u>\t</u><i></i>' +add 58 '<u>\t</u><i></i>' unmod 59 53 ' <i></i>' del 54 '<u>\t</u>#define MAX_STEPS (48)\n' add 60 '<u>\t</u><u class="cr"></u>\n'