Mercurial > kallithea
changeset 8967:9ab815f67c06 i18n
Merge from stable
line wrap: on
line diff
--- a/CONTRIBUTORS Mon Dec 12 18:28:10 2022 +0100 +++ b/CONTRIBUTORS Mon Dec 12 23:01:11 2022 +0100 @@ -1,7 +1,13 @@ List of contributors to Kallithea project: + Mads Kiilerich <mads@kiilerich.com> 2016-2022 + Asterios Dimitriou <steve@pci.gr> 2016-2017 2020 2022 + Manuel Jacob <me@manueljacob.de> 2019-2020 2022 + Jaime Marquínez Ferrándiz <weblate@jregistros.fastmail.net> 2022 + toras9000 <toras9000@gmail.com> 2022 + yzqzss <yzqzss@othing.xyz> 2022 + МАН69К <weblate@mah69k.net> 2022 Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> 2014-2021 - Mads Kiilerich <mads@kiilerich.com> 2016-2021 ssantos <ssantos@web.de> 2018-2021 Private <adamantine.sword@gmail.com> 2019-2021 Étienne Gilli <etienne@gilli.io> 2020-2021 @@ -11,10 +17,8 @@ Michalis <michalisntovas@yahoo.gr> 2021 vs <vsuhachev@yandex.ru> 2021 Александр <akonn7@mail.ru> 2021 - Asterios Dimitriou <steve@pci.gr> 2016-2017 2020 Allan Nordhøy <epost@anotheragency.no> 2017-2020 Anton Schur <tonich.sh@gmail.com> 2017 2020 - Manuel Jacob <me@manueljacob.de> 2019-2020 Artem <kovalevartem.ru@gmail.com> 2020 David Ignjić <ignjic@gmail.com> 2020 Dennis Fink <dennis.fink@c3l.lu> 2020
--- a/dev_requirements.txt Mon Dec 12 18:28:10 2022 +0100 +++ b/dev_requirements.txt Mon Dec 12 23:01:11 2022 +0100 @@ -1,9 +1,9 @@ -pytest >= 4.6.6, < 5.5 +pytest >= 4.6.6, < 6.3 pytest-sugar >= 0.9.2, < 0.10 pytest-benchmark >= 3.2.2, < 3.3 pytest-localserver >= 0.5.0, < 0.6 mock >= 3.0.0, < 4.1 -Sphinx >= 1.8.0, < 3.1 +Sphinx >= 1.8.0, < 5.2 WebTest >= 2.0.6, < 2.1 isort == 5.1.2 pyflakes == 2.2.0
--- a/docs/api/api.rst Mon Dec 12 18:28:10 2022 +0100 +++ b/docs/api/api.rst Mon Dec 12 23:01:11 2022 +0100 @@ -115,7 +115,7 @@ id : <id_given_in_input> result : "Pulled from `<reponame>`" - error : null + error : null rescan_repos ^^^^^^^^^^^^ @@ -138,7 +138,7 @@ id : <id_given_in_input> result : "{'added': [<list of names of added repos>], 'removed': [<list of names of removed repos>]}" - error : null + error : null invalidate_cache ^^^^^^^^^^^^^^^^ @@ -160,7 +160,7 @@ id : <id_given_in_input> result : "Caches of repository `<reponame>`" - error : null + error : null get_ip ^^^^^^ @@ -175,24 +175,23 @@ api_key : "<api_key>" method : "get_ip" args : { - "userid" : "<user_id or username>", + "userid" : "<user_id or username>" } OUTPUT:: id : <id_given_in_input> result : { - "ip_addr_server": <ip_from_clien>", - "user_ips": [ + "ip_addr_server" : <ip_from_client>", + "user_ips" : [ { - "ip_addr": "<ip_with_mask>", - "ip_range": ["<start_ip>", "<end_ip>"], + "ip_addr" : "<ip_with_mask>", + "ip_range" : ["<start_ip>", "<end_ip>"] }, ... - ] + ] } - - error : null + error : null get_user ^^^^^^^^ @@ -214,29 +213,29 @@ OUTPUT:: id : <id_given_in_input> - result: None if user does not exist or - { + result : None if user does not exist or + { "user_id" : "<user_id>", "api_key" : "<api_key>", "username" : "<username>", - "firstname": "<firstname>", + "firstname" : "<firstname>", "lastname" : "<lastname>", "email" : "<email>", - "emails": "<list_of_all_additional_emails>", + "emails" : "<list_of_all_additional_emails>", "ip_addresses": "<list_of_ip_addresses_for_user>", "active" : "<bool>", - "admin" : "<bool>", + "admin" : "<bool>", "ldap_dn" : "<ldap_dn>", - "last_login": "<last_login>", + "last_login" : "<last_login>", "permissions": { "global": ["hg.create.repository", "repository.read", "hg.register.manual_activate"], - "repositories": {"repo1": "repository.none"}, - "repositories_groups": {"Group1": "group.read"} - }, - } - error: null + "repositories" : {"repo1" : "repository.none"}, + "repositories_groups" : {"Group1" : "group.read"} + } + } + error : null get_users ^^^^^^^^^ @@ -254,24 +253,24 @@ OUTPUT:: id : <id_given_in_input> - result: [ + result : [ { "user_id" : "<user_id>", "api_key" : "<api_key>", "username" : "<username>", - "firstname": "<firstname>", + "firstname" : "<firstname>", "lastname" : "<lastname>", "email" : "<email>", - "emails": "<list_of_all_additional_emails>", + "emails" : "<list_of_all_additional_emails>", "ip_addresses": "<list_of_ip_addresses_for_user>", "active" : "<bool>", - "admin" : "<bool>", + "admin" : "<bool>", "ldap_dn" : "<ldap_dn>", - "last_login": "<last_login>", + "last_login" : "<last_login>" }, … - ] - error: null + ] + error : null .. _create-user: @@ -300,22 +299,22 @@ OUTPUT:: id : <id_given_in_input> - result: { + result : { "msg" : "created new user `<username>`", - "user": { + "user" : { "user_id" : "<user_id>", "username" : "<username>", "firstname": "<firstname>", "lastname" : "<lastname>", "email" : "<email>", - "emails": "<list_of_all_additional_emails>", + "emails" : "<list_of_all_additional_emails>", "active" : "<bool>", - "admin" : "<bool>", + "admin" : "<bool>", "ldap_dn" : "<ldap_dn>", - "last_login": "<last_login>", - }, - } - error: null + "last_login": "<last_login>" + } + } + error : null Example:: @@ -347,23 +346,23 @@ OUTPUT:: id : <id_given_in_input> - result: { + result : { "msg" : "updated user ID:<userid> <username>", - "user": { + "user" : { "user_id" : "<user_id>", "api_key" : "<api_key>", "username" : "<username>", "firstname": "<firstname>", "lastname" : "<lastname>", "email" : "<email>", - "emails": "<list_of_all_additional_emails>", + "emails" : "<list_of_all_additional_emails>", "active" : "<bool>", - "admin" : "<bool>", + "admin" : "<bool>", "ldap_dn" : "<ldap_dn>", - "last_login": "<last_login>", - }, - } - error: null + "last_login": "<last_login>" + } + } + error : null delete_user ^^^^^^^^^^^ @@ -377,17 +376,17 @@ api_key : "<api_key>" method : "delete_user" args : { - "userid" : "<user_id or username>", + "userid" : "<user_id or username>" } OUTPUT:: id : <id_given_in_input> - result: { + result : { "msg" : "deleted user ID:<userid> <username>", - "user": null - } - error: null + "user" : null + } + error : null get_user_group ^^^^^^^^^^^^^^ @@ -411,7 +410,7 @@ { "users_group_id" : "<id>", "group_name" : "<groupname>", - "active": "<bool>", + "active" : "<bool>", "members" : [ { "user_id" : "<user_id>", @@ -420,11 +419,11 @@ "firstname": "<firstname>", "lastname" : "<lastname>", "email" : "<email>", - "emails": "<list_of_all_additional_emails>", + "emails" : "<list_of_all_additional_emails>", "active" : "<bool>", - "admin" : "<bool>", + "admin" : "<bool>", "ldap_dn" : "<ldap_dn>", - "last_login": "<last_login>", + "last_login": "<last_login>" }, … ] @@ -451,7 +450,7 @@ { "users_group_id" : "<id>", "group_name" : "<groupname>", - "active": "<bool>", + "active" : "<bool>" }, … ] @@ -468,24 +467,24 @@ id : <id_for_response> api_key : "<api_key>" method : "create_user_group" - args: { + args : { "group_name": "<groupname>", "owner" : "<owner_name_or_id = Optional(=apiuser)>", - "active": "<bool> = Optional(True)" + "active" : "<bool> = Optional(True)" } OUTPUT:: id : <id_given_in_input> - result: { - "msg": "created new user group `<groupname>`", - "users_group": { + result : { + "msg" : "created new user group `<groupname>`", + "users_group" : { "users_group_id" : "<id>", "group_name" : "<groupname>", - "active": "<bool>", - }, - } - error: null + "active" : "<bool>" + } + } + error : null add_user_to_user_group ^^^^^^^^^^^^^^^^^^^^^^ @@ -499,20 +498,20 @@ id : <id_for_response> api_key : "<api_key>" method : "add_user_user_group" - args: { + args : { "usersgroupid" : "<user group id or name>", - "userid" : "<user_id or username>", + "userid" : "<user_id or username>" } OUTPUT:: id : <id_given_in_input> - result: { - "success": True|False # depends on if member is in group - "msg": "added member `<username>` to a user group `<groupname>` | - User is already in that group" - } - error: null + result : { + "success" : True|False, # depends on if member is in group + "msg" : "added member `<username>` to a user group `<groupname>` | + User is already in that group" + } + error : null remove_user_from_user_group ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -526,20 +525,20 @@ id : <id_for_response> api_key : "<api_key>" method : "remove_user_from_user_group" - args: { + args : { "usersgroupid" : "<user group id or name>", - "userid" : "<user_id or username>", + "userid" : "<user_id or username>" } OUTPUT:: id : <id_given_in_input> - result: { - "success": True|False, # depends on if member is in group - "msg": "removed member <username> from user group <groupname> | - User wasn't in group" - } - error: null + result : { + "success" : True|False, # depends on if member is in group + "msg" : "removed member <username> from user group <groupname> | + User wasn't in group" + } + error : null get_repo ^^^^^^^^ @@ -554,144 +553,144 @@ id : <id_for_response> api_key : "<api_key>" method : "get_repo" - args: { + args : { "repoid" : "<reponame or repo_id>", - "with_revision_names": "<bool> = Optional(False)", - "with_pullrequests": "<bool> = Optional(False)", + "with_revision_names" : "<bool> = Optional(False)", + "with_pullrequests" : "<bool> = Optional(False)" } OUTPUT:: id : <id_given_in_input> - result: None if repository does not exist or - { + result : None if repository does not exist or + { "repo_id" : "<repo_id>", - "repo_name" : "<reponame>" + "repo_name" : "<reponame>", "repo_type" : "<repo_type>", "clone_uri" : "<clone_uri>", - "enable_downloads": "<bool>", + "enable_downloads" : "<bool>", "enable_statistics": "<bool>", - "private": "<bool>", + "private" : "<bool>", "created_on" : "<date_time_created>", "description" : "<description>", - "landing_rev": "<landing_rev>", - "last_changeset": { - "author": "<full_author>", - "date": "<date_time_of_commit>", - "message": "<commit_message>", - "raw_id": "<raw_id>", - "revision": "<numeric_revision>", - "short_id": "<short_id>" + "landing_rev" : "<landing_rev>", + "last_changeset" : { + "author" : "<full_author>", + "date" : "<date_time_of_commit>", + "message" : "<commit_message>", + "raw_id" : "<raw_id>", + "revision": "<numeric_revision>", + "short_id": "<short_id>" }, - "owner": "<repo_owner>", - "fork_of": "<name_of_fork_parent>", - "members" : [ + "owner" : "<repo_owner>", + "fork_of" : "<name_of_fork_parent>", + "members" : [ { - "type": "user", + "type" : "user", "user_id" : "<user_id>", "api_key" : "<api_key>", "username" : "<username>", - "firstname": "<firstname>", + "firstname" : "<firstname>", "lastname" : "<lastname>", "email" : "<email>", - "emails": "<list_of_all_additional_emails>", + "emails" : "<list_of_all_additional_emails>", "active" : "<bool>", - "admin" : "<bool>", + "admin" : "<bool>", "ldap_dn" : "<ldap_dn>", - "last_login": "<last_login>", + "last_login" : "<last_login>", "permission" : "repository.(read|write|admin)" }, … { - "type": "users_group", + "type" : "users_group", "id" : "<usersgroupid>", "name" : "<usersgroupname>", - "active": "<bool>", + "active" : "<bool>", "permission" : "repository.(read|write|admin)" }, … - ], - "followers": [ + ], + "followers" : [ { "user_id" : "<user_id>", "username" : "<username>", "api_key" : "<api_key>", - "firstname": "<firstname>", + "firstname" : "<firstname>", "lastname" : "<lastname>", "email" : "<email>", - "emails": "<list_of_all_additional_emails>", + "emails" : "<list_of_all_additional_emails>", "ip_addresses": "<list_of_ip_addresses_for_user>", "active" : "<bool>", - "admin" : "<bool>", + "admin" : "<bool>", "ldap_dn" : "<ldap_dn>", - "last_login": "<last_login>", + "last_login" : "<last_login>" }, … - ], - <if with_revision_names == True> - "tags": { - "<tagname>": "<raw_id>", + ], + <if with_revision_names == True> + "tags" : { + "<tagname>" : "<raw_id>", ... - }, - "branches": { - "<branchname>": "<raw_id>", + }, + "branches" : { + "<branchname>" : "<raw_id>", ... - }, - "bookmarks": { - "<bookmarkname>": "<raw_id>", + }, + "bookmarks" : { + "<bookmarkname>" : "<raw_id>", ... - }, + }, <if with_pullrequests == True> - "pull_requests": [ + "pull_requests" : [ { - "status": "<pull_request_status>", - "pull_request_id": <pull_request_id>, - "description": "<pull_request_description>", - "title": "<pull_request_title>", - "url": "<pull_request_url>", - "reviewers": [ + "status" : "<pull_request_status>", + "pull_request_id" : <pull_request_id>, + "description" : "<pull_request_description>", + "title" : "<pull_request_title>", + "url" : "<pull_request_url>", + "reviewers" : [ { - "username": "<user_id>", + "username" : "<user_id>" }, ... ], - "org_repo_url": "<repo_url>", - "org_ref_parts": [ + "org_repo_url" : "<repo_url>", + "org_ref_parts" : [ "<ref_type>", "<ref_name>", "<raw_id>" ], - "other_ref_parts": [ + "other_ref_parts" : [ "<ref_type>", "<ref_name>", "<raw_id>" ], - "comments": [ + "comments" : [ { - "username": "<user_id>", - "text": "<comment text>", - "comment_id": "<comment_id>", + "username" : "<user_id>", + "text" : "<comment text>", + "comment_id" : "<comment_id>" }, ... ], - "owner": "<username>", - "statuses": [ + "owner" : "<username>", + "statuses" : [ { - "status": "<status_of_review>", # "under_review", "approved" or "rejected" - "reviewer": "<user_id>", - "modified_at": "<date_time_of_review>" # iso 8601 date, server's timezone + "status" : "<status_of_review>", # "under_review", "approved" or "rejected" + "reviewer" : "<user_id>", + "modified_at" : "<date_time_of_review>" # iso 8601 date, server's timezone }, ... ], - "revisions": [ + "revisions" : [ "<raw_id>", ... ] }, ... ] - } - error: null + } + error : null get_repos ^^^^^^^^^ @@ -705,29 +704,29 @@ id : <id_for_response> api_key : "<api_key>" method : "get_repos" - args: { } + args : { } OUTPUT:: id : <id_given_in_input> - result: [ + result : [ { "repo_id" : "<repo_id>", - "repo_name" : "<reponame>" + "repo_name" : "<reponame>", "repo_type" : "<repo_type>", "clone_uri" : "<clone_uri>", "private" : "<bool>", "created_on" : "<datetimecreated>", "description" : "<description>", - "landing_rev": "<landing_rev>", - "owner": "<repo_owner>", - "fork_of": "<name_of_fork_parent>", - "enable_downloads": "<bool>", - "enable_statistics": "<bool>", + "landing_rev" : "<landing_rev>", + "owner" : "<repo_owner>", + "fork_of" : "<name_of_fork_parent>", + "enable_downloads" : "<bool>", + "enable_statistics": "<bool>" }, … - ] - error: null + ] + error : null get_repo_nodes ^^^^^^^^^^^^^^ @@ -741,24 +740,24 @@ id : <id_for_response> api_key : "<api_key>" method : "get_repo_nodes" - args: { - "repoid" : "<reponame or repo_id>" - "revision" : "<revision>", + args : { + "repoid" : "<reponame or repo_id>", + "revision" : "<revision>", "root_path" : "<root_path>", - "ret_type" : "<ret_type> = Optional('all')" + "ret_type" : "<ret_type> = Optional('all')" } OUTPUT:: id : <id_given_in_input> - result: [ + result : [ { - "name" : "<name>" - "type" : "<type>", + "name" : "<name>", + "type" : "<type>" }, … - ] - error: null + ] + error : null create_repo ^^^^^^^^^^^ @@ -778,7 +777,7 @@ id : <id_for_response> api_key : "<api_key>" method : "create_repo" - args: { + args : { "repo_name" : "<reponame>", "owner" : "<owner_name_or_id = Optional(=apiuser)>", "repo_type" : "<repo_type> = Optional('hg')", @@ -786,31 +785,31 @@ "private" : "<bool> = Optional(False)", "clone_uri" : "<clone_uri> = Optional(None)", "landing_rev" : "<landing_rev> = Optional('tip')", - "enable_downloads": "<bool> = Optional(False)", - "enable_statistics": "<bool> = Optional(False)", + "enable_downloads" : "<bool> = Optional(False)", + "enable_statistics": "<bool> = Optional(False)" } OUTPUT:: id : <id_given_in_input> - result: { - "msg": "Created new repository `<reponame>`", - "repo": { + result : { + "msg" : "Created new repository `<reponame>`", + "repo" : { "repo_id" : "<repo_id>", - "repo_name" : "<reponame>" + "repo_name" : "<reponame>", "repo_type" : "<repo_type>", "clone_uri" : "<clone_uri>", "private" : "<bool>", "created_on" : "<datetimecreated>", "description" : "<description>", - "landing_rev": "<landing_rev>", - "owner": "<username or user_id>", - "fork_of": "<name_of_fork_parent>", - "enable_downloads": "<bool>", - "enable_statistics": "<bool>", - }, - } - error: null + "landing_rev" : "<landing_rev>", + "owner" : "<username or user_id>", + "fork_of" : "<name_of_fork_parent>", + "enable_downloads" : "<bool>", + "enable_statistics": "<bool>" + } + } + error : null update_repo ^^^^^^^^^^^ @@ -825,8 +824,8 @@ id : <id_for_response> api_key : "<api_key>" method : "update_repo" - args: { - "repoid" : "<reponame or repo_id>" + args : { + "repoid" : "<reponame or repo_id>", "name" : "<reponame> = Optional('')", "group" : "<group_id> = Optional(None)", "owner" : "<owner_name_or_id = Optional(=apiuser)>", @@ -834,39 +833,39 @@ "private" : "<bool> = Optional(False)", "clone_uri" : "<clone_uri> = Optional(None)", "landing_rev" : "<landing_rev> = Optional('tip')", - "enable_downloads": "<bool> = Optional(False)", - "enable_statistics": "<bool> = Optional(False)", + "enable_downloads" : "<bool> = Optional(False)", + "enable_statistics": "<bool> = Optional(False)" } OUTPUT:: id : <id_given_in_input> - result: { - "msg": "updated repo ID:repo_id `<reponame>`", - "repository": { + result : { + "msg" : "updated repo ID:repo_id `<reponame>`", + "repository" : { "repo_id" : "<repo_id>", - "repo_name" : "<reponame>" + "repo_name" : "<reponame>", "repo_type" : "<repo_type>", "clone_uri" : "<clone_uri>", - "private": "<bool>", + "private" : "<bool>", "created_on" : "<datetimecreated>", "description" : "<description>", - "landing_rev": "<landing_rev>", - "owner": "<username or user_id>", - "fork_of": "<name_of_fork_parent>", - "enable_downloads": "<bool>", + "landing_rev" : "<landing_rev>", + "owner" : "<username or user_id>", + "fork_of" : "<name_of_fork_parent>", + "enable_downloads" : "<bool>", "enable_statistics": "<bool>", - "last_changeset": { - "author": "<full_author>", - "date": "<date_time_of_commit>", - "message": "<commit_message>", - "raw_id": "<raw_id>", + "last_changeset" : { + "author" : "<full_author>", + "date" : "<date_time_of_commit>", + "message" : "<commit_message>", + "raw_id" : "<raw_id>", "revision": "<numeric_revision>", "short_id": "<short_id>" } - }, - } - error: null + } + } + error : null fork_repo ^^^^^^^^^ @@ -884,25 +883,24 @@ id : <id_for_response> api_key : "<api_key>" method : "fork_repo" - args: { + args : { "repoid" : "<reponame or repo_id>", - "fork_name": "<forkname>", - "owner": "<username or user_id = Optional(=apiuser)>", - "description": "<description>", + "fork_name" : "<forkname>", + "owner" : "<username or user_id = Optional(=apiuser)>", + "description" : "<description>", "copy_permissions": "<bool>", - "private": "<bool>", - "landing_rev": "<landing_rev>" - + "private" : "<bool>", + "landing_rev" : "<landing_rev>" } OUTPUT:: id : <id_given_in_input> - result: { - "msg": "Created fork of `<reponame>` as `<forkname>`", - "success": true - } - error: null + result : { + "msg" : "Created fork of `<reponame>` as `<forkname>`", + "success" : true + } + error : null delete_repo ^^^^^^^^^^^ @@ -917,19 +915,19 @@ id : <id_for_response> api_key : "<api_key>" method : "delete_repo" - args: { + args : { "repoid" : "<reponame or repo_id>", - "forks" : "`delete` or `detach` = Optional(None)" + "forks" : "`delete` or `detach` = Optional(None)" } OUTPUT:: id : <id_given_in_input> - result: { - "msg": "Deleted repository `<reponame>`", - "success": true - } - error: null + result : { + "msg" : "Deleted repository `<reponame>`", + "success" : true + } + error : null grant_user_permission ^^^^^^^^^^^^^^^^^^^^^ @@ -942,20 +940,20 @@ id : <id_for_response> api_key : "<api_key>" method : "grant_user_permission" - args: { - "repoid" : "<reponame or repo_id>" - "userid" : "<username or user_id>" - "perm" : "(repository.(none|read|write|admin))", + args : { + "repoid" : "<reponame or repo_id>", + "userid" : "<username or user_id>", + "perm" : "(repository.(none|read|write|admin))" } OUTPUT:: id : <id_given_in_input> - result: { + result : { "msg" : "Granted perm: `<perm>` for user: `<username>` in repo: `<reponame>`", - "success": true - } - error: null + "success" : true + } + error : null revoke_user_permission ^^^^^^^^^^^^^^^^^^^^^^ @@ -967,20 +965,20 @@ id : <id_for_response> api_key : "<api_key>" - method : "revoke_user_permission" - args: { - "repoid" : "<reponame or repo_id>" + method : "revoke_user_permission" + args : { + "repoid" : "<reponame or repo_id>", "userid" : "<username or user_id>" } OUTPUT:: id : <id_given_in_input> - result: { + result : { "msg" : "Revoked perm for user: `<username>` in repo: `<reponame>`", - "success": true - } - error: null + "success" : true + } + error : null grant_user_group_permission ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -994,20 +992,20 @@ id : <id_for_response> api_key : "<api_key>" method : "grant_user_group_permission" - args: { - "repoid" : "<reponame or repo_id>" - "usersgroupid" : "<user group id or name>" - "perm" : "(repository.(none|read|write|admin))", + args : { + "repoid" : "<reponame or repo_id>", + "usersgroupid" : "<user group id or name>", + "perm" : "(repository.(none|read|write|admin))" } OUTPUT:: id : <id_given_in_input> - result: { + result : { "msg" : "Granted perm: `<perm>` for group: `<usersgroupname>` in repo: `<reponame>`", - "success": true - } - error: null + "success" : true + } + error : null revoke_user_group_permission ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1019,20 +1017,20 @@ id : <id_for_response> api_key : "<api_key>" - method : "revoke_user_group_permission" - args: { - "repoid" : "<reponame or repo_id>" + method : "revoke_user_group_permission" + args : { + "repoid" : "<reponame or repo_id>", "usersgroupid" : "<user group id or name>" } OUTPUT:: id : <id_given_in_input> - result: { + result : { "msg" : "Revoked perm for group: `<usersgroupname>` in repo: `<reponame>`", - "success": true - } - error: null + "success" : true + } + error : null get_changesets ^^^^^^^^^^^^^^ @@ -1044,37 +1042,37 @@ id : <id_for_response> api_key : "<api_key>" - method : "get_changesets" - args: { + method : "get_changesets" + args : { "repoid" : "<reponame or repo_id>", - "start": "<revision number> = Optional(None)", - "end": "<revision number> = Optional(None)", - "start_date": "<date> = Optional(None)", # in "%Y-%m-%dT%H:%M:%S" format - "end_date": "<date> = Optional(None)", # in "%Y-%m-%dT%H:%M:%S" format - "branch_name": "<branch name filter> = Optional(None)", - "reverse": "<bool> = Optional(False)", - "with_file_list": "<bool> = Optional(False)" + "start" : "<revision number> = Optional(None)", + "end" : "<revision number> = Optional(None)", + "start_date" : "<date> = Optional(None)", # in "%Y-%m-%dT%H:%M:%S" format + "end_date" : "<date> = Optional(None)", # in "%Y-%m-%dT%H:%M:%S" format + "branch_name" : "<branch name filter> = Optional(None)", + "reverse" : "<bool> = Optional(False)", + "with_file_list" : "<bool> = Optional(False)" } OUTPUT:: id : <id_given_in_input> - result: [ + result : [ { - "raw_id": "<raw_id>", - "short_id": "short_id": "<short_id>", - "author": "<full_author>", - "date": "<date_time_of_commit>", - "message": "<commit_message>", - "revision": "<numeric_revision>", + "raw_id" : "<raw_id>", + "short_id" : "<short_id>", + "author" : "<full_author>", + "date" : "<date_time_of_commit>", + "message" : "<commit_message>", + "revision" : "<numeric_revision>", <if with_file_list == True> - "added": [<list of added files>], - "changed": [<list of changed files>], - "removed": [<list of removed files>] + "added" : [<list of added files>], + "changed" : [<list of changed files>], + "removed" : [<list of removed files>] }, ... ] - error: null + error : null get_changeset ^^^^^^^^^^^^^ @@ -1087,32 +1085,32 @@ id : <id_for_response> api_key : "<api_key>" - method : "get_changeset" - args: { + method : "get_changeset" + args : { "repoid" : "<reponame or repo_id>", "raw_id" : "<raw_id>", - "with_reviews": "<bool> = Optional(False)" + "with_reviews" : "<bool> = Optional(False)" } OUTPUT:: id : <id_given_in_input> - result: { - "author": "<full_author>", - "date": "<date_time_of_commit>", - "message": "<commit_message>", - "raw_id": "<raw_id>", + result : { + "author" : "<full_author>", + "date" : "<date_time_of_commit>", + "message" : "<commit_message>", + "raw_id" : "<raw_id>", "revision": "<numeric_revision>", "short_id": "<short_id>", - "reviews": [{ - "reviewer": "<username>", - "modified_at": "<date_time_of_review>", # iso 8601 date, server's timezone - "status": "<status_of_review>", # "under_review", "approved" or "rejected" + "reviews" : [{ + "reviewer" : "<username>", + "modified_at" : "<date_time_of_review>", # iso 8601 date, server's timezone + "status" : "<status_of_review>", # "under_review", "approved" or "rejected" }, ... ] - } - error: null + } + error : null Example output:: @@ -1155,60 +1153,60 @@ id : <id_for_response> api_key : "<api_key>" - method : "get_pullrequest" - args: { - "pullrequest_id" : "<pullrequest_id>", + method : "get_pullrequest" + args : { + "pullrequest_id" : "<pullrequest_id>" } OUTPUT:: id : <id_given_in_input> - result: { - "status": "<pull_request_status>", - "pull_request_id": <pull_request_id>, - "description": "<pull_request_description>", - "title": "<pull_request_title>", - "url": "<pull_request_url>", - "reviewers": [ + result : { + "status" : "<pull_request_status>", + "pull_request_id" : <pull_request_id>, + "description" : "<pull_request_description>", + "title" : "<pull_request_title>", + "url" : "<pull_request_url>", + "reviewers" : [ { - "username": "<user_name>", + "username" : "<user_name>" }, ... ], - "org_repo_url": "<repo_url>", - "org_ref_parts": [ + "org_repo_url" : "<repo_url>", + "org_ref_parts" : [ "<ref_type>", "<ref_name>", "<raw_id>" ], - "other_ref_parts": [ + "other_ref_parts" : [ "<ref_type>", "<ref_name>", "<raw_id>" ], - "comments": [ + "comments" : [ { - "username": "<user_name>", - "text": "<comment text>", - "comment_id": "<comment_id>", + "username" : "<user_name>", + "text" : "<comment text>", + "comment_id" : "<comment_id>" }, ... ], - "owner": "<username>", - "statuses": [ + "owner" : "<username>", + "statuses" : [ { - "status": "<status_of_review>", # "under_review", "approved" or "rejected" - "reviewer": "<user_name>", - "modified_at": "<date_time_of_review>" # iso 8601 date, server's timezone + "status" : "<status_of_review>", # "under_review", "approved" or "rejected" + "reviewer" : "<user_name>", + "modified_at" : "<date_time_of_review>" # iso 8601 date, server's timezone }, ... ], - "revisions": [ + "revisions" : [ "<raw_id>", ... ] }, - error: null + error : null comment_pullrequest ^^^^^^^^^^^^^^^^^^^ @@ -1220,19 +1218,19 @@ id : <id_for_response> api_key : "<api_key>" - method : "comment_pullrequest" - args: { - "pull_request_id": "<pull_request_id>", - "comment_msg": Optional(''), - "status": Optional(None), # "under_review", "approved" or "rejected" - "close_pr": Optional(False)", + method : "comment_pullrequest" + args : { + "pull_request_id" : "<pull_request_id>", + "comment_msg" : Optional(''), + "status" : Optional(None), # "under_review", "approved" or "rejected" + "close_pr" : Optional(False)" } OUTPUT:: id : <id_given_in_input> - result: True - error: null + result : True + error : null API access for web views
--- a/docs/conf.py Mon Dec 12 18:28:10 2022 +0100 +++ b/docs/conf.py Mon Dec 12 23:01:11 2022 +0100 @@ -47,7 +47,7 @@ # General information about the project. project = 'Kallithea' -copyright = '2010-2021 by various authors, licensed as GPLv3.' +copyright = '2010-2022 by various authors, licensed as GPLv3.' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the
--- a/kallithea/config/application.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/config/application.py Mon Dec 12 23:01:11 2022 +0100 @@ -35,7 +35,7 @@ app = SimpleGit(app, config) # Enable https redirects based on HTTP_X_URL_SCHEME set by proxy - if any(asbool(config.get(x)) for x in ['url_scheme_variable', 'force_https', 'use_htsts']): + if config.get('url_scheme_variable') or asbool(config.get('force_https')) or asbool(config.get('use_htsts')): app = HttpsFixup(app, config) app = PermanentRepoUrl(app, config)
--- a/kallithea/config/middleware/https_fixup.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/config/middleware/https_fixup.py Mon Dec 12 23:01:11 2022 +0100 @@ -26,7 +26,6 @@ """ -import kallithea from kallithea.lib.utils2 import asbool @@ -62,7 +61,7 @@ proto = 'https' else: # get protocol from configured WSGI environment variable - url_scheme_variable = kallithea.CONFIG.get('url_scheme_variable') + url_scheme_variable = self.config.get('url_scheme_variable') if url_scheme_variable: proto = environ.get(url_scheme_variable)
--- a/kallithea/controllers/admin/repo_groups.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/controllers/admin/repo_groups.py Mon Dec 12 23:01:11 2022 +0100 @@ -76,6 +76,7 @@ repo_group = db.RepoGroup.get_or_404(group_id) data = repo_group.get_dict() data['group_name'] = repo_group.name + data['owner'] = repo_group.owner.username # fill repository group users for p in repo_group.repo_group_to_perm: @@ -146,7 +147,7 @@ group_name=form_result['group_name'], group_description=form_result['group_description'], parent=form_result['parent_group_id'], - owner=request.authuser.user_id, # TODO: make editable + owner=request.authuser.user_id, copy_permissions=form_result['group_copy_permissions'] ) meta.Session().commit() @@ -245,6 +246,7 @@ @HasRepoGroupPermissionLevelDecorator('admin') def delete(self, group_name): gr = c.repo_group = db.RepoGroup.guess_instance(group_name) + parent_group = gr.parent_group repos = gr.repositories.all() if repos: webutils.flash(_('This group contains %s repositories and cannot be ' @@ -268,8 +270,8 @@ webutils.flash(_('Error occurred during deletion of repository group %s') % group_name, category='error') - if gr.parent_group: - raise HTTPFound(location=url('repos_group_home', group_name=gr.parent_group.group_name)) + if parent_group: + raise HTTPFound(location=url('repos_group_home', group_name=parent_group.group_name)) raise HTTPFound(location=url('repos_groups')) def show_by_name(self, group_name):
--- a/kallithea/controllers/api/api.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/controllers/api/api.py Mon Dec 12 23:01:11 2022 +0100 @@ -172,23 +172,21 @@ OUTPUT:: - id : <id_given_in_input> - result : { - "msg": "Pulled from `<repository name>`" - "repository": "<repository name>" - } - error : null + id : <id_given_in_input> + result : { + "msg" : "Pulled from `<repository name>`", + "repository" : "<repository name>" + } + error : null ERROR OUTPUT:: - id : <id_given_in_input> - result : null - error : { - "Unable to pull changes from `<reponame>`" - } - + id : <id_given_in_input> + result : null + error : { + "Unable to pull changes from `<reponame>`" + } """ - repo = get_repo_or_error(repoid) try: @@ -220,23 +218,21 @@ OUTPUT:: - id : <id_given_in_input> - result : { - 'added': [<added repository name>,...] - 'removed': [<removed repository name>,...] - } - error : null + id : <id_given_in_input> + result : { + 'added': [<added repository name>,...] + 'removed': [<removed repository name>,...] + } + error : null ERROR OUTPUT:: - id : <id_given_in_input> - result : null - error : { - 'Error occurred during rescan repositories action' - } - + id : <id_given_in_input> + result : null + error : { + 'Error occurred during rescan repositories action' + } """ - try: rm_obsolete = remove_obsolete added, removed = repo2db_mapper(ScmModel().repo_scan(), @@ -259,21 +255,20 @@ OUTPUT:: - id : <id_given_in_input> - result : { - 'msg': Cache for repository `<repository name>` was invalidated, - 'repository': <repository name> - } - error : null + id : <id_given_in_input> + result : { + 'msg': Cache for repository `<repository name>` was invalidated, + 'repository': <repository name> + } + error : null ERROR OUTPUT:: - id : <id_given_in_input> - result : null - error : { - 'Error occurred during cache invalidation action' - } - + id : <id_given_in_input> + result : null + error : { + 'Error occurred during cache invalidation action' + } """ repo = get_repo_or_error(repoid) if not HasPermissionAny('hg.admin')(): @@ -308,16 +303,16 @@ id : <id_given_in_input> result : { - "server_ip_addr": "<ip_from_clien>", - "user_ips": [ + "server_ip_addr" : "<ip_from_client>", + "user_ips" : [ { - "ip_addr": "<ip_with_mask>", - "ip_range": ["<start_ip>", "<end_ip>"], + "ip_addr" : "<ip_with_mask>", + "ip_range" : ["<start_ip>", "<end_ip>"] }, ... - ] + ] } - + error : null """ if userid is None: userid = request.authuser.user_id @@ -336,17 +331,18 @@ """ return server info, including Kallithea version and installed packages - OUTPUT:: - id : <id_given_in_input> - result : { - 'modules': [<module name>,...] - 'py_version': <python version>, - 'platform': <platform type>, - 'kallithea_version': <kallithea version> - } - error : null + id : <id_given_in_input> + result : { + 'modules' : [ [<module name>, <module version>], ...] + 'py_version' : <python version>, + 'platform' : <platform type>, + 'kallithea_version' : <kallithea version>, + 'git_version' : '<git version>', + 'git_path' : '<git path>' + } + error : null """ return db.Setting.get_server_info() @@ -364,33 +360,26 @@ OUTPUT:: id : <id_given_in_input> - result: None if user does not exist or - { + result : None if user does not exist or + { "user_id" : "<user_id>", - "api_key" : "<api_key>", - "api_keys": "[<list of all API keys including additional ones>]" "username" : "<username>", - "firstname": "<firstname>", + "firstname" : "<firstname>", "lastname" : "<lastname>", "email" : "<email>", - "emails": "[<list of all emails including additional ones>]", - "ip_addresses": "[<ip_address_for_user>,...]", + "emails" : "[<list of all emails including additional ones>]", "active" : "<bool: user active>", - "admin" : "<bool: user is admin>", - "extern_name" : "<extern_name>", - "extern_type" : "<extern type> - "last_login": "<last_login>", - "permissions": { - "global": ["hg.create.repository", - "repository.read", - "hg.register.manual_activate"], - "repositories": {"repo1": "repository.none"}, - "repositories_groups": {"Group1": "group.read"} - }, - } - - error: null - + "admin" : "<bool: user is admin>", + "permissions" : { + "global" : ["hg.create.repository", + "repository.read", + "hg.register.manual_activate"], + "repositories" : {"repo1" : "repository.none"}, + "repositories_groups" : {"Group1" : "group.read"}, + "user_groups" : { "usrgrp1" : "usergroup.admin" } + } + } + error : null """ if not HasPermissionAny('hg.admin')(): # make sure normal user does not pass someone else userid, @@ -414,14 +403,12 @@ Lists all existing users. This command can be executed only using api_key belonging to user with admin rights. - OUTPUT:: id : <id_given_in_input> - result: [<user_object>, ...] - error: null + result : [<user_object>, ...] + error : null """ - return [ user.get_api_data() for user in db.User.query() @@ -446,9 +433,9 @@ :param password: password :type password: Optional(str) :param firstname: firstname - :type firstname: Optional(str) + :type firstname: str :param lastname: lastname - :type lastname: Optional(str) + :type lastname: str :param active: active :type active: Optional(bool) :param admin: admin @@ -458,30 +445,27 @@ :param extern_type: extern_type :type extern_type: Optional(str) - OUTPUT:: id : <id_given_in_input> - result: { + result : { "msg" : "created new user `<username>`", - "user": <user_obj> - } - error: null + "user" : <user_obj> + } + error : null ERROR OUTPUT:: - id : <id_given_in_input> - result : null - error : { - "user `<username>` already exist" - or - "email `<email>` already exist" - or - "failed to create user `<username>`" - } - + id : <id_given_in_input> + result : null + error : { + "user `<username>` already exist" + or + "email `<email>` already exist" + or + "failed to create user `<username>`" + } """ - if db.User.get_by_username(username): raise JSONRPCError("user `%s` already exist" % (username,)) @@ -522,9 +506,9 @@ :param userid: userid to update :type userid: str or int :param username: new username - :type username: str or int + :type username: Optional(str or int) :param email: email - :type email: str + :type email: Optional(str) :param password: password :type password: Optional(str) :param firstname: firstname @@ -540,26 +524,23 @@ :param extern_type: :type extern_type: Optional(str) - OUTPUT:: id : <id_given_in_input> - result: { + result : { "msg" : "updated user ID:<userid> <username>", - "user": <user_object>, - } - error: null + "user" : <user_object> + } + error : null ERROR OUTPUT:: - id : <id_given_in_input> - result : null - error : { - "failed to update user `<username>`" - } - + id : <id_given_in_input> + result : null + error : { + "failed to update user `<username>`" + } """ - user = get_user_or_error(userid) # only non optional arguments will be stored in updates @@ -602,20 +583,19 @@ OUTPUT:: id : <id_given_in_input> - result: { + result : { "msg" : "deleted user ID:<userid> <username>", - "user": null - } - error: null + "user" : null + } + error : null ERROR OUTPUT:: - id : <id_given_in_input> - result : null - error : { - "failed to delete user ID:<userid> <username>" - } - + id : <id_given_in_input> + result : null + error : { + "failed to delete user ID:<userid> <username>" + } """ user = get_user_or_error(userid) @@ -649,11 +629,12 @@ { "users_group_id" : "<id>", "group_name" : "<groupname>", - "active": "<bool>", - "members" : [<user_obj>,...] + "group_description" : "<description>", + "active" : "<bool>", + "owner" : "<username>", + "members" : [<user_obj>,...] } error : null - """ user_group = get_user_group_or_error(usergroupid) if not HasPermissionAny('hg.admin')(): @@ -670,14 +651,12 @@ api_key belonging to user with admin rights or user who has at least read access to user group. - OUTPUT:: id : <id_given_in_input> result : [<user_group_obj>,...] error : null """ - return [ user_group.get_api_data() for user_group in UserGroupList(db.UserGroup.query().all(), perm_level='read') @@ -694,7 +673,7 @@ :param group_name: name of new user group :type group_name: str :param description: group description - :type description: str + :type description: Optional(str) :param owner: owner of group. If not passed apiuser is the owner :type owner: Optional(str or int) :param active: group is active @@ -703,24 +682,22 @@ OUTPUT:: id : <id_given_in_input> - result: { - "msg": "created new user group `<groupname>`", - "user_group": <user_group_object> - } - error: null + result : { + "msg" : "created new user group `<groupname>`", + "user_group" : <user_group_object> + } + error : null ERROR OUTPUT:: - id : <id_given_in_input> - result : null - error : { - "user group `<group name>` already exist" - or - "failed to create group `<group name>`" - } - + id : <id_given_in_input> + result : null + error : { + "user group `<group name>` already exist" + or + "failed to create group `<group name>`" + } """ - if UserGroupModel().get_by_name(group_name): raise JSONRPCError("user group `%s` already exist" % (group_name,)) @@ -763,10 +740,10 @@ id : <id_given_in_input> result : { - "msg": 'updated user group ID:<user group id> <user group name>', - "user_group": <user_group_object> + "msg" : 'updated user group ID:<user group id> <user group name>', + "user_group" : <user_group_object> } - error : null + error : null ERROR OUTPUT:: @@ -775,7 +752,6 @@ error : { "failed to update user group `<user group name>`" } - """ user_group = get_user_group_or_error(usergroupid) if not HasPermissionAny('hg.admin')(): @@ -810,15 +786,15 @@ belonging to user with admin rights or an admin of given user group :param usergroupid: - :type usergroupid: int + :type usergroupid: str or int OUTPUT:: id : <id_given_in_input> result : { - "msg": "deleted user group ID:<user_group_id> <user_group_name>" + "msg" : "deleted user group ID:<user_group_id> <user_group_name>" } - error : null + error : null ERROR OUTPUT:: @@ -829,7 +805,6 @@ or "RepoGroup assigned to <repo_groups_list>" } - """ user_group = get_user_group_or_error(usergroupid) if not HasPermissionAny('hg.admin')(): @@ -859,32 +834,30 @@ """ Adds a user to a user group. If user exists in that group success will be `false`. This command can be executed only using api_key - belonging to user with admin rights or an admin of given user group + belonging to user with admin rights or an admin of a given user group :param usergroupid: - :type usergroupid: int + :type usergroupid: str or int :param userid: - :type userid: int + :type userid: str or int OUTPUT:: - id : <id_given_in_input> - result : { - "success": True|False # depends on if member is in group - "msg": "added member `<username>` to user group `<groupname>` | - User is already in that group" - - } - error : null + id : <id_given_in_input> + result : { + "success" : True|False # depends on if member is in group + "msg" : "added member `<username>` to a user group `<groupname>` | + User is already in that group" + } + error : null ERROR OUTPUT:: - id : <id_given_in_input> - result : null - error : { - "failed to add member to user group `<user_group_name>`" - } - + id : <id_given_in_input> + result : null + error : { + "failed to add member to user group `<user_group_name>`" + } """ user = get_user_or_error(userid) user_group = get_user_group_or_error(usergroupid) @@ -923,17 +896,15 @@ :param usergroupid: :param userid: - OUTPUT:: id : <id_given_in_input> - result: { - "success": True|False, # depends on if member is in group - "msg": "removed member <username> from user group <groupname> | - User wasn't in group" - } - error: null - + result : { + "success" : True|False, # depends on if member is in group + "msg" : "removed member <username> from user group <groupname> | + User wasn't in group" + } + error : null """ user = get_user_or_error(userid) user_group = get_user_group_or_error(usergroupid) @@ -972,61 +943,58 @@ OUTPUT:: - id : <id_given_in_input> - result : { - { - "repo_id" : "<repo_id>", - "repo_name" : "<reponame>" - "repo_type" : "<repo_type>", - "clone_uri" : "<clone_uri>", - "enable_downloads": "<bool>", - "enable_statistics": "<bool>", - "private": "<bool>", - "created_on" : "<date_time_created>", - "description" : "<description>", - "landing_rev": "<landing_rev>", - "last_changeset": { - "author": "<full_author>", - "date": "<date_time_of_commit>", - "message": "<commit_message>", - "raw_id": "<raw_id>", - "revision": "<numeric_revision>", - "short_id": "<short_id>" - } - "owner": "<repo_owner>", - "fork_of": "<name_of_fork_parent>", - "members" : [ - { - "name": "<username>", - "type" : "user", - "permission" : "repository.(read|write|admin)" - }, - … - { - "name": "<usergroup name>", - "type" : "user_group", - "permission" : "usergroup.(read|write|admin)" - }, - … - ] - "followers": [<user_obj>, ...], - <if with_revision_names == True> - "tags": { - "<tagname>": "<raw_id>", - ... - }, - "branches": { - "<branchname>": "<raw_id>", - ... - }, - "bookmarks": { - "<bookmarkname>": "<raw_id>", - ... - }, - } - } - error : null - + id : <id_given_in_input> + result : { + "repo_id" : "<repo_id>", + "repo_name" : "<reponame>", + "repo_type" : "<repo_type>", + "clone_uri" : "<clone_uri>", + "enable_downloads" : "<bool>", + "enable_statistics": "<bool>", + "private" : "<bool>", + "created_on" : "<date_time_created>", + "description" : "<description>", + "landing_rev" : "<landing_rev>", + "last_changeset" : { + "author" : "<full_author>", + "date" : "<date_time_of_commit>", + "message" : "<commit_message>", + "raw_id" : "<raw_id>", + "revision": "<numeric_revision>", + "short_id": "<short_id>" + }, + "owner" : "<repo_owner>", + "fork_of" : "<name_of_fork_parent>", + "members" : [ + { + "name" : "<username>", + "type" : "user", + "permission" : "repository.(read|write|admin)" + }, + … + { + "name" : "<usergroup name>", + "type" : "user_group", + "permission" : "usergroup.(read|write|admin)" + }, + … + ], + "followers" : [<user_obj>, ...], + <if with_revision_names == True> + "tags" : { + "<tagname>" : "<raw_id>", + ... + }, + "branches" : { + "<branchname>" : "<raw_id>", + ... + }, + "bookmarks" : { + "<bookmarkname>" : "<raw_id>", + ... + } + } + error : null """ repo = get_repo_or_error(repoid) @@ -1073,28 +1041,27 @@ api_key belonging to user with admin rights or regular user that have admin, write or read access to repository. - OUTPUT:: id : <id_given_in_input> - result: [ + result : [ { "repo_id" : "<repo_id>", - "repo_name" : "<reponame>" + "repo_name" : "<reponame>", "repo_type" : "<repo_type>", "clone_uri" : "<clone_uri>", - "private": : "<bool>", + "private" : "<bool>", "created_on" : "<datetimecreated>", "description" : "<description>", - "landing_rev": "<landing_rev>", - "owner": "<repo_owner>", - "fork_of": "<name_of_fork_parent>", - "enable_downloads": "<bool>", - "enable_statistics": "<bool>", + "landing_rev" : "<landing_rev>", + "owner" : "<repo_owner>", + "fork_of" : "<name_of_fork_parent>", + "enable_downloads" : "<bool>", + "enable_statistics": "<bool>" }, … - ] - error: null + ] + error : null """ if not HasPermissionAny('hg.admin')(): repos = request.authuser.get_all_user_repos() @@ -1124,18 +1091,17 @@ :param ret_type: return type 'all|files|dirs' nodes :type ret_type: Optional(str) - OUTPUT:: id : <id_given_in_input> - result: [ + result : [ { - "name" : "<name>" - "type" : "<type>", + "name" : "<name>", + "type" : "<type>" }, … - ] - error: null + ] + error : null """ repo = get_repo_or_error(repoid) @@ -1203,21 +1169,19 @@ OUTPUT:: id : <id_given_in_input> - result: { - "msg": "Created new repository `<reponame>`", - "success": true, - "task": "<celery task id or None if done sync>" - } - error: null + result : { + "msg" : "Created new repository `<reponame>`", + "success" : true + } + error : null ERROR OUTPUT:: - id : <id_given_in_input> - result : null - error : { - 'failed to create repository `<repo_name>` - } - + id : <id_given_in_input> + result : null + error : { + 'failed to create repository `<repo_name>` + } """ group_name = None repo_name_parts = repo_name.split('/') @@ -1266,8 +1230,8 @@ clone_uri=clone_uri, repo_group=group_name, repo_landing_rev=landing_rev, - enable_statistics=enable_statistics, - enable_downloads=enable_downloads, + repo_enable_statistics=enable_statistics, + repo_enable_downloads=enable_downloads, repo_copy_permissions=copy_permissions, ) @@ -1291,7 +1255,6 @@ clone_uri=None, landing_rev=None, enable_statistics=None, enable_downloads=None): - """ Updates repo @@ -1378,26 +1341,25 @@ id : <id_for_response> api_key : "<api_key>" - args: { + method : "fork_repo" + args : { "repoid" : "<reponame or repo_id>", - "fork_name": "<forkname>", - "owner": "<username or user_id = Optional(=apiuser)>", - "description": "<description>", + "fork_name" : "<forkname>", + "owner" : "<username or user_id = Optional(=apiuser)>", + "description" : "<description>", "copy_permissions": "<bool>", - "private": "<bool>", - "landing_rev": "<landing_rev>" + "private" : "<bool>", + "landing_rev" : "<landing_rev>" } OUTPUT:: id : <id_given_in_input> - result: { - "msg": "Created fork of `<reponame>` as `<forkname>`", - "success": true, - "task": "<celery task id or None if done sync>" - } - error: null - + result : { + "msg" : "Created fork of `<reponame>` as `<forkname>`", + "success" : true + } + error : null """ repo = get_repo_or_error(repoid) repo_name = repo.repo_name @@ -1480,12 +1442,11 @@ OUTPUT:: id : <id_given_in_input> - result: { - "msg": "Deleted repository `<reponame>`", - "success": true - } - error: null - + result : { + "msg" : "Deleted repository `<reponame>`", + "success" : true + } + error : null """ repo = get_repo_or_error(repoid) @@ -1535,11 +1496,11 @@ OUTPUT:: id : <id_given_in_input> - result: { + result : { "msg" : "Granted perm: `<perm>` for user: `<username>` in repo: `<reponame>`", - "success": true - } - error: null + "success" : true + } + error : null """ repo = get_repo_or_error(repoid) user = get_user_or_error(userid) @@ -1577,14 +1538,12 @@ OUTPUT:: id : <id_given_in_input> - result: { + result : { "msg" : "Revoked perm for user: `<username>` in repo: `<reponame>`", - "success": true - } - error: null - + "success" : true + } + error : null """ - repo = get_repo_or_error(repoid) user = get_user_or_error(userid) try: @@ -1620,22 +1579,20 @@ OUTPUT:: - id : <id_given_in_input> - result : { - "msg" : "Granted perm: `<perm>` for group: `<usersgroupname>` in repo: `<reponame>`", - "success": true - - } - error : null + id : <id_given_in_input> + result : { + "msg" : "Granted perm: `<perm>` for group: `<usersgroupname>` in repo: `<reponame>`", + "success" : true + } + error : null ERROR OUTPUT:: - id : <id_given_in_input> - result : null - error : { - "failed to edit permission for user group: `<usergroup>` in repo `<repo>`' - } - + id : <id_given_in_input> + result : null + error : { + "failed to edit permission for user group: `<usergroup>` in repo `<repo>`' + } """ repo = get_repo_or_error(repoid) perm = get_perm_or_error(perm) @@ -1682,11 +1639,11 @@ OUTPUT:: id : <id_given_in_input> - result: { + result : { "msg" : "Revoked perm for group: `<usersgroupname>` in repo: `<reponame>`", - "success": true - } - error: null + "success" : true + } + error : null """ repo = get_repo_or_error(repoid) user_group = get_user_group_or_error(usergroupid) @@ -1757,7 +1714,6 @@ def get_repo_groups(self): """ Returns all repository groups - """ return [ repo_group.get_api_data() @@ -1788,10 +1744,10 @@ id : <id_given_in_input> result : { - "msg": "created new repo group `<repo_group_name>`" - "repo_group": <repogroup_object> + "msg" : "created new repo group `<repo_group_name>`", + "repo_group" : <repogroup_object> } - error : null + error : null ERROR OUTPUT:: @@ -1800,7 +1756,6 @@ error : { failed to create repo group `<repogroupid>` } - """ if db.RepoGroup.get_by_group_name(group_name): raise JSONRPCError("repo group `%s` already exist" % (group_name,)) @@ -1836,13 +1791,14 @@ owner=None, parent=None): repo_group = get_repo_group_or_error(repogroupid) + parent_repo_group_id = None if parent is None else get_repo_group_or_error(parent).group_id updates = {} try: store_update(updates, group_name, 'group_name') store_update(updates, description, 'group_description') store_update(updates, owner, 'owner') - store_update(updates, parent, 'parent_group') + store_update(updates, parent_repo_group_id, 'parent_group_id') repo_group = RepoGroupModel().update(repo_group, updates) meta.Session().commit() return dict( @@ -1858,7 +1814,6 @@ @HasPermissionAnyDecorator('hg.admin') def delete_repo_group(self, repogroupid): """ - :param repogroupid: name or id of repository group :type repogroupid: str or int @@ -1866,10 +1821,10 @@ id : <id_given_in_input> result : { - 'msg': 'deleted repo group ID:<repogroupid> <repogroupname> - 'repo_group': null + 'msg' : 'deleted repo group ID:<repogroupid> <repogroupname> + 'repo_group' : null } - error : null + error : null ERROR OUTPUT:: @@ -1878,7 +1833,6 @@ error : { "failed to delete repo group ID:<repogroupid> <repogroupname>" } - """ repo_group = get_repo_group_or_error(repogroupid) @@ -1916,11 +1870,11 @@ OUTPUT:: id : <id_given_in_input> - result: { + result : { "msg" : "Granted perm: `<perm>` (recursive:<apply_to_children>) for user: `<username>` in repo group: `<repo_group_name>`", - "success": true - } - error: null + "success" : true + } + error : null ERROR OUTPUT:: @@ -1929,9 +1883,7 @@ error : { "failed to edit permission for user: `<userid>` in repo group: `<repo_group_name>`" } - """ - repo_group = get_repo_group_or_error(repogroupid) if not HasPermissionAny('hg.admin')(): @@ -1978,11 +1930,11 @@ OUTPUT:: id : <id_given_in_input> - result: { + result : { "msg" : "Revoked perm (recursive:<apply_to_children>) for user: `<username>` in repo group: `<repo_group_name>`", - "success": true - } - error: null + "success" : true + } + error : null ERROR OUTPUT:: @@ -1991,9 +1943,7 @@ error : { "failed to edit permission for user: `<userid>` in repo group: `<repo_group_name>`" } - """ - repo_group = get_repo_group_or_error(repogroupid) if not HasPermissionAny('hg.admin')(): @@ -2045,10 +1995,9 @@ id : <id_given_in_input> result : { "msg" : "Granted perm: `<perm>` (recursive:<apply_to_children>) for user group: `<usersgroupname>` in repo group: `<repo_group_name>`", - "success": true - + "success" : true } - error : null + error : null ERROR OUTPUT:: @@ -2057,7 +2006,6 @@ error : { "failed to edit permission for user group: `<usergroup>` in repo group: `<repo_group_name>`" } - """ repo_group = get_repo_group_or_error(repogroupid) perm = get_perm_or_error(perm, prefix='group.') @@ -2112,11 +2060,11 @@ OUTPUT:: id : <id_given_in_input> - result: { + result : { "msg" : "Revoked perm (recursive:<apply_to_children>) for user group: `<usersgroupname>` in repo group: `<repo_group_name>`", - "success": true - } - error: null + "success" : true + } + error : null ERROR OUTPUT:: @@ -2125,8 +2073,6 @@ error : { "failed to edit permission for user group: `<usergroup>` in repo group: `<repo_group_name>`" } - - """ repo_group = get_repo_group_or_error(repogroupid) user_group = get_user_group_or_error(usergroupid) @@ -2204,7 +2150,6 @@ def create_gist(self, files, owner=None, gist_type=db.Gist.GIST_PUBLIC, lifetime=-1, description=''): - """ Creates new Gist @@ -2219,16 +2164,16 @@ :param lifetime: time in minutes of gist lifetime :type lifetime: Optional(int) :param description: gist description - :type description: Optional(str) + :type description: str OUTPUT:: id : <id_given_in_input> result : { - "msg": "created new gist", - "gist": {} + "msg" : "created new gist", + "gist" : <gist_object> } - error : null + error : null ERROR OUTPUT:: @@ -2237,7 +2182,6 @@ error : { "failed to create gist" } - """ try: if owner is None: @@ -2272,10 +2216,10 @@ id : <id_given_in_input> result : { - "deleted gist ID: <gist_id>", - "gist": null + "msg" : "deleted gist ID: <gist_id>", + "gist" : null } - error : null + error : null ERROR OUTPUT:: @@ -2284,7 +2228,6 @@ error : { "failed to delete gist ID:<gist_id>" } - """ gist = get_gist_or_error(gistid) if not HasPermissionAny('hg.admin')():
--- a/kallithea/controllers/changelog.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/controllers/changelog.py Mon Dec 12 23:01:11 2022 +0100 @@ -114,7 +114,7 @@ webutils.flash(e, category='warning') raise HTTPFound(location=webutils.url('changelog_home', repo_name=repo_name)) else: - collection = c.db_repo_scm_instance.get_changesets(start=0, end=revision, + collection = c.db_repo_scm_instance.get_changesets(end=revision, branch_name=branch_name, reverse=True) c.total_cs = len(collection)
--- a/kallithea/controllers/files.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/controllers/files.py Mon Dec 12 23:01:11 2022 +0100 @@ -44,7 +44,7 @@ from kallithea.lib import diffs, webutils from kallithea.lib.auth import HasRepoPermissionLevelDecorator, LoginRequired from kallithea.lib.exceptions import NonRelativePathError -from kallithea.lib.utils2 import asbool, convert_line_endings, detect_mode, safe_str +from kallithea.lib.utils2 import asbool, convert_line_endings, detect_mode, safe_bytes, safe_str from kallithea.lib.vcs.backends.base import EmptyChangeset from kallithea.lib.vcs.conf import settings from kallithea.lib.vcs.exceptions import (ChangesetDoesNotExistError, ChangesetError, EmptyRepositoryError, ImproperArchiveTypeError, NodeAlreadyExistsError, @@ -233,7 +233,7 @@ file_node = self.__get_filenode(cs, f_path) response.content_disposition = \ - 'attachment; filename=%s' % f_path.split(kallithea.URL_SEP)[-1] + 'attachment; filename=%s' % safe_bytes(f_path.split(kallithea.URL_SEP)[-1]).decode('latin1') response.content_type = file_node.mimetype return file_node.content
--- a/kallithea/front-end/package-lock.json Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/front-end/package-lock.json Mon Dec 12 23:01:11 2022 +0100 @@ -1,7 +1,2367 @@ { "name": "kallithea", + "lockfileVersion": 2, "requires": true, - "lockfileVersion": 1, + "packages": { + "": { + "name": "kallithea", + "dependencies": { + "at.js": "1.5.4", + "bootstrap": "3.3.7", + "codemirror": "5.49.0", + "datatables.net": "1.10.20", + "datatables.net-bs": "1.10.20", + "jquery": "3.4.1", + "jquery.caret": "0.3.1", + "jquery.flot": "0.8.3", + "select2": "3.5.1", + "select2-bootstrap-css": "1.4.6" + }, + "devDependencies": { + "eslint": "6.8.0", + "eslint-plugin-html": "6.0.0", + "less": "3.10.3", + "less-plugin-clean-css": "1.5.1", + "license-checker": "25.0.1" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "dev": true, + "dependencies": { + "@babel/highlight": "^7.8.3" + } + }, + "node_modules/@babel/highlight": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", + "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", + "dev": true, + "dependencies": { + "chalk": "^2.0.0", + "esutils": "^2.0.2", + "js-tokens": "^4.0.0" + } + }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "dev": true + }, + "node_modules/acorn": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz", + "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz", + "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0" + } + }, + "node_modules/ajv": { + "version": "6.10.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", + "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "node_modules/amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true, + "engines": { + "node": ">=0.4.2" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz", + "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==", + "dev": true, + "dependencies": { + "type-fest": "^0.8.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", + "dev": true + }, + "node_modules/asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "dev": true, + "optional": true, + "dependencies": { + "safer-buffer": "~2.1.0" + } + }, + "node_modules/assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/astral-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", + "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "dev": true, + "optional": true + }, + "node_modules/at.js": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/at.js/-/at.js-1.5.4.tgz", + "integrity": "sha512-G8mgUb/PqShPoH8AyjuxsTGvIr1o716BtQUKDM44C8qN2W615y7KGJ68MlTGamd0J0D/m28emUkzagaHTdrGZw==", + "engines": { + "node": ">= 0.6.0" + }, + "peerDependencies": { + "jquery": ">=1.7.0 <4.0.0" + } + }, + "node_modules/aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "dev": true, + "optional": true, + "engines": { + "node": "*" + } + }, + "node_modules/aws4": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", + "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", + "dev": true, + "optional": true + }, + "node_modules/balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "node_modules/bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "dev": true, + "optional": true, + "dependencies": { + "tweetnacl": "^0.14.3" + } + }, + "node_modules/bootstrap": { + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz", + "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E=", + "engines": { + "node": ">=0.10.1" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "dev": true, + "optional": true + }, + "node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true + }, + "node_modules/clean-css": { + "version": "3.4.28", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz", + "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=", + "dev": true, + "dependencies": { + "commander": "2.8.x", + "source-map": "0.4.x" + }, + "bin": { + "cleancss": "bin/cleancss" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/clean-css/node_modules/source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "dependencies": { + "amdefine": ">=0.0.4" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "dependencies": { + "restore-cursor": "^3.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cli-width": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", + "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", + "dev": true + }, + "node_modules/clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", + "dev": true, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/codemirror": { + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.49.0.tgz", + "integrity": "sha512-Hyzr0HToBdZpLBN9dYFO/KlJAsKH37/cXVHPAqa+imml0R92tb9AkmsvjnXL+SluEvjjdfkDgRjc65NG5jnMYA==" + }, + "node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "optional": true, + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/commander": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", + "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", + "dev": true, + "dependencies": { + "graceful-readlink": ">= 1.0.0" + }, + "engines": { + "node": ">= 0.6.x" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true, + "optional": true + }, + "node_modules/cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "dependencies": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + }, + "engines": { + "node": ">=4.8" + } + }, + "node_modules/dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dev": true, + "optional": true, + "dependencies": { + "assert-plus": "^1.0.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/datatables.net": { + "version": "1.10.20", + "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.20.tgz", + "integrity": "sha512-4E4S7tTU607N3h0fZPkGmAtr9mwy462u+VJ6gxYZ8MxcRIjZqHy3Dv1GNry7i3zQCktTdWbULVKBbkAJkuHEnQ==", + "dependencies": { + "jquery": ">=1.7" + } + }, + "node_modules/datatables.net-bs": { + "version": "1.10.20", + "resolved": "https://registry.npmjs.org/datatables.net-bs/-/datatables.net-bs-1.10.20.tgz", + "integrity": "sha512-NsMoOOYZ6NlteOpzhltw21lXsNdhjIMbIOxnqmcrb62ntl8eL9pYzk2AeiDXBlIKY4e550ZrExCq3CYKQ9myEg==", + "dependencies": { + "datatables.net": "1.10.20", + "jquery": ">=1.7" + } + }, + "node_modules/debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/debuglog": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz", + "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/dezalgo": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz", + "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=", + "dev": true, + "dependencies": { + "asap": "^2.0.0", + "wrappy": "1" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/dom-serializer": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", + "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", + "dev": true, + "dependencies": { + "domelementtype": "^2.0.1", + "entities": "^2.0.0" + } + }, + "node_modules/dom-serializer/node_modules/domelementtype": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz", + "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==", + "dev": true + }, + "node_modules/dom-serializer/node_modules/entities": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz", + "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==", + "dev": true + }, + "node_modules/domelementtype": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", + "dev": true + }, + "node_modules/domhandler": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", + "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", + "dev": true, + "dependencies": { + "domelementtype": "1" + } + }, + "node_modules/domutils": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", + "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", + "dev": true, + "dependencies": { + "dom-serializer": "0", + "domelementtype": "1" + } + }, + "node_modules/ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "dev": true, + "optional": true, + "dependencies": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/entities": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", + "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", + "dev": true + }, + "node_modules/errno": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", + "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", + "dev": true, + "optional": true, + "dependencies": { + "prr": "~1.0.1" + }, + "bin": { + "errno": "cli.js" + } + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/eslint": { + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz", + "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "ajv": "^6.10.0", + "chalk": "^2.1.0", + "cross-spawn": "^6.0.5", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "eslint-scope": "^5.0.0", + "eslint-utils": "^1.4.3", + "eslint-visitor-keys": "^1.1.0", + "espree": "^6.1.2", + "esquery": "^1.0.1", + "esutils": "^2.0.2", + "file-entry-cache": "^5.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.0.0", + "globals": "^12.1.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "inquirer": "^7.0.0", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.14", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.3", + "progress": "^2.0.0", + "regexpp": "^2.0.1", + "semver": "^6.1.2", + "strip-ansi": "^5.2.0", + "strip-json-comments": "^3.0.1", + "table": "^5.2.3", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^8.10.0 || ^10.13.0 || >=11.10.1" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-plugin-html": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.0.0.tgz", + "integrity": "sha512-PQcGippOHS+HTbQCStmH5MY1BF2MaU8qW/+Mvo/8xTa/ioeMXdSP+IiaBw2+nh0KEMfYQKuTz1Zo+vHynjwhbg==", + "dev": true, + "dependencies": { + "htmlparser2": "^3.10.1" + } + }, + "node_modules/eslint-scope": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", + "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==", + "dev": true, + "dependencies": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/eslint-utils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", + "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", + "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint/node_modules/debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/espree": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz", + "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==", + "dev": true, + "dependencies": { + "acorn": "^7.1.0", + "acorn-jsx": "^5.1.0", + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/esquery": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.1.0.tgz", + "integrity": "sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==", + "dev": true, + "dependencies": { + "estraverse": "^4.0.0" + }, + "engines": { + "node": ">=0.6" + } + }, + "node_modules/esrecurse": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", + "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", + "dev": true, + "dependencies": { + "estraverse": "^4.1.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true, + "optional": true + }, + "node_modules/external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dev": true, + "dependencies": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "dev": true, + "engines": [ + "node >=0.6.0" + ], + "optional": true + }, + "node_modules/fast-deep-equal": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "node_modules/figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^1.0.5" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/file-entry-cache": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", + "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", + "dev": true, + "dependencies": { + "flat-cache": "^2.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/flat-cache": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", + "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", + "dev": true, + "dependencies": { + "flatted": "^2.0.0", + "rimraf": "2.6.3", + "write": "1.0.3" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/flatted": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", + "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==", + "dev": true + }, + "node_modules/forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "dev": true, + "optional": true, + "engines": { + "node": "*" + } + }, + "node_modules/form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dev": true, + "optional": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "node_modules/functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, + "node_modules/getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dev": true, + "optional": true, + "dependencies": { + "assert-plus": "^1.0.0" + } + }, + "node_modules/glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", + "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/globals": { + "version": "12.3.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz", + "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==", + "dev": true, + "dependencies": { + "type-fest": "^0.8.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "dev": true + }, + "node_modules/graceful-readlink": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", + "dev": true + }, + "node_modules/har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "dev": true, + "optional": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/har-validator": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", + "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", + "deprecated": "this library is no longer supported", + "dev": true, + "optional": true, + "dependencies": { + "ajv": "^6.5.5", + "har-schema": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/hosted-git-info": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz", + "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==", + "dev": true + }, + "node_modules/htmlparser2": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", + "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", + "dev": true, + "dependencies": { + "domelementtype": "^1.3.1", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^3.1.1" + } + }, + "node_modules/http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dev": true, + "optional": true, + "dependencies": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + }, + "engines": { + "node": ">=0.8", + "npm": ">=1.3.7" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/image-size": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", + "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", + "dev": true, + "optional": true, + "bin": { + "image-size": "bin/image-size.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/import-fresh": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", + "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/inquirer": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.4.tgz", + "integrity": "sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==", + "dev": true, + "dependencies": { + "ansi-escapes": "^4.2.1", + "chalk": "^2.4.2", + "cli-cursor": "^3.1.0", + "cli-width": "^2.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.15", + "mute-stream": "0.0.8", + "run-async": "^2.2.0", + "rxjs": "^6.5.3", + "string-width": "^4.1.0", + "strip-ansi": "^5.1.0", + "through": "^2.3.6" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-promise": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", + "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", + "dev": true + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "dev": true, + "optional": true + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, + "node_modules/isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "dev": true, + "optional": true + }, + "node_modules/jquery": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz", + "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==" + }, + "node_modules/jquery.caret": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/jquery.caret/-/jquery.caret-0.3.1.tgz", + "integrity": "sha1-nAkzGPrzJ+/zIugmyp8yQTaLx7g=" + }, + "node_modules/jquery.flot": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/jquery.flot/-/jquery.flot-0.8.3.tgz", + "integrity": "sha512-/tEE8J5NjwvStHDaCHkvTJpD7wDS4hE1OEL8xEmhgQfUe0gLUem923PIceNez1mz4yBNx6Hjv7pJcowLNd+nbg==" + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "node_modules/js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "dev": true, + "optional": true + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true + }, + "node_modules/json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "dev": true, + "optional": true + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "dev": true, + "optional": true + }, + "node_modules/jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "dev": true, + "engines": [ + "node >=0.6.0" + ], + "optional": true, + "dependencies": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "node_modules/less": { + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/less/-/less-3.10.3.tgz", + "integrity": "sha512-vz32vqfgmoxF1h3K4J+yKCtajH0PWmjkIFgbs5d78E/c/e+UQTnI+lWK+1eQRE95PXM2mC3rJlLSSP9VQHnaow==", + "dev": true, + "dependencies": { + "clone": "^2.1.2" + }, + "bin": { + "lessc": "bin/lessc" + }, + "engines": { + "node": ">=6" + }, + "optionalDependencies": { + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "mime": "^1.4.1", + "mkdirp": "^0.5.0", + "promise": "^7.1.1", + "request": "^2.83.0", + "source-map": "~0.6.0" + } + }, + "node_modules/less-plugin-clean-css": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/less-plugin-clean-css/-/less-plugin-clean-css-1.5.1.tgz", + "integrity": "sha1-zFeveqM5iVflbezr5jy2DCNClwM=", + "dev": true, + "dependencies": { + "clean-css": "^3.0.1" + }, + "engines": { + "node": ">=0.4.2" + } + }, + "node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/license-checker": { + "version": "25.0.1", + "resolved": "https://registry.npmjs.org/license-checker/-/license-checker-25.0.1.tgz", + "integrity": "sha512-mET5AIwl7MR2IAKYYoVBBpV0OnkKQ1xGj2IMMeEFIs42QAkEVjRtFZGWmQ28WeU7MP779iAgOaOy93Mn44mn6g==", + "dev": true, + "dependencies": { + "chalk": "^2.4.1", + "debug": "^3.1.0", + "mkdirp": "^0.5.1", + "nopt": "^4.0.1", + "read-installed": "~4.0.3", + "semver": "^5.5.0", + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0", + "spdx-satisfies": "^4.0.0", + "treeify": "^1.1.0" + }, + "bin": { + "license-checker": "bin/license-checker" + } + }, + "node_modules/lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "dev": true + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true, + "optional": true, + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.40.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", + "dev": true, + "optional": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.24", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "dev": true, + "optional": true, + "dependencies": { + "mime-db": "1.40.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "node_modules/mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)", + "dev": true, + "dependencies": { + "minimist": "0.0.8" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, + "node_modules/nice-try": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", + "dev": true + }, + "node_modules/nopt": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", + "dev": true, + "dependencies": { + "abbrev": "1", + "osenv": "^0.1.4" + }, + "bin": { + "nopt": "bin/nopt.js" + } + }, + "node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "dev": true, + "optional": true, + "engines": { + "node": "*" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "dev": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "dev": true, + "dependencies": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true + }, + "node_modules/performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "dev": true, + "optional": true + }, + "node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "dev": true, + "optional": true, + "dependencies": { + "asap": "~2.0.3" + } + }, + "node_modules/prr": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", + "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", + "dev": true, + "optional": true + }, + "node_modules/psl": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz", + "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==", + "dev": true, + "optional": true + }, + "node_modules/punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.6" + } + }, + "node_modules/read-installed": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz", + "integrity": "sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=", + "dev": true, + "dependencies": { + "debuglog": "^1.0.1", + "read-package-json": "^2.0.0", + "readdir-scoped-modules": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "slide": "~1.1.3", + "util-extend": "^1.0.1" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.2" + } + }, + "node_modules/read-package-json": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.0.tgz", + "integrity": "sha512-KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A==", + "dev": true, + "dependencies": { + "glob": "^7.1.1", + "json-parse-better-errors": "^1.0.1", + "normalize-package-data": "^2.0.0", + "slash": "^1.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.2" + } + }, + "node_modules/readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/readdir-scoped-modules": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz", + "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==", + "dev": true, + "dependencies": { + "debuglog": "^1.0.1", + "dezalgo": "^1.0.0", + "graceful-fs": "^4.1.2", + "once": "^1.3.0" + } + }, + "node_modules/regexpp": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", + "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", + "dev": true, + "engines": { + "node": ">=6.5.0" + } + }, + "node_modules/request": { + "version": "2.88.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", + "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", + "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", + "dev": true, + "optional": true, + "dependencies": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.0", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.4.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "engines": { + "node": ">= 4" + } + }, + "node_modules/resolve": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", + "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", + "dev": true, + "dependencies": { + "path-parse": "^1.0.6" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/run-async": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", + "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", + "dev": true, + "dependencies": { + "is-promise": "^2.1.0" + }, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/rxjs": { + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", + "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", + "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==", + "dev": true + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, + "node_modules/select2": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/select2/-/select2-3.5.1.tgz", + "integrity": "sha1-8oGUibvGX9bTKL5yu+K5XdfofP4=" + }, + "node_modules/select2-bootstrap-css": { + "version": "1.4.6", + "resolved": "https://registry.npmjs.org/select2-bootstrap-css/-/select2-bootstrap-css-1.4.6.tgz", + "integrity": "sha1-XPtoJG9SmcoYWOAe/XiIBMc0mX4=" + }, + "node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, + "dependencies": { + "shebang-regex": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "dev": true + }, + "node_modules/slash": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/slice-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", + "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.0", + "astral-regex": "^1.0.0", + "is-fullwidth-code-point": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/slide": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", + "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/spdx-compare": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/spdx-compare/-/spdx-compare-1.0.0.tgz", + "integrity": "sha512-C1mDZOX0hnu0ep9dfmuoi03+eOdDoz2yvK79RxbcrVEG1NO1Ph35yW102DHWKN4pk80nwCgeMmSY5L25VE4D9A==", + "dev": true, + "dependencies": { + "array-find-index": "^1.0.2", + "spdx-expression-parse": "^3.0.0", + "spdx-ranges": "^2.0.0" + } + }, + "node_modules/spdx-correct": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", + "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", + "dev": true, + "dependencies": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-exceptions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", + "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==", + "dev": true + }, + "node_modules/spdx-expression-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "dev": true, + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", + "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==", + "dev": true + }, + "node_modules/spdx-ranges": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/spdx-ranges/-/spdx-ranges-2.1.1.tgz", + "integrity": "sha512-mcdpQFV7UDAgLpXEE/jOMqvK4LBoO0uTQg0uvXUewmEFhpiZx5yJSZITHB8w1ZahKdhfZqP5GPEOKLyEq5p8XA==", + "dev": true + }, + "node_modules/spdx-satisfies": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/spdx-satisfies/-/spdx-satisfies-4.0.1.tgz", + "integrity": "sha512-WVzZ/cXAzoNmjCWiEluEA3BjHp5tiUmmhn9MK+X0tBbR9sOqtC6UQwmgCNrAIZvNlMuBUYAaHYfb2oqlF9SwKA==", + "dev": true, + "dependencies": { + "spdx-compare": "^1.0.0", + "spdx-expression-parse": "^3.0.0", + "spdx-ranges": "^2.0.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "node_modules/sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "dev": true, + "optional": true, + "dependencies": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + }, + "bin": { + "sshpk-conv": "bin/sshpk-conv", + "sshpk-sign": "bin/sshpk-sign", + "sshpk-verify": "bin/sshpk-verify" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width/node_modules/strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-ansi/node_modules/ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-json-comments": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", + "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/table": { + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", + "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", + "dev": true, + "dependencies": { + "ajv": "^6.10.2", + "lodash": "^4.17.14", + "slice-ansi": "^2.1.0", + "string-width": "^3.0.0" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/table/node_modules/emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "node_modules/table/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/table/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "dev": true + }, + "node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/tough-cookie": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", + "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "dev": true, + "optional": true, + "dependencies": { + "psl": "^1.1.24", + "punycode": "^1.4.1" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/tough-cookie/node_modules/punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true, + "optional": true + }, + "node_modules/treeify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.1.0.tgz", + "integrity": "sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==", + "dev": true, + "engines": { + "node": ">=0.6" + } + }, + "node_modules/tslib": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.0.tgz", + "integrity": "sha512-BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg==", + "dev": true + }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, + "optional": true, + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "dev": true, + "optional": true + }, + "node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/uri-js": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true + }, + "node_modules/util-extend": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz", + "integrity": "sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=", + "dev": true + }, + "node_modules/uuid": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz", + "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==", + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "dev": true, + "optional": true, + "bin": { + "uuid": "bin/uuid" + } + }, + "node_modules/v8-compile-cache": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz", + "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==", + "dev": true + }, + "node_modules/validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dev": true, + "dependencies": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "node_modules/verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "dev": true, + "engines": [ + "node >=0.6.0" + ], + "optional": true, + "dependencies": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, + "node_modules/write": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", + "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", + "dev": true, + "dependencies": { + "mkdirp": "^0.5.1" + }, + "engines": { + "node": ">=4" + } + } + }, "dependencies": { "@babel/code-frame": { "version": "7.8.3", @@ -39,7 +2399,8 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz", "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==", - "dev": true + "dev": true, + "requires": {} }, "ajv": { "version": "6.10.2", @@ -137,7 +2498,8 @@ "at.js": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/at.js/-/at.js-1.5.4.tgz", - "integrity": "sha512-G8mgUb/PqShPoH8AyjuxsTGvIr1o716BtQUKDM44C8qN2W615y7KGJ68MlTGamd0J0D/m28emUkzagaHTdrGZw==" + "integrity": "sha512-G8mgUb/PqShPoH8AyjuxsTGvIr1o716BtQUKDM44C8qN2W615y7KGJ68MlTGamd0J0D/m28emUkzagaHTdrGZw==", + "requires": {} }, "aws-sign2": { "version": "0.7.0", @@ -1663,6 +4025,15 @@ "tweetnacl": "~0.14.0" } }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "requires": { + "safe-buffer": "~5.2.0" + } + }, "string-width": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", @@ -1685,15 +4056,6 @@ } } }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "requires": { - "safe-buffer": "~5.2.0" - } - }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
--- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\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/" @@ -47,10 +47,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Нічога" @@ -273,7 +273,7 @@ msgstr "Групы" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -641,9 +641,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Чытанне" @@ -651,9 +651,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Запіс" @@ -666,8 +666,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -675,8 +675,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -732,57 +732,57 @@ msgid "Error occurred during update of permissions" msgstr "Адбылася памылка падчас абнаўлення прывілеяў" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Адбылася памылка пры стварэнні групы рэпазітароў %s" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "Створаная новая група рэпазітароў %s" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "Група рэпазітароў %s абноўленая" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Група ўтрымлівае %s рэпазітароў і не можа быць выдаленая" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Група ўтрымлівае ў сабе %s падгруп і не можа быць выдаленая" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Група рэпазітароў %s выдаленая" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Памылка пры выдаленні групы рэпазітароў %s" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "Адміністратар не можа адклікаць свае прывелеі" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Прывілеі групы рэпазітароў абноўленыя" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1304,7 +1304,7 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1312,7 +1312,7 @@ msgstr[1] "%d гады" msgstr[2] "%d гадоў" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1320,7 +1320,7 @@ msgstr[1] "%d месяцы" msgstr[2] "%d месяцаў" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1328,7 +1328,7 @@ msgstr[1] "%d дні" msgstr[2] "%d дзён" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1336,7 +1336,7 @@ msgstr[1] "%d гадзіны" msgstr[2] "%d гадзін" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1344,7 +1344,7 @@ msgstr[1] "%d хвіліны" msgstr[2] "%d хвілін" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1352,27 +1352,27 @@ msgstr[1] "%d секунды" msgstr[2] "%d секунд" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "у %s" -#: kallithea/lib/webutils.py:646 +#: kallithea/lib/webutils.py:651 #, python-format msgid "%s ago" msgstr "%s назад" -#: kallithea/lib/webutils.py:648 +#: kallithea/lib/webutils.py:653 #, python-format msgid "in %s and %s" msgstr "у %s і %s" -#: kallithea/lib/webutils.py:651 +#: kallithea/lib/webutils.py:656 #, python-format msgid "%s and %s ago" msgstr "%s і %s назад" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "цяпер" @@ -1890,10 +1890,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1925,8 +1925,9 @@ msgstr "Стан" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2182,13 +2183,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2203,21 +2204,21 @@ msgstr "Значэнні па змоўчанні" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "Тып" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Прыватны рэпазітар" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2225,22 +2226,26 @@ msgstr "Прыватныя рэпазітары бачныя толькі іх удзельнікам." #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "Уключыць статыстыку" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "Уключыць акно статыстыкі на старонцы «Агульныя звесткі»." #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "Уключыць спампоўку" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "Уключыць меню спампоўкі на старонцы «Агульныя звесткі»." @@ -2365,15 +2370,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2553,7 +2558,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2651,7 +2656,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2759,8 +2764,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2860,7 +2865,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2875,17 +2880,17 @@ msgstr "Імя групы" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "Бацькоўская група" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2958,78 +2963,84 @@ msgid "Delete this repository group" msgstr "Выдаліць гэту групу рэпазітароў" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 msgid "Not visible" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #, fuzzy #| msgid "disabled" msgid "Visible" msgstr "адключана" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #, fuzzy #| msgid "Add Repository" msgid "Add repos" msgstr "Дадаць рэпазітар" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 #, fuzzy #| msgid "Add user group" msgid "Add/Edit groups" msgstr "Дадаць групу карыстальнікаў" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "Карыстальнік/група карыстальнікаў" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "Па змоўчанні" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "Адклікаць" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "Дадаць новы" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 #, fuzzy msgid "Apply to children" msgstr "дастасаваць да даччыным" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 msgid "Both" msgstr "Абедзьве" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "Выдаліць гэту групу" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "Пацвердзіце выдаленне гэтай групы карыстальнікаў" @@ -3047,19 +3058,28 @@ msgid "Number of Top-level Repositories" msgstr "Лік рэпазітароў верхняга ўзроўня" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "Тып стваранага рэпазітара." + +#: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy msgid "Clone remote repository" msgstr "[створаны] рэпазітар" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "URL рэпазітара" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." @@ -3067,23 +3087,20 @@ "Кароткае і асэнсаванае. Для разгорнутага апісання выкарыстоўвайце файл " "README." -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "Апцыянальна абраць групу, у якую змясціць дадзены рэпазітар." -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "Тып стваранага рэпазітара." - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Рэвізія для выгрузкі" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3269,37 +3286,23 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "Аддалены рэпазітар" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "URL рэпазітара" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" -"Рэвізія па змоўчанні, з якой будзе рабіцца выгрузка файлаў пры спампоўцы" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr "Змяніць уладальніка рэпазітара." @@ -5611,6 +5614,11 @@ msgid "Download %s as %s" msgstr "Спампаваць %s як %s" +#~ msgid "Default revision for files page, downloads, whoosh and readme" +#~ msgstr "" +#~ "Рэвізія па змоўчанні, з якой будзе рабіцца выгрузка файлаў пры " +#~ "спампоўцы" + #~ msgid "" #~ "Unable to activate hgsubversion support. The \"hgsubversion\" library " #~ "is missing"
--- a/kallithea/i18n/bg/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/bg/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -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: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -44,10 +44,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "" @@ -261,7 +261,7 @@ msgstr "" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -612,9 +612,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "" @@ -622,9 +622,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "" @@ -637,8 +637,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -646,8 +646,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -703,57 +703,57 @@ msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1265,69 +1265,69 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/webutils.py:646 -#, python-format -msgid "%s ago" -msgstr "" - -#: kallithea/lib/webutils.py:648 -#, python-format -msgid "in %s and %s" -msgstr "" - #: kallithea/lib/webutils.py:651 #, python-format +msgid "%s ago" +msgstr "" + +#: kallithea/lib/webutils.py:653 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: kallithea/lib/webutils.py:656 +#, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "" @@ -1800,10 +1800,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1835,8 +1835,9 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2086,13 +2087,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2107,21 +2108,21 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2129,22 +2130,26 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "" @@ -2269,15 +2274,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2454,7 +2459,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2551,7 +2556,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2647,8 +2652,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2740,7 +2745,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2755,17 +2760,17 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2837,71 +2842,77 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +msgid "Not visible" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -msgid "Not visible" +msgid "Visible" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" +msgid "Add repos" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -msgid "Add repos" +msgid "Add/Edit groups" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -msgid "Add/Edit groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "" @@ -2918,40 +2929,46 @@ msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3130,36 +3147,23 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr ""
--- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\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/" @@ -44,10 +44,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "" @@ -266,7 +266,7 @@ msgstr "Skupiny" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -618,9 +618,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "" @@ -628,9 +628,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "" @@ -643,8 +643,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -652,8 +652,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -709,57 +709,57 @@ msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1276,7 +1276,7 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1284,7 +1284,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1292,7 +1292,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1300,7 +1300,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1308,7 +1308,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1316,7 +1316,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1324,27 +1324,27 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/webutils.py:646 -#, python-format -msgid "%s ago" -msgstr "" - -#: kallithea/lib/webutils.py:648 -#, python-format -msgid "in %s and %s" -msgstr "" - #: kallithea/lib/webutils.py:651 #, python-format +msgid "%s ago" +msgstr "" + +#: kallithea/lib/webutils.py:653 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: kallithea/lib/webutils.py:656 +#, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "" @@ -1821,10 +1821,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1856,8 +1856,9 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2108,13 +2109,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2130,21 +2131,21 @@ msgstr "Repozitáře" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2152,22 +2153,26 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "" @@ -2292,15 +2297,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2479,7 +2484,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2577,7 +2582,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2675,8 +2680,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2768,7 +2773,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2783,17 +2788,17 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2866,73 +2871,79 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +msgid "Not visible" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -msgid "Not visible" +msgid "Visible" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 #, fuzzy #| msgid "No response" msgid "Add repos" msgstr "Neznámá revize %s" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 msgid "Add/Edit groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "" @@ -2950,41 +2961,48 @@ msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy msgid "Clone remote repository" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#, fuzzy +msgid "Repository URL" +msgstr "Repozitáře" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3172,10 +3190,10 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 @@ -3183,27 +3201,13 @@ msgid "Remote repository" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -#, fuzzy -msgid "Repository URL" -msgstr "Repozitáře" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr ""
--- a/kallithea/i18n/da/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/da/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -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: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\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/" @@ -43,10 +43,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Ingen" @@ -271,7 +271,7 @@ msgstr "Grupper" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -637,9 +637,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Læs" @@ -647,9 +647,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Skriv" @@ -662,8 +662,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -671,8 +671,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -728,57 +728,57 @@ msgid "Error occurred during update of permissions" msgstr "Der opstod en fejl under opdatering af tilladelser" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Der opstod en fejl under oprettelse af repository-gruppen %s" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "Oprettet repository-gruppen %s" -#: kallithea/controllers/admin/repo_groups.py:224 +#: 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:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, 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:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, 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:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Fjernet repository-gruppen %s" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, 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:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "Kan ikke tilbagekalde tilladelse for én selv som admin" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Repository-gruppe tilladelser opdateret" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1301,69 +1301,69 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "i %s" -#: kallithea/lib/webutils.py:646 +#: kallithea/lib/webutils.py:651 #, python-format msgid "%s ago" msgstr "%s siden" -#: kallithea/lib/webutils.py:648 +#: kallithea/lib/webutils.py:653 #, python-format msgid "in %s and %s" msgstr "i %s og %s" -#: kallithea/lib/webutils.py:651 +#: kallithea/lib/webutils.py:656 #, python-format msgid "%s and %s ago" msgstr "%s og %s siden" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "lige nu" @@ -1846,10 +1846,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1881,8 +1881,9 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2132,13 +2133,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2153,21 +2154,21 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2175,22 +2176,26 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "" @@ -2315,15 +2320,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2500,7 +2505,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2597,7 +2602,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2693,8 +2698,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2786,7 +2791,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2801,17 +2806,17 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2883,71 +2888,77 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +msgid "Not visible" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -msgid "Not visible" +msgid "Visible" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" +msgid "Add repos" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -msgid "Add repos" +msgid "Add/Edit groups" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -msgid "Add/Edit groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "" @@ -2964,40 +2975,46 @@ msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3176,36 +3193,23 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr ""
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\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/" @@ -47,10 +47,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Keine" @@ -283,7 +283,7 @@ msgstr "Gruppen" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -655,9 +655,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Lesen" @@ -665,9 +665,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Schreiben" @@ -680,8 +680,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -689,8 +689,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -746,57 +746,57 @@ msgid "Error occurred during update of permissions" msgstr "Fehler bei der Änderung der globalen Berechtigungen" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Fehler bei der Erstellung der Repositoriumsgruppe %s" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "Repositoriumsgruppe %s erstellt" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "Repositoriumsgruppe %s aktualisiert" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, 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:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, 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:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Repositoriumsgruppe %s entfernt" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, 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:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "Als Administrator kann man sich keine Berechtigungen entziehen" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Berechtigungen der Repositoriumsgruppe aktualisiert" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1337,69 +1337,69 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d Jahr" msgstr[1] "%d Jahre" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d Monat" msgstr[1] "%d Monate" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d Tag" msgstr[1] "%d Tage" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d Sekunde" msgstr[1] "%d Sekunden" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "in %s" -#: kallithea/lib/webutils.py:646 +#: kallithea/lib/webutils.py:651 #, python-format msgid "%s ago" msgstr "vor %s" -#: kallithea/lib/webutils.py:648 +#: kallithea/lib/webutils.py:653 #, python-format msgid "in %s and %s" msgstr "in %s und %s" -#: kallithea/lib/webutils.py:651 +#: kallithea/lib/webutils.py:656 #, python-format msgid "%s and %s ago" msgstr "%s und %s her" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "jetzt gerade" @@ -1933,10 +1933,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1968,8 +1968,9 @@ msgstr "Tipp" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2232,13 +2233,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2253,21 +2254,21 @@ msgstr "Repositorystandards" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "Typ" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Privates Repository" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2277,22 +2278,26 @@ "sichtbar." #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "Aktiviere Statistiken" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "Statistik-Fenster in der Zusammenfassungsseite aktivieren." #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "Aktiviere Downloads" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "Download-Menü auf der Zusammenfassungsseite aktivieren." @@ -2422,15 +2427,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2609,7 +2614,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2720,7 +2725,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2830,8 +2835,8 @@ msgstr "Berechtigungen für neue Repositories des Vorgabe-Benutzers." #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2936,7 +2941,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2951,17 +2956,17 @@ msgstr "Gruppen name" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "Übergeordnete Gruppe" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "Rechte der übergeordneten Gruppe kopieren" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "Rechte der übergeordneten Repositorygruppe kopieren." @@ -3033,64 +3038,64 @@ msgid "Delete this repository group" msgstr "Diese Repositorygruppe löschen" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 msgid "Not visible" msgstr "Nicht sichtbar" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Visible" +msgstr "Sichtbar" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" -msgstr "Sichtbar" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 #, fuzzy #| msgid "Add Repository" msgid "Add repos" msgstr "Repository hinzufügen" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 msgid "Add/Edit groups" msgstr "Benutzergruppen hinzufügen oder ändern" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #, fuzzy msgid "User/User Group" msgstr "Benutzer/Benutzergruppe" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "Vorgabe" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "Zurückziehen" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "Neues hinzufügen" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "Auf untergeordnete Elemente anwenden" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "Beide" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "Beide" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." @@ -3099,11 +3104,17 @@ "untergeordneten Elemente, einschließlich nicht-privater Repositories und " "anderer Gruppen, falls ausgewählt." -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "Typname des Benutzers" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "Diese Gruppe löschen" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "Löschen der Gruppe bestätigen" @@ -3120,11 +3131,20 @@ msgid "Number of Top-level Repositories" msgstr "Anzahl der Repositories oberster Ebene" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "Repository Typ der erstellt werden soll." + +#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "Entferntes Repository clonen" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "Repository URL" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." @@ -3132,8 +3152,8 @@ "Optional: URL eines entfernten Repositories. Falls gesetzt, dann wird das " "Repository als Clon von dieser URL erstellt." -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." @@ -3141,25 +3161,22 @@ "Halten Sie es kurz und prägnant. Benutzen Sie eine README-Datei für " "längere Beschreibungen." -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" "Wähle bei Bedarf eine Gruppe, der dieses Repository zugeordnet werden " "soll." -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "Repository Typ der erstellt werden soll." - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Start Revision" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3353,27 +3370,17 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." -msgstr "" -"Falls dieses Repository umbenannt oder in eine andere Gruppe verschoben " -"wird, ändert sich seine URL.\n" -"Die Verwendung der permanenten URL garantiert, dass dieses Repository " -"immer über diese URL erreichbar sein wird.\n" -"Dies ist insbesondere für CI-Systeme oder in Fällen nützlich, in denen " -"die URL des Repositories bei Dritten dauerhaft eingetragen wird." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." +msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "Entferntes Repository" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "Repository URL" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." @@ -3381,16 +3388,7 @@ "Optional: URL eines entfernten Repositories. Falls gesetzt, dann kann das " "Repository von dieser URL bezogen werden." -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "Standardrevision für Dateiseite, Downloads, Whoosh und Readme" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "Typname des Benutzers" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr "Besitzer des Repositorys ändern." @@ -5765,6 +5763,25 @@ msgid "Download %s as %s" msgstr "%s als %s herunterladen" +#~ msgid "" +#~ "In case this repository is renamed or moved into another group the " +#~ "repository URL changes.\n" +#~ " Using the above permanent URL " +#~ "guarantees that this repository always will be accessible on that " +#~ "URL.\n" +#~ " This is useful for CI systems, or any " +#~ "other cases that you need to hardcode the URL into a 3rd party service." +#~ msgstr "" +#~ "Falls dieses Repository umbenannt oder in eine andere Gruppe " +#~ "verschoben wird, ändert sich seine URL.\n" +#~ "Die Verwendung der permanenten URL garantiert, dass dieses Repository " +#~ "immer über diese URL erreichbar sein wird.\n" +#~ "Dies ist insbesondere für CI-Systeme oder in Fällen nützlich, in denen " +#~ "die URL des Repositories bei Dritten dauerhaft eingetragen wird." + +#~ msgid "Default revision for files page, downloads, whoosh and readme" +#~ msgstr "Standardrevision für Dateiseite, Downloads, Whoosh und Readme" + #, python-format #~ msgid "Readme file from revision %s:%s" #~ msgstr "Liesmich-Datei von Revision %s:%s"
--- a/kallithea/i18n/el/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/el/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\n" "PO-Revision-Date: 2022-07-21 21:22+0000\n" "Last-Translator: Asterios Dimitriou <steve@pci.gr>\n" "Language-Team: Greek <https://hosted.weblate.org/projects/kallithea/" @@ -45,10 +45,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Χωρίς" @@ -274,7 +274,7 @@ msgstr "Ομάδες" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -635,9 +635,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Ανάγνωση" @@ -645,9 +645,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Εγγραφή" @@ -660,8 +660,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -669,8 +669,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -726,57 +726,57 @@ msgid "Error occurred during update of permissions" msgstr "Παρουσιάστηκε σφάλμα κατά την ενημέρωση δικαιωμάτων" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Συνέβηκε κάποιο λάθος κατά την δημιουργία της ομάδας αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "Δημιουργήθηκε η ομάδα αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "Ενημερώθηκε η ομάδα αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Αυτή η ομάδα περιέχει %s αποθετήρια και δε μπορεί να διαγραφεί" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Αυτή η ομάδα περιέχει %s υποομάδες και δε μπορεί να διαγραφεί" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Αφαιρέθηκε η ομάδα αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Παρουσιάστηκε σφάλμα κατά τη διαγραφή της ομάδας αποθετηρίων %s" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "Δεν μπορείτε να ανακαλέσετε την άδεια σας ως διαχειριστής" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Τα δικαιώματα της ομάδας αποθετηρίου ενημερώθηκαν" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1310,69 +1310,69 @@ msgstr "" "Άκυρο κλειδί SSH - είναι ένα κλειδί %s αλλά το base64 μέρος περιέχει %r" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d έτος" msgstr[1] "%d έτη" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d μήνας" msgstr[1] "%d μήνες" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d ημέρα" msgstr[1] "%d ημέρες" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d ώρα" msgstr[1] "%d ώρες" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d λεπτό" msgstr[1] "%d λεπτά" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d δευτερόλεπτο" msgstr[1] "%d δευτερόλεπτα" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "σε %s" -#: kallithea/lib/webutils.py:646 +#: kallithea/lib/webutils.py:651 #, python-format msgid "%s ago" msgstr "%s πριν" -#: kallithea/lib/webutils.py:648 +#: kallithea/lib/webutils.py:653 #, python-format msgid "in %s and %s" msgstr "σε %s και %s" -#: kallithea/lib/webutils.py:651 +#: kallithea/lib/webutils.py:656 #, python-format msgid "%s and %s ago" msgstr "%s και %s πριν" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "μόλις τώρα" @@ -1897,10 +1897,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1932,8 +1932,9 @@ msgstr "Κεφαλή" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2199,13 +2200,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2220,21 +2221,21 @@ msgstr "Προεπιλογές Αποθετηρίου" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "Τύπος" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Ιδιωτικό αποθετήριο" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2244,22 +2245,26 @@ "συνεργάτες." #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "Ενεργοποίηση στατιστικών" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "Ενεργοποίηση παραθύρου στατιστικών στοιχείων στη σελίδα περίληψης." #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "Ενεργοποίηση λήψεων" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "Ενεργοποίηση μενού λήψης στη σελίδα περίληψης." @@ -2387,15 +2392,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2572,7 +2577,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2684,7 +2689,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2785,8 +2790,8 @@ msgstr "Δικαιώματα για τον προεπιλεγμένο χρήστη σε νέα αποθετήρια." #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2890,7 +2895,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2905,17 +2910,17 @@ msgstr "Όνομα ομάδας" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "Γονική ομάδα" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "Αντιγραφή δικαιωμάτων γονικής ομάδας" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "Αντιγραφή συνόλου δικαιωμάτων από γονική ομάδα αποθετηρίου." @@ -2989,61 +2994,61 @@ msgid "Delete this repository group" msgstr "Διαγραφή αυτής της ομάδας αποθετηρίων" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 msgid "Not visible" msgstr "Μη ορατό" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Visible" +msgstr "Ορατό" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" -msgstr "Ορατό" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 msgid "Add repos" msgstr "Προσθήκη αποθετηρίων" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 msgid "Add/Edit groups" msgstr "Προσθήκη/Επεξεργασία ομάδων" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "Χρήστης / Ομάδα χρηστών" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "Προεπιλογή" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "Ανακάλεσε" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "Προσθήκη νέου" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "Εφαρμογή στα θυγατρικά" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "Και τα δυο" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "Και τα δυο" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." @@ -3052,11 +3057,17 @@ "συμπεριλαμβανομένων των μη ιδιωτικών αποθετηρίων και άλλων ομάδων, εάν " "επιλεγεί." -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "Πληκτρολογήστε το όνομα του χρήστη" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "Κατάργηση αυτής της ομάδας" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "Επιβεβαιώστε για να διαγράψετε αυτή την ομάδα" @@ -3073,11 +3084,20 @@ msgid "Number of Top-level Repositories" msgstr "Αριθμός αποθετηρίων ανώτατου επιπέδου" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "Τύπος αποθετηρίου προς δημιουργία." + +#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "Κλωνοποίηση απομακρυσμένου αποθετηρίου" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "URL Αποθετηρίου" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." @@ -3085,8 +3105,8 @@ "Προαιρετικό: Διεύθυνση URL ενός απομακρυσμένου αποθετηρίου. Εάν οριστεί, " "το αποθετήριο θα δημιουργηθεί ως κλώνος από αυτήν τη διεύθυνση URL." -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." @@ -3094,24 +3114,21 @@ "Κρατήστε τη σύντομη και περιεκτική. Χρησιμοποιήστε ένα αρχείο README για " "μεγαλύτερες περιγραφές." -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" "Προαιρετικά, επιλέξτε μια ομάδα για να τοποθετήσετε αυτό το αποθετήριο." -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "Τύπος αποθετηρίου προς δημιουργία." - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Αναθεώρηση εκφόρτωσης" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3307,29 +3324,17 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" -"Η διεύθυνση URL του αποθετηρίου αλλάζει όταν αυτό μετονομαστεί ή " -"μετακινηθεί σε άλλη ομάδα.\n" -" Η χρήση της παραπάνω μόνιμης διεύθυνσης " -"URL εγγυάται ότι αυτό το αποθετήριο θα είναι πάντα προσβάσιμο σε αυτήν τη " -"διεύθυνση URL.\n" -" Αυτό είναι χρήσιμο για συστήματα CI ή για " -"άλλες περιπτώσεις που χρειάζεστε να κωδικοποιήσετε τη διεύθυνση URL σε " -"κάποια υπηρεσία τρίτου μέρους." #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "Απομακρυσμένο αποθετήριο" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "URL Αποθετηρίου" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." @@ -3337,17 +3342,7 @@ "Προαιρετικό: Διεύθυνση URL ενός απομακρυσμένου αποθετηρίου. Εάν οριστεί, " "το αποθετήριο μπορεί να τραβηχτεί από αυτήν τη διεύθυνση URL." -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" -"Προεπιλεγμένη αναθεώρηση για τη σελίδα αρχείων, λήψεων, Whoosh και readme" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "Πληκτρολογήστε το όνομα του χρήστη" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr "Αλλάξτε τον κάτοχο αυτού του αποθετηρίου." @@ -5669,6 +5664,29 @@ msgid "Download %s as %s" msgstr "Λήψη %s ως %s" +#~ msgid "" +#~ "In case this repository is renamed or moved into another group the " +#~ "repository URL changes.\n" +#~ " Using the above permanent URL " +#~ "guarantees that this repository always will be accessible on that " +#~ "URL.\n" +#~ " This is useful for CI systems, or any " +#~ "other cases that you need to hardcode the URL into a 3rd party service." +#~ msgstr "" +#~ "Η διεύθυνση URL του αποθετηρίου αλλάζει όταν αυτό μετονομαστεί ή " +#~ "μετακινηθεί σε άλλη ομάδα.\n" +#~ " Η χρήση της παραπάνω μόνιμης διεύθυνσης " +#~ "URL εγγυάται ότι αυτό το αποθετήριο θα είναι πάντα προσβάσιμο σε αυτήν " +#~ "τη διεύθυνση URL.\n" +#~ " Αυτό είναι χρήσιμο για συστήματα CI ή " +#~ "για άλλες περιπτώσεις που χρειάζεστε να κωδικοποιήσετε τη διεύθυνση " +#~ "URL σε κάποια υπηρεσία τρίτου μέρους." + +#~ msgid "Default revision for files page, downloads, whoosh and readme" +#~ msgstr "" +#~ "Προεπιλεγμένη αναθεώρηση για τη σελίδα αρχείων, λήψεων, Whoosh και " +#~ "readme" + #, python-format #~ msgid "Readme file from revision %s:%s" #~ msgstr "Αρχείο Readme από την αναθεώρηση %s:%s"
--- a/kallithea/i18n/es/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/es/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\n" "PO-Revision-Date: 2022-08-11 22:21+0000\n" "Last-Translator: Jaime Marquínez Ferrándiz <weblate@jregistros.fastmail." "net>\n" @@ -44,10 +44,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Ninguno" @@ -270,7 +270,7 @@ msgstr "Grupos" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -634,9 +634,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "" @@ -644,9 +644,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "" @@ -659,8 +659,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -668,8 +668,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -725,57 +725,57 @@ msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1294,69 +1294,69 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/webutils.py:646 -#, python-format -msgid "%s ago" -msgstr "" - -#: kallithea/lib/webutils.py:648 -#, python-format -msgid "in %s and %s" -msgstr "" - #: kallithea/lib/webutils.py:651 #, python-format +msgid "%s ago" +msgstr "" + +#: kallithea/lib/webutils.py:653 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: kallithea/lib/webutils.py:656 +#, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "" @@ -1840,10 +1840,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1875,8 +1875,9 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2126,13 +2127,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2147,21 +2148,21 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2169,22 +2170,26 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "" @@ -2309,15 +2314,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2494,7 +2499,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2591,7 +2596,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2687,8 +2692,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2780,7 +2785,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2795,17 +2800,17 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2877,73 +2882,79 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +msgid "Not visible" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -msgid "Not visible" +msgid "Visible" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 #, fuzzy #| msgid "No response" msgid "Add repos" msgstr "No hay respuesta" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 msgid "Add/Edit groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "" @@ -2960,40 +2971,46 @@ msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3174,36 +3191,23 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr ""
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\n" "PO-Revision-Date: 2021-05-15 17:32+0000\n" "Last-Translator: Étienne Gilli <etienne@gilli.io>\n" "Language-Team: French <https://hosted.weblate.org/projects/kallithea/" @@ -45,10 +45,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Aucun" @@ -272,7 +272,7 @@ msgstr "Groupes" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -639,9 +639,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Lire" @@ -649,9 +649,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Écrire" @@ -664,8 +664,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -673,8 +673,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -730,59 +730,59 @@ msgid "Error occurred during update of permissions" msgstr "Une erreur est survenue durant la mise à jour des permissions" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Une erreur est survenue durant la création du groupe de dépôts %s" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "Groupe de dépôts %s créé" -#: kallithea/controllers/admin/repo_groups.py:224 +#: 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:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, 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:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, 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:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Groupe de dépôts %s supprimé" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, 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:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "Impossible de révoquer votre permission d'administrateur" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Permissions du groupe de dépôts mises à jour" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1322,69 +1322,69 @@ msgstr "" "Clé SSH invalide – c'est une clé %s mais la partie base64 contient %r" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d an" msgstr[1] "%d ans" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mois" msgstr[1] "%d mois" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d secondes" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "dans %s" -#: kallithea/lib/webutils.py:646 +#: kallithea/lib/webutils.py:651 #, python-format msgid "%s ago" msgstr "Il y a %s" -#: kallithea/lib/webutils.py:648 +#: kallithea/lib/webutils.py:653 #, python-format msgid "in %s and %s" msgstr "dans %s et %s" -#: kallithea/lib/webutils.py:651 +#: kallithea/lib/webutils.py:656 #, python-format msgid "%s and %s ago" msgstr "Il y a %s et %s" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "à l’instant" @@ -1916,10 +1916,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1951,8 +1951,9 @@ msgstr "Sommet" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2213,13 +2214,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2234,21 +2235,21 @@ msgstr "Réglages par défaut du dépôt" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "Type" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Dépôt privé" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2258,22 +2259,26 @@ "comme collaborateurs." #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "Activer les statistiques" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "Afficher les statistiques sur la page du dépôt." #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "Activer les téléchargements" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "Afficher le menu de téléchargements sur la page du dépôt." @@ -2400,15 +2405,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2585,7 +2590,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2694,7 +2699,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2795,8 +2800,8 @@ msgstr "Permissions pour l'utilisateur par défaut sur les nouveaux dépôts." #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2904,7 +2909,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2919,17 +2924,17 @@ msgstr "Nom de groupe" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "Parent du groupe" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "Copier les permissions du groupe parent" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "Copier les permissions à partir du groupe de dépôts parent." @@ -3001,61 +3006,61 @@ msgid "Delete this repository group" msgstr "Supprimer ce groupe de dépôts" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 msgid "Not visible" msgstr "Non visible" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Visible" +msgstr "Visible" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" -msgstr "Visible" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 msgid "Add repos" msgstr "Ajouter un dépôt" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 msgid "Add/Edit groups" msgstr "Ajouter/Modifier les groupes d'utilisateurs" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "Utilisateur/groupe d'utilisateurs" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "Par défaut" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "Révoquer" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "Ajouter un nouveau" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "Appliquer aux enfants" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "Les deux" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "Les deux" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." @@ -3063,11 +3068,17 @@ "Ajouter ou révoquer la permission pour tous les enfants de ce groupe, y " "compris les dépôts non-privés et les autres groupes si sélectionné." -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "Saisir le nom de l'utilisateur" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "Supprimer ce groupe" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "Confirmer la suppression de ce groupe" @@ -3084,11 +3095,20 @@ msgid "Number of Top-level Repositories" msgstr "Nombre de dépôts de niveau supérieur" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "Type de dépôt à créer." + +#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "Cloner le dépôt distant" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "URL du dépôt" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." @@ -3096,8 +3116,8 @@ "Optionnel : URL d'un dépôt distant. Si renseigné, le dépôt sera créé " "comme un clone à partir de cette URL." -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." @@ -3105,23 +3125,20 @@ "Gardez cette description précise et concise. Utilisez un fichier README " "pour des descriptions plus détaillées." -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt." -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "Type de dépôt à créer." - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Révision d’arrivée" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3314,28 +3331,17 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" -"Si ce dépôt est renommé ou déplacé dans un autre groupe, l'URL du dépôt " -"change.\n" -" L'utilisation de l'URL permanente ci-" -"dessus garantit que ce dépôt sera toujours accessible via cette URL.\n" -" Cela peut être utile pour les systèmes " -"d'intégration continue, ou dans tous les cas où vous devez saisir l'URL " -"« en dur » dans un service tiers." #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "Dépôt distant" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "URL du dépôt" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." @@ -3343,18 +3349,7 @@ "Optionel : URL d'un dépôt distant. Si renseigné, le dépôt sera pullé à " "partir de cette URL." -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" -"Révision par défaut pour les pages de fichiers, de téléchargements, de " -"recherche et de documentation" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "Saisir le nom de l'utilisateur" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr "Changer le propriétaire de ce dépôt." @@ -5684,6 +5679,28 @@ msgid "Download %s as %s" msgstr "Télécharge %s comme %s" +#~ msgid "" +#~ "In case this repository is renamed or moved into another group the " +#~ "repository URL changes.\n" +#~ " Using the above permanent URL " +#~ "guarantees that this repository always will be accessible on that " +#~ "URL.\n" +#~ " This is useful for CI systems, or any " +#~ "other cases that you need to hardcode the URL into a 3rd party service." +#~ msgstr "" +#~ "Si ce dépôt est renommé ou déplacé dans un autre groupe, l'URL du " +#~ "dépôt change.\n" +#~ " L'utilisation de l'URL permanente ci-" +#~ "dessus garantit que ce dépôt sera toujours accessible via cette URL.\n" +#~ " Cela peut être utile pour les systèmes " +#~ "d'intégration continue, ou dans tous les cas où vous devez saisir " +#~ "l'URL « en dur » dans un service tiers." + +#~ msgid "Default revision for files page, downloads, whoosh and readme" +#~ msgstr "" +#~ "Révision par défaut pour les pages de fichiers, de téléchargements, de " +#~ "recherche et de documentation" + #, python-format #~ msgid "Readme file from revision %s:%s" #~ msgstr "Fichier Lisez-moi de la revision %s:%s"
--- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\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/" @@ -44,10 +44,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "" @@ -261,7 +261,7 @@ msgstr "" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -612,9 +612,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "" @@ -622,9 +622,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "" @@ -637,8 +637,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -646,8 +646,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -703,57 +703,57 @@ msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1268,69 +1268,69 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/webutils.py:646 -#, python-format -msgid "%s ago" -msgstr "" - -#: kallithea/lib/webutils.py:648 -#, python-format -msgid "in %s and %s" -msgstr "" - #: kallithea/lib/webutils.py:651 #, python-format +msgid "%s ago" +msgstr "" + +#: kallithea/lib/webutils.py:653 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: kallithea/lib/webutils.py:656 +#, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "" @@ -1803,10 +1803,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1838,8 +1838,9 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2089,13 +2090,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2110,21 +2111,21 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2132,22 +2133,26 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "" @@ -2272,15 +2277,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2457,7 +2462,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2554,7 +2559,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2650,8 +2655,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2743,7 +2748,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2758,17 +2763,17 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2840,71 +2845,77 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +msgid "Not visible" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -msgid "Not visible" +msgid "Visible" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" +msgid "Add repos" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -msgid "Add repos" +msgid "Add/Edit groups" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -msgid "Add/Edit groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "A csoport törlésének megerősítése" @@ -2923,41 +2934,47 @@ msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy msgid "Clone remote repository" msgstr "Tároló törlése" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3140,10 +3157,10 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 @@ -3151,26 +3168,13 @@ msgid "Remote repository" msgstr "Tároló törlése" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr ""
--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\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/" @@ -46,10 +46,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "なし" @@ -275,7 +275,7 @@ msgstr "グループ" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -640,9 +640,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "読込" @@ -650,9 +650,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "書込" @@ -665,8 +665,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -674,8 +674,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -731,57 +731,57 @@ msgid "Error occurred during update of permissions" msgstr "権限の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "リポジトリグループ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "リポジトリグループ %s を作成しました" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "リポジトリグループ %s を更新しました" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "このグループは %s 個のリポジトリを含んでいるため削除できません" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "このグループは %s 個のサブグループを含んでいるため削除できません" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "リポジトリグループ %s を削除しました" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "リポジトリグループ %s の削除中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "自分自身の管理者としての権限を取り消すことはできません" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "リポジトリグループ権限を更新しました" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1306,63 +1306,63 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d 年" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d ヶ月" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d 日" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 時間" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "%s 以内" -#: kallithea/lib/webutils.py:646 +#: kallithea/lib/webutils.py:651 #, python-format msgid "%s ago" msgstr "%s 前" -#: kallithea/lib/webutils.py:648 +#: kallithea/lib/webutils.py:653 #, python-format msgid "in %s and %s" msgstr "%s と %s の間" -#: kallithea/lib/webutils.py:651 +#: kallithea/lib/webutils.py:656 #, python-format msgid "%s and %s ago" msgstr "%s と %s 前" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "たったいま" @@ -1869,10 +1869,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1904,8 +1904,9 @@ msgstr "Tip" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2158,13 +2159,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2179,21 +2180,21 @@ msgstr "リポジトリのデフォルト設定" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "リポジトリの種別" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "非公開リポジトリ" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2203,22 +2204,26 @@ "す。" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "統計を有効にする" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "概要ページの統計ウィンドウを有効にします。" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "ダウンロードを有効にする" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "概要ページのダウンロードメニューを有効にします。" @@ -2347,15 +2352,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2534,7 +2539,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2632,7 +2637,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2743,8 +2748,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2846,7 +2851,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2861,17 +2866,17 @@ msgstr "グループ名" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "親グループ" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "親グループのパーミッションをコピー" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" "親のリポジトリグループにセットされているパーミッションをコピーします。" @@ -2943,68 +2948,68 @@ msgid "Delete this repository group" msgstr "このリポジトリグループを削除" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 msgid "Not visible" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #, fuzzy #| msgid "disabled" msgid "Visible" msgstr "無効" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #, fuzzy #| msgid "Add Repository" msgid "Add repos" msgstr "リポジトリを追加" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 #, fuzzy #| msgid "Add user group" msgid "Add/Edit groups" msgstr "ユーザーグループを追加" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "ユーザー/ユーザーグループ" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 #, fuzzy msgid "Default" msgstr "Default" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "取消" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "新規追加" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "子要素にも適用" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "両方" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "両方" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." @@ -3012,11 +3017,19 @@ "このグループに属する全ての子要素のパーミッションを設定または無効化します。" "選択されていれば、非公開でないリポジトリや他のリポジトリも対象に含みます。" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +#, fuzzy +#| msgid "Type name of reviewer to add" +msgid "Type name of user" +msgstr "追加するレビュアーの名前を入力" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "このグループを削除" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "このグループを削除してもよろしいですか？: %s" @@ -3034,41 +3047,47 @@ msgid "Number of Top-level Repositories" msgstr "トップレベルリポジトリ数" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "作成するリポジトリの種別を指定します" + +#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "リモートリポジトリをクローン" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "リポジトリURL" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。" -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "オプション：このリポジトリが属するグループを選択します" -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "作成するリポジトリの種別を指定します" - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "ランディングリビジョン" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3257,26 +3276,17 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." -msgstr "" -"通常、リポジトリの名前を変更したり、別のグループに移動すると、リポジトリの" -"URLが変わります。\n" -"上のURLを使えば、常にリポジトリにアクセスできます。\n" -"この機能は、CIを使っている場合や、3rd pirtyのサービス向けにURLを固定化した" -"いときに便利です。" +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." +msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "リモートリポジトリ" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "リポジトリURL" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." @@ -3284,20 +3294,7 @@ "オプション: リモートリポジトリのURLです。設定した場合、このURLから変更を取" "得することができます。" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" -"ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定し" -"ます" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -#, fuzzy -#| msgid "Type name of reviewer to add" -msgid "Type name of user" -msgstr "追加するレビュアーの名前を入力" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr "リポジトリの所有者を変更" @@ -5666,6 +5663,26 @@ msgid "Download %s as %s" msgstr "%s を %s でダウンロード" +#~ msgid "" +#~ "In case this repository is renamed or moved into another group the " +#~ "repository URL changes.\n" +#~ " Using the above permanent URL " +#~ "guarantees that this repository always will be accessible on that " +#~ "URL.\n" +#~ " This is useful for CI systems, or any " +#~ "other cases that you need to hardcode the URL into a 3rd party service." +#~ msgstr "" +#~ "通常、リポジトリの名前を変更したり、別のグループに移動すると、リポジト" +#~ "リのURLが変わります。\n" +#~ "上のURLを使えば、常にリポジトリにアクセスできます。\n" +#~ "この機能は、CIを使っている場合や、3rd pirtyのサービス向けにURLを固定化" +#~ "したいときに便利です。" + +#~ msgid "Default revision for files page, downloads, whoosh and readme" +#~ msgstr "" +#~ "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指" +#~ "定します" + #, python-format #~ msgid "Readme file from revision %s:%s" #~ msgstr "リビジョン %s:%s の README ファイル"
--- a/kallithea/i18n/kallithea.pot Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/kallithea.pot Mon Dec 12 23:01:11 2022 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.7.0\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:27+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -43,10 +43,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "" @@ -259,7 +259,7 @@ msgstr "" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -608,9 +608,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "" @@ -618,9 +618,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "" @@ -633,8 +633,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -642,8 +642,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -699,57 +699,57 @@ msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1258,69 +1258,69 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/webutils.py:646 -#, python-format -msgid "%s ago" -msgstr "" - -#: kallithea/lib/webutils.py:648 -#, python-format -msgid "in %s and %s" -msgstr "" - #: kallithea/lib/webutils.py:651 #, python-format +msgid "%s ago" +msgstr "" + +#: kallithea/lib/webutils.py:653 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: kallithea/lib/webutils.py:656 +#, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "" @@ -1791,10 +1791,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1826,8 +1826,9 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2077,13 +2078,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2098,21 +2099,21 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2120,22 +2121,26 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "" @@ -2260,15 +2265,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2445,7 +2450,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2541,7 +2546,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2637,8 +2642,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2729,7 +2734,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 msgid "Repository Groups" @@ -2743,17 +2748,17 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2824,71 +2829,77 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +msgid "Not visible" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -msgid "Not visible" +msgid "Visible" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" +msgid "Add repos" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -msgid "Add repos" +msgid "Add/Edit groups" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -msgid "Add/Edit groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "" @@ -2905,39 +2916,45 @@ msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3116,36 +3133,23 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr ""
--- a/kallithea/i18n/lb/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/lb/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -3,7 +3,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\n" "PO-Revision-Date: 2020-04-13 19:42+0000\n" "Last-Translator: Dennis Fink <dennis.fink@c3l.lu>\n" "Language: lb\n" @@ -40,10 +40,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Keng" @@ -257,7 +257,7 @@ msgstr "Gruppen" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -608,9 +608,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Liesen" @@ -618,9 +618,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Schreiwen" @@ -633,8 +633,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -642,8 +642,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -699,57 +699,57 @@ msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1265,69 +1265,69 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d Joer" msgstr[1] "%d Joer" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d Mount" msgstr[1] "%d Méint" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d Dag" msgstr[1] "%d Deeg" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stonn" msgstr[1] "%d Stonnen" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minutt" msgstr[1] "%d Minutten" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d Sekonn" msgstr[1] "%d Sekonnen" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/webutils.py:646 -#, python-format -msgid "%s ago" -msgstr "" - -#: kallithea/lib/webutils.py:648 -#, python-format -msgid "in %s and %s" -msgstr "" - #: kallithea/lib/webutils.py:651 #, python-format +msgid "%s ago" +msgstr "" + +#: kallithea/lib/webutils.py:653 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: kallithea/lib/webutils.py:656 +#, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "" @@ -1800,10 +1800,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1835,8 +1835,9 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2086,13 +2087,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2107,21 +2108,21 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2129,22 +2130,26 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "" @@ -2269,15 +2274,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2454,7 +2459,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2551,7 +2556,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2647,8 +2652,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2740,7 +2745,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2755,17 +2760,17 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2837,71 +2842,77 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +msgid "Not visible" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -msgid "Not visible" +msgid "Visible" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" +msgid "Add repos" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -msgid "Add repos" +msgid "Add/Edit groups" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -msgid "Add/Edit groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "" @@ -2918,40 +2929,46 @@ msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3130,36 +3147,23 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr ""
--- a/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -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: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\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/" @@ -43,10 +43,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Ingen" @@ -273,7 +273,7 @@ msgstr "Grupper" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -636,9 +636,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "LEs" @@ -646,9 +646,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Skriv" @@ -661,8 +661,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -670,8 +670,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -728,58 +728,58 @@ msgid "Error occurred during update of permissions" msgstr "Feil inntraff under oppdatering av tilganger" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Feil inntraff under opprettelse av pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "Opprettet pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:224 +#: 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:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, 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:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, 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:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Fjernet pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, 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:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 #, fuzzy msgid "Cannot revoke permission for yourself as admin" msgstr "Kan ikke tilbakekalle egen administratortilgang" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Pakkebrønnsgruppetilganger oppdatert" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1309,69 +1309,69 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d år" msgstr[1] "%d år" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d måned" msgstr[1] "%d måneder" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dager" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d time" msgstr[1] "%d timer" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minutt" msgstr[1] "%d minutter" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d sekund" msgstr[1] "%d sekunder" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "om %s" -#: kallithea/lib/webutils.py:646 +#: kallithea/lib/webutils.py:651 #, python-format msgid "%s ago" msgstr "for %s siden" -#: kallithea/lib/webutils.py:648 +#: kallithea/lib/webutils.py:653 #, python-format msgid "in %s and %s" msgstr "om %s og %s" -#: kallithea/lib/webutils.py:651 +#: kallithea/lib/webutils.py:656 #, python-format msgid "%s and %s ago" msgstr "%s og %s siden" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "akkurat nå" @@ -1846,10 +1846,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1881,8 +1881,9 @@ msgstr "Tips" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2139,13 +2140,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2160,21 +2161,21 @@ msgstr "Pakkebrønnsdetaljer" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "Type" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Privat pakkebrønn" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2182,22 +2183,26 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "Skru på statistikk" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "Skru på nedlastinger" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "Skru på nedlastingsmeny på sammendragsside." @@ -2322,15 +2327,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2509,7 +2514,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2606,7 +2611,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2707,8 +2712,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2800,7 +2805,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2815,17 +2820,17 @@ msgstr "Gruppenavn" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2897,71 +2902,77 @@ msgid "Delete this repository group" msgstr "Slett denne pakkebrønnsgruppen" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 msgid "Not visible" msgstr "Ikke synlig" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Visible" +msgstr "Synlig" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" -msgstr "Synlig" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 msgid "Add repos" msgstr "Legg til pakkebrønner" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 msgid "Add/Edit groups" msgstr "Legg til/rediger grupper" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "Bruker/brukergruppe" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "Forvalg" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "Tilbakekall" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "Legg til ny" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "Begge" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "Begge" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "Skriv inn brukerens navn" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "Fjern denne gruppen" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "Bekreft sletting av denne gruppen" @@ -2978,40 +2989,46 @@ msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3190,36 +3207,23 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "Skriv inn brukerens navn" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr ""
--- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\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/" @@ -44,10 +44,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Geen" @@ -268,7 +268,7 @@ msgstr "Groepen" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -619,9 +619,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "" @@ -629,9 +629,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "" @@ -644,8 +644,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -653,8 +653,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -710,57 +710,57 @@ msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1275,69 +1275,69 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/webutils.py:646 -#, python-format -msgid "%s ago" -msgstr "" - -#: kallithea/lib/webutils.py:648 -#, python-format -msgid "in %s and %s" -msgstr "" - #: kallithea/lib/webutils.py:651 #, python-format +msgid "%s ago" +msgstr "" + +#: kallithea/lib/webutils.py:653 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: kallithea/lib/webutils.py:656 +#, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "" @@ -1811,10 +1811,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1846,8 +1846,9 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2097,13 +2098,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2118,21 +2119,21 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2140,22 +2141,26 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "" @@ -2280,15 +2285,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2465,7 +2470,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2562,7 +2567,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2658,8 +2663,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2751,7 +2756,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2766,17 +2771,17 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2848,71 +2853,77 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +msgid "Not visible" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -msgid "Not visible" +msgid "Visible" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" -msgstr "" +msgid "Add repos" +msgstr "Repositories toevoegen" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -msgid "Add repos" -msgstr "Repositories toevoegen" +msgid "Add/Edit groups" +msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -msgid "Add/Edit groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "" @@ -2929,40 +2940,46 @@ msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3141,36 +3158,23 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr ""
--- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\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/" @@ -47,10 +47,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Brak" @@ -273,7 +273,7 @@ msgstr "Grupy" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -628,9 +628,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Odczyt" @@ -638,9 +638,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Zapis" @@ -653,8 +653,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -662,8 +662,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -719,57 +719,57 @@ msgid "Error occurred during update of permissions" msgstr "Wystąpił błąd podczas aktualizacji uprawnień" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Wystąpił błąd podczas tworzenia grupy repo %s" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "Utworzono grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:224 +#: 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:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, 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:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, 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:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Usunięto grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, 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:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "Nie można cofnąć zezwolenia dla admina jako admin" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Aktualizacja uprawnień grup repozytorium" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1302,7 +1302,7 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1310,7 +1310,7 @@ msgstr[1] "%d lata" msgstr[2] "%d lat" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1318,7 +1318,7 @@ msgstr[1] "%d miesięcy" msgstr[2] "%d miesięcy" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1326,7 +1326,7 @@ msgstr[1] "%d dni" msgstr[2] "%d dni" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1334,7 +1334,7 @@ msgstr[1] "%d godziny" msgstr[2] "%d godzin" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1342,7 +1342,7 @@ msgstr[1] "%d minuty" msgstr[2] "%d minut" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1350,27 +1350,27 @@ msgstr[1] "%d sekund" msgstr[2] "%d sekund" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "w %s" -#: kallithea/lib/webutils.py:646 +#: kallithea/lib/webutils.py:651 #, python-format msgid "%s ago" msgstr "%s temu" -#: kallithea/lib/webutils.py:648 +#: kallithea/lib/webutils.py:653 #, python-format msgid "in %s and %s" msgstr "w %s i %s" -#: kallithea/lib/webutils.py:651 +#: kallithea/lib/webutils.py:656 #, python-format msgid "%s and %s ago" msgstr "%s i %s temu" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "przed chwilą" @@ -1890,10 +1890,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1925,8 +1925,9 @@ msgstr "Ostatnia zmiana" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2184,13 +2185,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2205,21 +2206,21 @@ msgstr "Repozytoria domyślne" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "Typ" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Prywatne repozytorium" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2229,22 +2230,26 @@ "jako współpracownicy." #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "Włącz statystyki" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "Włącz okno statystyk na stronie podsumowania." #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "Włącz pobieranie" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "Włącz menu pobierania na stronie podsumowania." @@ -2369,15 +2374,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2554,7 +2559,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2660,7 +2665,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2763,8 +2768,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2863,7 +2868,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2878,17 +2883,17 @@ msgstr "Nazwa grupy" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "Rodzic grupy" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2961,82 +2966,88 @@ msgid "Delete this repository group" msgstr "Usuń tę grupę repozytoriów" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 msgid "Not visible" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #, fuzzy #| msgid "Disabled" msgid "Visible" msgstr "Widoczne" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #, fuzzy #| msgid "Add Repository" msgid "Add repos" msgstr "Dodaj Repozytoria" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 #, fuzzy #| msgid "Add user group" msgid "Add/Edit groups" msgstr "Dodaj/edytuj grupę użytkowników" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #, fuzzy msgid "User/User Group" msgstr "użytkownik/grupa użytkowników" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 #, fuzzy msgid "Default" msgstr "domyślny" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 #, fuzzy msgid "Revoke" msgstr "odwołaj" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "Dodaj nowe" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 #, fuzzy msgid "Apply to children" msgstr "dotyczy dzieci" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 msgid "Both" msgstr "Oba" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 #, fuzzy msgid "Remove this group" msgstr "Usuń tę grupę użytkowników" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 #, fuzzy msgid "Confirm to delete this group" msgstr "Potwierdź usunięcie grupy użytkowników" @@ -3057,42 +3068,49 @@ msgid "Number of Top-level Repositories" msgstr "Liczba najwyższego poziomu repozytorium" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "Rodzaj repozytorium do stworzenia." + +#: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy msgid "Clone remote repository" msgstr "Klonuj zdalne repozytorium" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#, fuzzy +msgid "Repository URL" +msgstr "URL Repozytorium" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Powinna być krótka i na temat. Użyj pliku README dla dłuższych opisów." -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "Rodzaj repozytorium do stworzenia." - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Docelowa rewizja" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3289,10 +3307,10 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 @@ -3300,27 +3318,13 @@ msgid "Remote repository" msgstr "Zdalne repozytorium" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -#, fuzzy -msgid "Repository URL" -msgstr "URL Repozytorium" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "Wersja domyślna dla plików stronicowania, pobierania plików, readme" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr "Zmiana właściciela tego repozytorium." @@ -5709,6 +5713,10 @@ msgid "Download %s as %s" msgstr "Pobierz %s jak %s" +#~ msgid "Default revision for files page, downloads, whoosh and readme" +#~ msgstr "" +#~ "Wersja domyślna dla plików stronicowania, pobierania plików, readme" + #~ msgid "" #~ "Unable to activate hgsubversion support. The \"hgsubversion\" library " #~ "is missing"
--- a/kallithea/i18n/pt/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/pt/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -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: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\n" "PO-Revision-Date: 2021-05-10 09:32+0000\n" "Last-Translator: ssantos <ssantos@web.de>\n" "Language-Team: none\n" @@ -46,10 +46,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Nenhum" @@ -267,7 +267,7 @@ msgstr "" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -619,9 +619,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Ler" @@ -629,9 +629,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Gravar" @@ -644,8 +644,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -653,8 +653,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -710,57 +710,57 @@ msgid "Error occurred during update of permissions" msgstr "Ocorreu um erro durante a atualização das permissões" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Ocorreu um erro durante a criação do grupo de repositórios %s" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "Grupo de repositórios %s criado" -#: kallithea/controllers/admin/repo_groups.py:224 +#: 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:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, 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:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, 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:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Grupo de repositórios %s apagado" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, 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:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 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:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Permissões atualizadas do Grupo de Repositórios" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1280,69 +1280,69 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d ano" msgstr[1] "%d anos" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mês" msgstr[1] "%d meses" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "em %s" -#: kallithea/lib/webutils.py:646 +#: kallithea/lib/webutils.py:651 #, python-format msgid "%s ago" msgstr "%s atrás" -#: kallithea/lib/webutils.py:648 +#: kallithea/lib/webutils.py:653 #, python-format msgid "in %s and %s" msgstr "em %s e %s" -#: kallithea/lib/webutils.py:651 +#: kallithea/lib/webutils.py:656 #, python-format msgid "%s and %s ago" msgstr "%s e %s atrás" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "agora há pouco" @@ -1821,10 +1821,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1856,8 +1856,9 @@ msgstr "Ponta" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2107,13 +2108,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2128,21 +2129,21 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "Tipo" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Repositório privado" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2152,22 +2153,26 @@ "adicionadas como colaboradores." #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "Ativar estatísticas" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "Ativar janela de estatísticas na página de sumário." #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "Ativar descarregas" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "Ativar menu de descarregar na página de sumário." @@ -2292,15 +2297,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2477,7 +2482,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2574,7 +2579,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2673,8 +2678,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2769,7 +2774,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2784,17 +2789,17 @@ msgstr "Nome do grupo" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "Progenitor do grupo" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2866,71 +2871,77 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +msgid "Not visible" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -msgid "Not visible" +msgid "Visible" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" +msgid "Add repos" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -msgid "Add repos" +msgid "Add/Edit groups" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -msgid "Add/Edit groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "Adicionar novo" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "" @@ -2947,18 +2958,27 @@ msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "Tipo de repositório a criar." + +#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." @@ -2966,23 +2986,20 @@ "Seja sucinto e objetivo. Use um ficheiro README para descrições mais " "longas." -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "Opcionalmente selecione um grupo no qual pôr esse repositório." -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "Tipo de repositório a criar." - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Revisão de pouso" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3161,38 +3178,23 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" -"Revisão predefinida para página de ficheiros, descarregamentos, whoosh e " -"readme" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr "Mudar o dono desse repositório." @@ -5424,6 +5426,11 @@ msgid "Download %s as %s" msgstr "Descarregar %s como %s" +#~ msgid "Default revision for files page, downloads, whoosh and readme" +#~ msgstr "" +#~ "Revisão predefinida para página de ficheiros, descarregamentos, whoosh " +#~ "e readme" + #, python-format #~ msgid "" #~ "%s repository is not mapped to db perhaps it was created or renamed "
--- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\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/" @@ -45,10 +45,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Nenhum" @@ -273,7 +273,7 @@ msgstr "" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -640,9 +640,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Ler" @@ -650,9 +650,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Gravar" @@ -665,8 +665,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -674,8 +674,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -731,57 +731,57 @@ msgid "Error occurred during update of permissions" msgstr "Ocorreu um erro durante a atualização das permissões" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Ocorreu um erro durante a criação do grupo de repositórios %s" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "Grupo de repositórios %s criado" -#: kallithea/controllers/admin/repo_groups.py:224 +#: 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:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, 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:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, 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:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Grupo de repositórios %s excluído" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, 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:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 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:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Permissões atualizadas do Grupo de Repositórios" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1307,69 +1307,69 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d ano" msgstr[1] "%d anos" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mês" msgstr[1] "%d meses" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "em %s" -#: kallithea/lib/webutils.py:646 +#: kallithea/lib/webutils.py:651 #, python-format msgid "%s ago" msgstr "%s atrás" -#: kallithea/lib/webutils.py:648 +#: kallithea/lib/webutils.py:653 #, python-format msgid "in %s and %s" msgstr "em %s e %s" -#: kallithea/lib/webutils.py:651 +#: kallithea/lib/webutils.py:656 #, python-format msgid "%s and %s ago" msgstr "%s e %s atrás" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "agora há pouco" @@ -1883,10 +1883,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1918,8 +1918,9 @@ msgstr "Ponta" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2178,13 +2179,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2200,21 +2201,21 @@ msgstr "Padrões de repositórios" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "Tipo" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Repositório privado" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2224,22 +2225,26 @@ "adicionadas como colaboradores." #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "Habilitar estatísticas" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "Habilitar janela de estatísticas na página de sumário." #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "Habilitar downloads" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "Habilitar menu de descarregar na página de sumário." @@ -2365,15 +2370,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2557,7 +2562,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2657,7 +2662,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2766,8 +2771,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2869,7 +2874,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2884,17 +2889,17 @@ msgstr "Nome do grupo" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "Progenitor do grupo" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2966,82 +2971,88 @@ msgid "Delete this repository group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 msgid "Not visible" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #, fuzzy #| msgid "Disabled" msgid "Visible" msgstr "Desabilitado" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #, fuzzy #| msgid "No response" msgid "Add repos" msgstr "revisões" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 #, fuzzy #| msgid "Add user group" msgid "Add/Edit groups" msgstr "Adicionar grupo de usuários" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #, fuzzy msgid "User/User Group" msgstr "Grupo de usuários" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 #, fuzzy msgid "Default" msgstr "padrão" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 #, fuzzy msgid "Revoke" msgstr "revogar" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "Adicionar novo" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 #, fuzzy msgid "Apply to children" msgstr "aplicar aos filhos" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 #, fuzzy msgid "Remove this group" msgstr "Criar grupos de usuários" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 #, fuzzy msgid "Confirm to delete this group" msgstr "Confirme para excluir este grupo de usuário: %s" @@ -3062,19 +3073,29 @@ msgid "Number of Top-level Repositories" msgstr "Número de repositórios de nível superior" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "Tipo de repositório a criar." + +#: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy msgid "Clone remote repository" msgstr "repositório [criado]" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#, fuzzy +msgid "Repository URL" +msgstr "Repositório" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." @@ -3082,23 +3103,20 @@ "Seja sucinto e objetivo. Use um arquivo README para descrições mais " "longas." -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório." -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "Tipo de repositório a criar." - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Revisão de pouso" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3296,10 +3314,10 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 @@ -3307,27 +3325,13 @@ msgid "Remote repository" msgstr "repositório [criado]" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -#, fuzzy -msgid "Repository URL" -msgstr "Repositório" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "Revisão padrão para página de arquivos, downloads, whoosh e readme" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr "Mudar o dono desse repositório." @@ -5708,6 +5712,10 @@ msgid "Download %s as %s" msgstr "Descarregar %s como %s" +#~ msgid "Default revision for files page, downloads, whoosh and readme" +#~ msgstr "" +#~ "Revisão padrão para página de arquivos, downloads, whoosh e readme" + #, python-format #~ msgid "" #~ "%s repository is not mapped to db perhaps it was created or renamed "
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\n" "PO-Revision-Date: 2022-06-09 11:21+0000\n" "Last-Translator: МАН69К <weblate@mah69k.net>\n" "Language-Team: Russian <https://hosted.weblate.org/projects/kallithea/" @@ -44,10 +44,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Ничего" @@ -269,7 +269,7 @@ msgstr "Группы" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -623,9 +623,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Чтение" @@ -633,9 +633,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Запись" @@ -648,8 +648,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -657,8 +657,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -714,57 +714,57 @@ msgid "Error occurred during update of permissions" msgstr "Произошла ошибка во время обновления привилегий" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Произошла ошибка при создании группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "Создана новая группа репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "Группа репозиториев %s обновлена" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Данная группа содержит %s репозитариев и не может быть удалена" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Группа содержит в себе %s подгрупп и не может быть удалён" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Группа репозиториев %s удалена" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Произошла ошибка при удалении группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "Администратор не может отозвать свои привелегии" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Привилегии группы репозиториев обновлены" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1299,7 +1299,7 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1307,7 +1307,7 @@ msgstr[1] "%d года" msgstr[2] "%d лет" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1315,7 +1315,7 @@ msgstr[1] "%d месяца" msgstr[2] "%d месяцев" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1323,7 +1323,7 @@ msgstr[1] "%d дня" msgstr[2] "%d дней" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1331,7 +1331,7 @@ msgstr[1] "%d часа" msgstr[2] "%d часов" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1339,7 +1339,7 @@ msgstr[1] "%d минуты" msgstr[2] "%d минут" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1347,27 +1347,27 @@ msgstr[1] "%d секунды" msgstr[2] "%d секунд" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "в %s" -#: kallithea/lib/webutils.py:646 +#: kallithea/lib/webutils.py:651 #, python-format msgid "%s ago" msgstr "%s назад" -#: kallithea/lib/webutils.py:648 +#: kallithea/lib/webutils.py:653 #, python-format msgid "in %s and %s" msgstr "в %s и %s" -#: kallithea/lib/webutils.py:651 +#: kallithea/lib/webutils.py:656 #, python-format msgid "%s and %s ago" msgstr "%s и %s назад" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "только что" @@ -1897,10 +1897,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1932,8 +1932,9 @@ msgstr "Состояние" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2193,13 +2194,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2214,21 +2215,21 @@ msgstr "Значения по умолчанию" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "Тип" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Приватный репозиторий" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2236,22 +2237,26 @@ msgstr "Приватные репозитории видны только их участникам." #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "Включить статистику" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "Включить окно статистики на странице «Общие сведения»." #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "Включить скачивание" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "Включить меню скачивания на странице «Общие сведения»." @@ -2378,15 +2383,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2563,7 +2568,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2669,7 +2674,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2770,8 +2775,8 @@ msgstr "Права пользователя по умолчанию для новых репозиториев." #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2874,7 +2879,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2889,17 +2894,17 @@ msgstr "Имя группы" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "Родительская группа" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "Скопировать родительские права доступа" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "Скопировать набор прав доступа из родительской группы репозиториев." @@ -2972,61 +2977,61 @@ msgid "Delete this repository group" msgstr "Удалить группу репозиториев" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 msgid "Not visible" msgstr "Невидимый" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Visible" +msgstr "Видимый" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" -msgstr "Видимый" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 msgid "Add repos" msgstr "Добавлять репозитории" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 msgid "Add/Edit groups" msgstr "Добавлять/Редактировать группы" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "Пользователь/Группа" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "По умолчанию" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "Отозвать" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "Добавить новый" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "Применить к дочерним" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "Все" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "Все" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." @@ -3034,11 +3039,17 @@ "Установить или отозвать права всех дочерних элементов этой группы, " "включая публичные репозитории и другие группы, если они выбраны." -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "Введите имя пользователя" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "Удалить группу" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "Подтвердите удаление этой группы пользователей" @@ -3055,11 +3066,20 @@ msgid "Number of Top-level Repositories" msgstr "Число репозиториев верхнего уровня" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "Тип создаваемого репозитория." + +#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "Клонировать удалённый репозиторий" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "URL репозитория" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." @@ -3067,31 +3087,28 @@ "Опционально: URL удалённого репозитория. Если параметр задан, то будет " "создан клон репозитория, расположенного по этому адресу." -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Короткое и осмысленное. Для развернутого описания используйте файл README." -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "Опционально выбрать группу, в которую поместить данный репозиторий." -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "Тип создаваемого репозитория." - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Ревизия для выгрузки" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3282,27 +3299,17 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" -"В случае, когда репозиторий переименовывается или перемещается в другую " -"группу, URL репозитория изменяется.\n" -" Использование постоянного URL гарантирует, " -"что данный репозиторий всегда будет доступен по этому URL.\n" -" Это может быть полезно в CI-системах, или " -"в любом другом случае, требующем встраивания URL в код ПО." #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "Удалённый репозиторий" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "URL репозитория" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." @@ -3310,18 +3317,7 @@ "Опционально: URL удалённого репозитория. Если задан, то репозиторий можно " "получить по заданному адресу." -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" -"Ревизия по умолчанию, из которой будет производиться выгрузка файлов при " -"скачивании" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "Введите имя пользователя" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr "Изменить владельца репозитория." @@ -5643,6 +5639,28 @@ msgid "Download %s as %s" msgstr "Скачать %s как %s" +#~ msgid "" +#~ "In case this repository is renamed or moved into another group the " +#~ "repository URL changes.\n" +#~ " Using the above permanent URL " +#~ "guarantees that this repository always will be accessible on that " +#~ "URL.\n" +#~ " This is useful for CI systems, or any " +#~ "other cases that you need to hardcode the URL into a 3rd party service." +#~ msgstr "" +#~ "В случае, когда репозиторий переименовывается или перемещается в " +#~ "другую группу, URL репозитория изменяется.\n" +#~ " Использование постоянного URL " +#~ "гарантирует, что данный репозиторий всегда будет доступен по этому " +#~ "URL.\n" +#~ " Это может быть полезно в CI-системах, " +#~ "или в любом другом случае, требующем встраивания URL в код ПО." + +#~ msgid "Default revision for files page, downloads, whoosh and readme" +#~ msgstr "" +#~ "Ревизия по умолчанию, из которой будет производиться выгрузка файлов " +#~ "при скачивании" + #, python-format #~ msgid "Readme file from revision %s:%s" #~ msgstr "Файл readme из ревизии %s:%s"
--- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\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/" @@ -44,10 +44,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "" @@ -266,7 +266,7 @@ msgstr "Skupiny" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -620,9 +620,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "" @@ -630,9 +630,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "" @@ -645,8 +645,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -654,8 +654,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -711,57 +711,57 @@ msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1280,7 +1280,7 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1288,7 +1288,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1296,7 +1296,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1304,7 +1304,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1312,7 +1312,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1320,7 +1320,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1328,27 +1328,27 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/webutils.py:646 -#, python-format -msgid "%s ago" -msgstr "" - -#: kallithea/lib/webutils.py:648 -#, python-format -msgid "in %s and %s" -msgstr "" - #: kallithea/lib/webutils.py:651 #, python-format +msgid "%s ago" +msgstr "" + +#: kallithea/lib/webutils.py:653 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: kallithea/lib/webutils.py:656 +#, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "" @@ -1825,10 +1825,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1860,8 +1860,9 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2112,13 +2113,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2134,21 +2135,21 @@ msgstr "Repozitáre" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2156,22 +2157,26 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "" @@ -2296,15 +2301,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2483,7 +2488,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2580,7 +2585,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2677,8 +2682,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2770,7 +2775,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2785,17 +2790,17 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2868,73 +2873,79 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +msgid "Not visible" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -msgid "Not visible" +msgid "Visible" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 #, fuzzy #| msgid "No response" msgid "Add repos" msgstr "Neznáma revízia %s" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 msgid "Add/Edit groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "" @@ -2952,41 +2963,48 @@ msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy msgid "Clone remote repository" msgstr "Prázdny repozitár" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#, fuzzy +msgid "Repository URL" +msgstr "Repozitáre" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3173,10 +3191,10 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 @@ -3184,27 +3202,13 @@ msgid "Remote repository" msgstr "Prázdny repozitár" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -#, fuzzy -msgid "Repository URL" -msgstr "Repozitáre" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr ""
--- a/kallithea/i18n/tr/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/tr/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -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: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\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/" @@ -47,10 +47,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Yok" @@ -264,7 +264,7 @@ msgstr "" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -615,9 +615,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "" @@ -625,9 +625,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "" @@ -640,8 +640,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -649,8 +649,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -706,57 +706,57 @@ msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1272,69 +1272,69 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/webutils.py:646 -#, python-format -msgid "%s ago" -msgstr "" - -#: kallithea/lib/webutils.py:648 -#, python-format -msgid "in %s and %s" -msgstr "" - #: kallithea/lib/webutils.py:651 #, python-format +msgid "%s ago" +msgstr "" + +#: kallithea/lib/webutils.py:653 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: kallithea/lib/webutils.py:656 +#, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "" @@ -1807,10 +1807,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1842,8 +1842,9 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2093,13 +2094,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2114,21 +2115,21 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2136,22 +2137,26 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "" @@ -2276,15 +2281,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2461,7 +2466,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2558,7 +2563,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2654,8 +2659,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2747,7 +2752,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2762,17 +2767,17 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2844,71 +2849,77 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +msgid "Not visible" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -msgid "Not visible" +msgid "Visible" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" +msgid "Add repos" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -msgid "Add repos" +msgid "Add/Edit groups" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -msgid "Add/Edit groups" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "" @@ -2925,40 +2936,46 @@ msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3137,36 +3154,23 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr ""
--- a/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -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: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\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/" @@ -44,10 +44,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Нічого" @@ -263,7 +263,7 @@ msgstr "Групи" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -621,9 +621,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Читати" @@ -631,9 +631,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Писати" @@ -646,8 +646,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -655,8 +655,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -712,57 +712,57 @@ msgid "Error occurred during update of permissions" msgstr "Сталася помилка під час оновлення прав" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Сталася помилка при створенні repository group %s" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "Створена група репозиторіїв %s" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "Оновлено групу репозиторіїв %s" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Ця група містить %s репозиторії, і їх неможливо видалити" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Ця група містить %s підгрупи і не може бути видалена" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Видалена група репозиторіїв %s" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Сталася помилка під час видалення групи репохиторіїв %s" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "Неможливо відкликати дозвіл для себе як адміністратора" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Оновлено дозволи групи репозиторіїв" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1285,7 +1285,7 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1293,7 +1293,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1301,7 +1301,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1309,7 +1309,7 @@ msgstr[1] "%d днів" msgstr[2] "%d дня" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1317,7 +1317,7 @@ msgstr[1] "%d годин" msgstr[2] "%d години" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1325,7 +1325,7 @@ msgstr[1] "%d хвилин" msgstr[2] "%d хвилини" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1333,27 +1333,27 @@ msgstr[1] "%d секунд" msgstr[2] "%d секунди" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "в %s" -#: kallithea/lib/webutils.py:646 +#: kallithea/lib/webutils.py:651 #, python-format msgid "%s ago" msgstr "%s тому" -#: kallithea/lib/webutils.py:648 +#: kallithea/lib/webutils.py:653 #, python-format msgid "in %s and %s" msgstr "у %s і %s" -#: kallithea/lib/webutils.py:651 +#: kallithea/lib/webutils.py:656 #, python-format msgid "%s and %s ago" msgstr "%s і %s тому" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "прямо зараз" @@ -1830,10 +1830,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1865,8 +1865,9 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2117,13 +2118,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2138,21 +2139,21 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2160,22 +2161,26 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "" @@ -2300,15 +2305,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2485,7 +2490,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2582,7 +2587,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2678,8 +2683,8 @@ msgstr "Дозволи для користувача за промовчанням на нові репозиторії." #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2776,7 +2781,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2791,17 +2796,17 @@ msgstr "Назва групи" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "Батьківська група" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "Копіювання дозволів батьківської групи" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "Скопіюйте набір дозволів із батьківської групи репозиторію." @@ -2874,61 +2879,61 @@ msgid "Delete this repository group" msgstr "Видалити цю групу репозиторіїв" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 msgid "Not visible" msgstr "Не видно" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Visible" +msgstr "Видно" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -msgid "Visible" -msgstr "Видно" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 msgid "Add repos" msgstr "Додати репозиторій" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 msgid "Add/Edit groups" msgstr "Додавання/редагування груп" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "Група користувачів/користувачів" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 msgid "Default" msgstr "За промовчанням" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "Відкликати" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "Додати новий" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "Застосовувати до дочірніх" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "Обидва" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "Обидва" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." @@ -2936,11 +2941,17 @@ "Встановіть або скасуйте дозвіл для всіх дітей цієї групи, включно з " "неприватними репозиторіями та іншими групами, якщо вони вибрані." -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "Введіть ім'я користувача" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "Видалити цю групу" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "Підтвердіть, щоб видалити цю групу" @@ -2957,40 +2968,46 @@ msgid "Number of Top-level Repositories" msgstr "Кількість репозиторіїв верхнього рівня" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "Тип сховища для створення." + +#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "Клонувати віддалений репозиторій" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "Repository URL" +msgstr "URL репозиторію" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "За бажанням виберіть групу, в яку буде розміщено цей репозиторій." -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "Тип сховища для створення." - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Цільова редакція" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3178,21 +3195,17 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "Віддалений репозиторій" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -msgid "Repository URL" -msgstr "URL репозиторію" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." @@ -3200,16 +3213,7 @@ "Опціонально: URL-адреса віддаленого сховища. Якщо встановлено, сховище " "можна витягнути з цієї URL-адреси." -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "Введіть ім'я користувача" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr "Змінити власника цього сховища."
--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\n" "PO-Revision-Date: 2022-06-12 16:20+0000\n" "Last-Translator: yzqzss <yzqzss@othing.xyz>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" @@ -46,10 +46,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "无" @@ -267,7 +267,7 @@ msgstr "组" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -629,9 +629,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "读" @@ -639,9 +639,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "写" @@ -654,8 +654,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -663,8 +663,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -720,57 +720,57 @@ msgid "Error occurred during update of permissions" msgstr "权限更新时发生错误" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "这个组内有%s个版本库因而无法删除" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1290,63 +1290,63 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d年" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d月" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d天" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d时" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d分" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d秒" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "%s" -#: kallithea/lib/webutils.py:646 +#: kallithea/lib/webutils.py:651 #, python-format msgid "%s ago" msgstr "%s前" -#: kallithea/lib/webutils.py:648 +#: kallithea/lib/webutils.py:653 #, python-format msgid "in %s and %s" msgstr "%s零%s" -#: kallithea/lib/webutils.py:651 +#: kallithea/lib/webutils.py:656 #, python-format msgid "%s and %s ago" msgstr "%s零%s前" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "刚才" @@ -1848,10 +1848,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1883,8 +1883,9 @@ msgstr "Tip" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2140,13 +2141,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2162,21 +2163,21 @@ msgstr "版本库默认设置" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "类型" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "私有版本库" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2184,22 +2185,26 @@ msgstr "私有版本库只对成员可见。" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "启用统计" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "启用概况页面上的统计窗口。" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "启用下载" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "启用概况页面上的下载菜单。" @@ -2325,15 +2330,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2515,7 +2520,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2615,7 +2620,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2720,8 +2725,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2815,7 +2820,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2830,17 +2835,17 @@ msgstr "组名" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "上级组" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2911,78 +2916,84 @@ msgid "Delete this repository group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 msgid "Not visible" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #, fuzzy #| msgid "Disabled" msgid "Visible" msgstr "停用" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #, fuzzy #| msgid "No response" msgid "Add repos" msgstr "无响应" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 msgid "Add/Edit groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 #, fuzzy msgid "Default" msgstr "默认" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 #, fuzzy msgid "Revoke" msgstr "移除" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 #, fuzzy msgid "Apply to children" msgstr "应用到成员" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 #, fuzzy msgid "Confirm to delete this group" msgstr "确认删除用户：%s" @@ -3003,41 +3014,48 @@ msgid "Number of Top-level Repositories" msgstr "顶层版本库数量" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "要创建的版本库类型。" + +#: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy msgid "Clone remote repository" msgstr "[创建]版本库" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#, fuzzy +msgid "Repository URL" +msgstr "版本库" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "保持简短。用README文件来写更长的描述。" -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "可选的选择一个组将版本库放到其中。" -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "要创建的版本库类型。" - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "默认修订" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3229,10 +3247,10 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 @@ -3240,27 +3258,13 @@ msgid "Remote repository" msgstr "[创建]版本库" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -#, fuzzy -msgid "Repository URL" -msgstr "版本库" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "文件浏览、下载、whoosh和README的默认修订版本" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr "修改这个版本库的所有者。" @@ -5599,6 +5603,9 @@ msgid "Download %s as %s" msgstr "下载%s为%s包" +#~ msgid "Default revision for files page, downloads, whoosh and readme" +#~ msgstr "文件浏览、下载、whoosh和README的默认修订版本" + #, python-format #~ msgid "" #~ "%s repository is not mapped to db perhaps it was created or renamed "
--- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Mon Dec 12 23:01:11 2022 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2022-12-12 22:25+0100\n" +"POT-Creation-Date: 2022-12-12 23:01+0100\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/" @@ -46,10 +46,10 @@ #: kallithea/controllers/admin/permissions.py:65 #: kallithea/controllers/admin/permissions.py:70 #: kallithea/controllers/changelog.py:136 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #: kallithea/templates/admin/repos/repo_edit_permissions.html:7 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:6 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "無" @@ -267,7 +267,7 @@ msgstr "" #: kallithea/controllers/home.py:87 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 @@ -619,9 +619,9 @@ #: kallithea/controllers/admin/permissions.py:61 #: kallithea/controllers/admin/permissions.py:66 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "讀" @@ -629,9 +629,9 @@ #: kallithea/controllers/admin/permissions.py:62 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "寫" @@ -644,8 +644,8 @@ #: kallithea/templates/admin/permissions/permissions.html:9 #: kallithea/templates/admin/repo_groups/repo_group_add.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:46 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 @@ -653,8 +653,8 @@ #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:46 #: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 @@ -710,57 +710,57 @@ msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:164 +#: kallithea/controllers/admin/repo_groups.py:165 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:171 +#: kallithea/controllers/admin/repo_groups.py:172 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:224 +#: kallithea/controllers/admin/repo_groups.py:225 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:240 +#: 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:250 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:257 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:263 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:268 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:352 -#: kallithea/controllers/admin/repo_groups.py:382 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 #: kallithea/controllers/admin/user_groups.py:288 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:367 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:399 +#: kallithea/controllers/admin/repo_groups.py:401 #: kallithea/controllers/admin/repos.py:334 #: kallithea/controllers/admin/user_groups.py:300 msgid "An error occurred during revoking of permission" @@ -1278,63 +1278,63 @@ msgid "Invalid SSH key - it is a %s key but the base64 part contains %r" msgstr "" -#: kallithea/lib/webutils.py:623 +#: kallithea/lib/webutils.py:628 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" -#: kallithea/lib/webutils.py:624 +#: kallithea/lib/webutils.py:629 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" -#: kallithea/lib/webutils.py:625 +#: kallithea/lib/webutils.py:630 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: kallithea/lib/webutils.py:626 +#: kallithea/lib/webutils.py:631 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: kallithea/lib/webutils.py:627 +#: kallithea/lib/webutils.py:632 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: kallithea/lib/webutils.py:628 +#: kallithea/lib/webutils.py:633 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: kallithea/lib/webutils.py:644 +#: kallithea/lib/webutils.py:649 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/webutils.py:646 -#, python-format -msgid "%s ago" -msgstr "" - -#: kallithea/lib/webutils.py:648 -#, python-format -msgid "in %s and %s" -msgstr "" - #: kallithea/lib/webutils.py:651 #, python-format +msgid "%s ago" +msgstr "" + +#: kallithea/lib/webutils.py:653 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: kallithea/lib/webutils.py:656 +#, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/webutils.py:654 +#: kallithea/lib/webutils.py:659 msgid "just now" msgstr "現在" @@ -1811,10 +1811,10 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:58 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:60 #: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 #: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/admin/repos/repo_add_base.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 #: kallithea/templates/admin/repos/repos.html:40 #: kallithea/templates/admin/user_groups/user_group_add.html:33 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 @@ -1846,8 +1846,9 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 #: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_settings.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 #: kallithea/templates/admin/repos/repos.html:43 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 #: kallithea/templates/admin/user_groups/user_groups.html:43 @@ -2102,13 +2103,13 @@ #: kallithea/templates/admin/my_account/my_account_profile.html:47 #: kallithea/templates/admin/permissions/permissions_globals.html:87 #: 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 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:86 +#: kallithea/templates/admin/repos/repo_edit_settings.html:96 #: kallithea/templates/admin/settings/settings_hooks.html:34 #: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:87 #: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 #: kallithea/templates/admin/users/user_add.html:80 #: kallithea/templates/admin/users/user_edit_profile.html:89 @@ -2124,21 +2125,21 @@ msgstr "個版本庫" #: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:10 #: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "類型" #: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:62 +#: kallithea/templates/admin/repos/repo_add_base.html:54 +#: kallithea/templates/admin/repos/repo_edit_settings.html:59 #: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "私有的版本庫" #: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repo_add_base.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:62 #: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " @@ -2146,22 +2147,26 @@ msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/admin/repos/repo_add_base.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:66 msgid "Enable statistics" msgstr "啟用統計" #: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:72 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 msgid "Enable statistics window on summary page." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:76 +#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_edit_settings.html:73 msgid "Enable downloads" msgstr "啟用下載" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/admin/repos/repo_add_base.html:71 +#: kallithea/templates/admin/repos/repo_edit_settings.html:76 msgid "Enable download menu on summary page." msgstr "" @@ -2287,15 +2292,15 @@ #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:66 #: kallithea/templates/admin/permissions/permissions_globals.html:88 #: 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 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 #: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:100 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:87 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 #: kallithea/templates/admin/settings/settings_global.html:50 #: kallithea/templates/admin/settings/settings_vcs.html:59 #: kallithea/templates/admin/settings/settings_visual.html:129 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 #: kallithea/templates/admin/users/user_edit_api_keys.html:14 #: kallithea/templates/admin/users/user_edit_api_keys.html:73 #: kallithea/templates/admin/users/user_edit_emails.html:47 @@ -2476,7 +2481,7 @@ #: kallithea/templates/admin/my_account/my_account_emails.html:46 #: kallithea/templates/admin/my_account/my_account_ssh_keys.html:65 #: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:76 #: kallithea/templates/admin/repos/repo_edit_fields.html:53 #: kallithea/templates/admin/users/user_edit_api_keys.html:72 #: kallithea/templates/admin/users/user_edit_emails.html:46 @@ -2576,7 +2581,7 @@ #: kallithea/templates/admin/my_account/my_account_repos.html:14 #: kallithea/templates/admin/my_account/my_account_watched.html:14 #: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_add_base.html:4 #: kallithea/templates/admin/repos/repo_edit_settings.html:4 #: kallithea/templates/admin/repos/repos.html:39 #: kallithea/templates/admin/user_groups/user_groups.html:39 @@ -2681,8 +2686,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:33 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 #: kallithea/templates/data_table/_dt_elements.html:140 #: kallithea/templates/forks/fork.html:42 msgid "Repository group" @@ -2775,7 +2780,7 @@ #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/base/base.html:57 #: kallithea/templates/base/base.html:76 @@ -2790,17 +2795,17 @@ msgstr "群組名稱" #: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "父群組" #: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/templates/admin/repos/repo_add_base.html:40 msgid "Copy parent group permissions" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:43 msgid "Copy permission set from parent repository group." msgstr "" @@ -2871,76 +2876,82 @@ msgid "Delete this repository group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:6 msgid "Not visible" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 #, fuzzy #| msgid "Disabled" msgid "Visible" msgstr "停用" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 #, fuzzy #| msgid "No response" msgid "Add repos" msgstr "未回應" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 msgid "Add/Edit groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 msgid "User/User Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:27 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:44 #: kallithea/templates/admin/repos/repo_edit_permissions.html:23 #: kallithea/templates/admin/repos/repo_edit_permissions.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:44 #, fuzzy msgid "Default" msgstr "刪除" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:70 #: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:69 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:70 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:80 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:79 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:80 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:86 msgid "Apply to children" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +msgid "Both" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 -msgid "Both" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:45 msgid "Confirm to delete this group" msgstr "" @@ -2960,41 +2971,48 @@ msgid "Number of Top-level Repositories" msgstr "建立版本庫" -#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/templates/admin/repos/repo_add_base.html:13 +msgid "Type of repository to create." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:17 #, fuzzy msgid "Clone remote repository" msgstr "私有版本庫" -#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/templates/admin/repos/repo_add_base.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#, fuzzy +msgid "Repository URL" +msgstr "版本庫" + +#: kallithea/templates/admin/repos/repo_add_base.html:21 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/admin/repos/repo_add_base.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:34 #: kallithea/templates/forks/fork.html:37 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_add_base.html:36 +#: kallithea/templates/admin/repos/repo_edit_settings.html:41 #: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:45 -msgid "Type of repository to create." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:47 +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 #: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3183,10 +3201,10 @@ msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" -" Using the above permanent URL guarantees " -"that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any " -"other cases that you need to hardcode the URL into a 3rd party service." +" Using the above permanent URL guarantees that " +"this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any other " +"cases that you need to hardcode the URL into a 3rd party service." msgstr "" #: kallithea/templates/admin/repos/repo_edit_settings.html:21 @@ -3194,27 +3212,13 @@ msgid "Remote repository" msgstr "私有版本庫" -#: kallithea/templates/admin/repos/repo_edit_settings.html:24 -#, fuzzy -msgid "Repository URL" -msgstr "版本庫" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:26 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:43 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:49 -#: kallithea/templates/pullrequests/pullrequest_show.html:131 -msgid "Type name of user" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 msgid "Change owner of this repository." msgstr ""
--- a/kallithea/lib/auth.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/lib/auth.py Mon Dec 12 23:01:11 2022 +0100 @@ -521,9 +521,9 @@ if self.allow_default_user: log.info('default user @ %s', loc) return func(*fargs, **fkwargs) - log.info('default user is not accepted here @ %s', loc) + log.info('default user is redirected to login @ %s', loc) elif user.is_anonymous: # default user is disabled and no proper authentication - log.warning('user is anonymous and NOT authenticated with regular auth @ %s', loc) + log.info('anonymous user is redirected to login @ %s', loc) else: # regular authentication log.info('user %s authenticated with regular auth @ %s', user, loc) return func(*fargs, **fkwargs)
--- a/kallithea/lib/markup_renderer.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/lib/markup_renderer.py Mon Dec 12 23:01:11 2022 +0100 @@ -117,7 +117,7 @@ At last it will just do a simple html replacing new lines with <br/> >>> MarkupRenderer.render('''<img id="a" style="margin-top:-1000px;color:red" src="http://example.com/test.jpg">''', '.md') - '<p><img id="a" src="http://example.com/test.jpg" style="color: red;"></p>' + '<p><img id="a" src="http://example.com/test.jpg" style=""></p>' >>> MarkupRenderer.render('''<img class="c d" src="file://localhost/test.jpg">''', 'b.mkd') '<p><img class="c d"></p>' >>> MarkupRenderer.render('''<a href="foo">foo</a>''', 'c.mkdn')
--- a/kallithea/lib/vcs/backends/base.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/lib/vcs/backends/base.py Mon Dec 12 23:01:11 2022 +0100 @@ -171,7 +171,7 @@ :param start_date: :param end_date: :param branch_name: - :param reversed: + :param reverse: """ raise NotImplementedError
--- a/kallithea/lib/vcs/backends/git/repository.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/lib/vcs/backends/git/repository.py Mon Dec 12 23:01:11 2022 +0100 @@ -19,7 +19,12 @@ import urllib.request from collections import OrderedDict -import mercurial.util # import url as hg_url + +try: + from mercurial.utils.urlutil import url as hg_url +except ImportError: # urlutil was introduced in Mercurial 5.8 + from mercurial.util import url as hg_url + from dulwich.client import SubprocessGitClient from dulwich.config import ConfigFile from dulwich.objects import Tag @@ -226,7 +231,7 @@ if parsed_url.scheme not in ['http', 'https']: raise urllib.error.URLError("Unsupported protocol in URL %r" % url) - url_obj = mercurial.util.url(safe_bytes(url)) + url_obj = hg_url(safe_bytes(url)) test_uri, handlers = get_urllib_request_handlers(url_obj) if not test_uri.endswith(b'info/refs'): test_uri = test_uri.rstrip(b'/') + b'/info/refs'
--- a/kallithea/lib/vcs/backends/hg/repository.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/lib/vcs/backends/hg/repository.py Mon Dec 12 23:01:11 2022 +0100 @@ -34,7 +34,12 @@ import mercurial.tags import mercurial.ui import mercurial.unionrepo -import mercurial.util + + +try: + from mercurial.utils.urlutil import url as hg_url +except ImportError: # urlutil was introduced in Mercurial 5.8 + from mercurial.util import url as hg_url from kallithea.lib.vcs.backends.base import BaseRepository, CollectionGenerator from kallithea.lib.vcs.exceptions import (BranchDoesNotExistError, ChangesetDoesNotExistError, EmptyRepositoryError, RepositoryError, TagAlreadyExistError, @@ -212,7 +217,7 @@ local = False try: - mercurial.tags.tag(self._repo, safe_bytes(name), mercurial.commands.nullid, safe_bytes(message), local, safe_bytes(user), date) + mercurial.tags.tag(self._repo, safe_bytes(name), mercurial.node.nullid, safe_bytes(message), local, safe_bytes(user), date) self.tags = self._get_tags() except mercurial.error.Abort as e: raise RepositoryError(e.args[0]) @@ -336,7 +341,7 @@ if '+' in parsed_url.scheme: # strip 'git+' for hg-git URLs url = url.split(b'+', 1)[1] - url_obj = mercurial.util.url(url) + url_obj = hg_url(url) test_uri, handlers = get_urllib_request_handlers(url_obj) url_obj.passwd = b'*****' @@ -523,7 +528,7 @@ :param start_date: :param end_date: :param branch_name: - :param reversed: return changesets in reversed order + :param reverse: return changesets in reversed order """ start_raw_id = self._get_revision(start) start_pos = None if start is None else self.revisions.index(start_raw_id)
--- a/kallithea/lib/vcs/utils/helpers.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/lib/vcs/utils/helpers.py Mon Dec 12 23:01:11 2022 +0100 @@ -245,7 +245,7 @@ if authinfo: # authinfo is a tuple (realm, uris, user, password) where 'uris' itself # is a tuple of URIs. - # If url_obj is obtained via mercurial.util.url, the obtained authinfo + # If url_obj is obtained via mercurial urlutil, the obtained authinfo # values will be bytes, e.g. # (None, (b'http://127.0.0.1/repo', b'127.0.0.1'), b'user', b'pass') # However, urllib expects strings, not bytes, so we must convert them.
--- a/kallithea/lib/webutils.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/lib/webutils.py Mon Dec 12 23:01:11 2022 +0100 @@ -20,6 +20,7 @@ imported anywhere - just like the global variables can be used everywhere. """ +import collections import datetime import json import logging @@ -66,6 +67,10 @@ assert wrap_paragraphs +# work around webhelpers2 being a dead project that doesn't support Python 3.10 +collections.Sequence = collections.abc.Sequence + + # # General Kallithea URL handling #
--- a/kallithea/model/forms.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/model/forms.py Mon Dec 12 23:01:11 2022 +0100 @@ -173,6 +173,7 @@ group_copy_permissions = v.StringBoolean(if_missing=False) if edit: + owner = All(v.UnicodeString(not_empty=True), v.ValidRepoUser()) # FIXME: do a special check that we cannot move a group to one of # its children pass
--- a/kallithea/model/repo.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/model/repo.py Mon Dec 12 23:01:11 2022 +0100 @@ -711,13 +711,10 @@ copy_fork_permissions = form_data.get('copy_permissions') copy_group_permissions = form_data.get('repo_copy_permissions') fork_of = form_data.get('fork_parent_id') + enable_statistics = form_data['repo_enable_statistics'] + enable_downloads = form_data['repo_enable_downloads'] state = form_data.get('repo_state', db.Repository.STATE_PENDING) - # repo creation defaults, private and repo_type are filled in form - defs = db.Setting.get_default_repo_settings(strip_prefix=True) - enable_statistics = defs.get('repo_enable_statistics') - enable_downloads = defs.get('repo_enable_downloads') - try: db_repo = RepoModel()._create_repo( repo_name=repo_name_full,
--- a/kallithea/model/repo_group.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/model/repo_group.py Mon Dec 12 23:01:11 2022 +0100 @@ -281,14 +281,14 @@ old_path = repo_group.full_path # change properties + if 'owner' in repo_group_args: + repo_group.owner = db.User.get_by_username(repo_group_args['owner']) if 'group_description' in repo_group_args: repo_group.group_description = repo_group_args['group_description'] if 'parent_group_id' in repo_group_args: - repo_group.parent_group_id = repo_group_args['parent_group_id'] - - if 'parent_group_id' in repo_group_args: assert repo_group_args['parent_group_id'] != '-1', repo_group_args # RepoGroupForm should have converted to None repo_group.parent_group = db.RepoGroup.get(repo_group_args['parent_group_id']) + repo_group.group_name = repo_group.get_new_name(repo_group.name) if 'group_name' in repo_group_args: group_name = repo_group_args['group_name'] if kallithea.lib.utils2.repo_name_slug(group_name) != group_name:
--- a/kallithea/model/scm.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/model/scm.py Mon Dec 12 23:01:11 2022 +0100 @@ -713,6 +713,7 @@ log.error('error writing hook %s: %s', hook_file, e) elif h_type == 'pre-receive': # no longer used, so just remove any existing Kallithea hook if os.path.lexists(hook_file) and not other_hook: + log.warning('removing existing unused Kallithea hook %s', hook_file) os.remove(hook_file)
--- a/kallithea/public/js/base.js Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/public/js/base.js Mon Dec 12 23:01:11 2022 +0100 @@ -677,6 +677,7 @@ 'class': 'btn-group' }).append( $('<button>', { + 'type': 'button', 'class': 'btn btn-default btn-xs', text: _TM['Retry'] }).click(function() { @@ -685,6 +686,7 @@ ajaxPOST(AJAX_COMMENT_URL, postData, success, failure); }), $('<button>', { + 'type': 'button', 'class': 'btn btn-default btn-xs', text: _TM['Cancel'] }).click(function() {
--- a/kallithea/templates/about.html Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/templates/about.html Mon Dec 12 23:01:11 2022 +0100 @@ -24,7 +24,13 @@ necessarily limited to the following:</p> <ul> - <li>Copyright © 2012–2021, Mads Kiilerich</li> + <li>Copyright © 2012–2022, Mads Kiilerich</li> + <li>Copyright © 2016–2017, 2020, 2022, Asterios Dimitriou</li> + <li>Copyright © 2019–2020, 2022, Manuel Jacob</li> + <li>Copyright © 2022, Jaime Marquínez Ferrándiz</li> + <li>Copyright © 2022, toras9000</li> + <li>Copyright © 2022, yzqzss</li> + <li>Copyright © 2022, МАН69К</li> <li>Copyright © 2014–2021, Thomas De Schampheleire</li> <li>Copyright © 2015–2017, 2019–2021, Étienne Gilli</li> <li>Copyright © 2018–2021, ssantos</li> @@ -35,10 +41,8 @@ <li>Copyright © 2021, Michalis</li> <li>Copyright © 2021, vs</li> <li>Copyright © 2021, Александр</li> - <li>Copyright © 2016–2017, 2020, Asterios Dimitriou</li> <li>Copyright © 2017–2020, Allan Nordhøy</li> <li>Copyright © 2017, 2020, Anton Schur</li> - <li>Copyright © 2019–2020, Manuel Jacob</li> <li>Copyright © 2020, Artem</li> <li>Copyright © 2020, David Ignjić</li> <li>Copyright © 2020, Dennis Fink</li>
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html Mon Dec 12 23:01:11 2022 +0100 @@ -1,6 +1,5 @@ ${h.form(url('edit_repo_group_perms', group_name=c.repo_group.group_name))} <div class="form"> - <div> <div> <table id="permissions_manage" class="table"> <tr> @@ -98,7 +97,6 @@ ${h.submit('save',_('Save'),class_="btn btn-default")} ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> - </div> </div> ${h.end_form()}
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Mon Dec 12 23:01:11 2022 +0100 @@ -9,6 +9,13 @@ </div> <div class="form-group"> + <label class="control-label" for="owner">${_('Owner')}:</label> + <div> + ${h.text('owner',class_='form-control', placeholder=_('Type name of user'))} + </div> + </div> + + <div class="form-group"> <label class="control-label" for="group_description">${_('Description')}:</label> <div> ${h.textarea('group_description',cols=23,rows=5,class_='form-control')} @@ -47,5 +54,6 @@ $("#parent_group_id").select2({ 'dropdownAutoWidth': true }); + SimpleUserAutoComplete($('#owner')); }); </script>
--- a/kallithea/templates/admin/repos/repo_add_base.html Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/templates/admin/repos/repo_add_base.html Mon Dec 12 23:01:11 2022 +0100 @@ -1,17 +1,22 @@ -## -*- coding: utf-8 -*- - ${h.form(url('repos'))} -<div class="form"> + <div class="form"> <div class="form-group"> <label class="control-label" for="repo_name">${_('Name')}:</label> <div> ${h.text('repo_name',class_='form-control')} </div> </div> - <div id="remote_clone" class="form-group"> + <div class="form-group"> + <label class="control-label" for="repo_type">${_('Type')}:</label> + <div> + ${h.select('repo_type','hg',c.backends,class_='form-control')} + <span class="help-block">${_('Type of repository to create.')}</span> + </div> + </div> + <div class="form-group"> <label class="control-label" for="clone_uri">${_('Clone remote repository')}:</label> <div> - ${h.text('clone_uri',class_='form-control')} + ${h.text('clone_uri',class_='form-control', placeholder=_('Repository URL'))} <span class="help-block"> ${_('Optional: URL of a remote repository. If set, the repository will be created as a clone from this URL.')} </span> @@ -39,16 +44,9 @@ </div> </div> <div class="form-group"> - <label class="control-label" for="repo_type">${_('Type')}:</label> - <div> - ${h.select('repo_type','hg',c.backends,class_='form-control')} - <span class="help-block">${_('Type of repository to create.')}</span> - </div> - </div> - <div class="form-group"> <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label> <div> - ${h.select('repo_landing_rev','',c.landing_revs,class_='form-control')} + ${h.select('repo_landing_rev',None,c.landing_revs,class_='form-control')} <span class="help-block">${_('Default revision for files page, downloads, full text search index and readme generation')}</span> </div> </div> @@ -60,14 +58,37 @@ </div> </div> <div class="form-group"> + <label class="control-label" for="repo_enable_statistics">${_('Enable statistics')}:</label> + <div> + ${h.checkbox('repo_enable_statistics',value="True")} + <span class="help-block">${_('Enable statistics window on summary page.')}</span> + </div> + </div> + <div class="form-group"> + <label class="control-label" for="repo_enable_downloads">${_('Enable downloads')}:</label> + <div> + ${h.checkbox('repo_enable_downloads',value="True")} + <span class="help-block">${_('Enable download menu on summary page.')}</span> + </div> + </div> + <div class="form-group"> <div class="buttons"> ${h.submit('add',_('Add'),class_="btn btn-default")} </div> </div> -</div> + </div> +${h.end_form()} + <script> 'use strict'; $(document).ready(function(){ + $('#repo_type').select2({ + 'minimumResultsForSearch': -1 + }); + $('#repo_group').select2({ + 'dropdownAutoWidth': true + }); + function setCopyPermsOption(group_val){ if(group_val != "-1"){ $('#copy_perms').show(); @@ -77,22 +98,14 @@ } } - $("#repo_group").select2({ - 'dropdownAutoWidth': true - }); - setCopyPermsOption($('#repo_group').val()); - $("#repo_group").on("change", function(e) { + $('#repo_group').on("change", function(e) { setCopyPermsOption(e.val); }); - $("#repo_type").select2({ - 'minimumResultsForSearch': -1 - }); - $("#repo_landing_rev").select2({ + $('#repo_landing_rev').select2({ 'minimumResultsForSearch': -1 }); $('#repo_name').focus(); }); </script> -${h.end_form()}
--- a/kallithea/templates/admin/repos/repo_edit_permissions.html Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/templates/admin/repos/repo_edit_permissions.html Mon Dec 12 23:01:11 2022 +0100 @@ -57,7 +57,9 @@ <td> <i class="icon-users"></i> %if h.HasPermissionAny('hg.admin')(): - <a href="${h.url('edit_users_group',id=g2p.users_group.users_group_id)}">${g2p.users_group.users_group_name}</a> + <a href="${h.url('edit_users_group',id=g2p.users_group.users_group_id)}"> + ${g2p.users_group.users_group_name} + </a> %else: ${g2p.users_group.users_group_name} %endif @@ -80,7 +82,7 @@ </tr> </table> </div> - <div class="form-group"> + <div class="buttons"> ${h.submit('save',_('Save'),class_="btn btn-default")} ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div>
--- a/kallithea/templates/admin/repos/repo_edit_settings.html Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/templates/admin/repos/repo_edit_settings.html Mon Dec 12 23:01:11 2022 +0100 @@ -1,115 +1,112 @@ ${h.form(url('update_repo', repo_name=c.repo_info.repo_name))} <div class="form"> - <div class="form-group"> - <label class="control-label" for="repo_name">${_('Name')}:</label> - <div> - ${h.text('repo_name',class_='form-control')} - </div> + <div class="form-group"> + <label class="control-label" for="repo_name">${_('Name')}:</label> + <div> + ${h.text('repo_name',class_='form-control')} + </div> + </div> + <div class="form-group"> + <label class="control-label" for="permanent_url">${_('Permanent URL')}:</label> + <div> + ${h.text('permanent_url',class_='form-control', readonly='1')} + <span class="help-block"> + ${_('''In case this repository is renamed or moved into another group the repository URL changes. + Using the above permanent URL guarantees that this repository always will be accessible on that URL. + This is useful for CI systems, or any other cases that you need to hardcode the URL into a 3rd party service.''')} + </span> + </div> + </div> + <div class="form-group"> + <label class="control-label" for="clone_uri">${_('Remote repository')}:</label> + <div> + ${h.text('clone_uri',class_='form-control', placeholder=_('Repository URL'))} + ${h.hidden('clone_uri_hidden', c.repo_info.clone_uri_hidden)} + <span class="help-block"> + ${_('Optional: URL of a remote repository. If set, the repository can be pulled from this URL.')} + </span> + </div> + </div> + <div class="form-group"> + <label class="control-label" for="repo_description">${_('Description')}:</label> + <div> + ${h.textarea('repo_description',class_='form-control')} + <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span> + </div> + </div> + <div class="form-group"> + <label class="control-label" for="repo_group">${_('Repository group')}:</label> + <div> + ${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> + <div class="form-group"> + <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label> + <div> + ${h.select('repo_landing_rev',None,c.landing_revs,class_='form-control')} + <span class="help-block">${_('Default revision for files page, downloads, full text search index and readme generation')}</span> + </div> + </div> + <div class="form-group"> + <label class="control-label" for="owner">${_('Owner')}:</label> + <div> + ${h.text('owner',class_='form-control', placeholder=_('Type name of user'))} + <span class="help-block">${_('Change owner of this repository.')}</span> + </div> + </div> + <div class="form-group"> + <label class="control-label" for="repo_private">${_('Private repository')}:</label> + <div> + ${h.checkbox('repo_private',value="True")} + <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span> + </div> + </div> + <div class="form-group"> + <label class="control-label" for="repo_enable_statistics">${_('Enable statistics')}:</label> + <div> + ${h.checkbox('repo_enable_statistics',value="True")} + <span class="help-block">${_('Enable statistics window on summary page.')}</span> + </div> + </div> + <div class="form-group"> + <label class="control-label" for="repo_enable_downloads">${_('Enable downloads')}:</label> + <div> + ${h.checkbox('repo_enable_downloads',value="True")} + <span class="help-block">${_('Enable download menu on summary page.')}</span> + </div> + </div> + + %if c.visual.repository_fields: + ## EXTRA FIELDS + %for field in c.repo_fields: <div class="form-group"> - <label class="control-label" for="permanent_url">${_('Permanent URL')}:</label> - <div> - ${h.text('permanent_url',class_='form-control', readonly='1')} - <span class="help-block"> - ${_('''In case this repository is renamed or moved into another group the repository URL changes. - Using the above permanent URL guarantees that this repository always will be accessible on that URL. - This is useful for CI systems, or any other cases that you need to hardcode the URL into a 3rd party service.''')} - </span> - </div> - </div> - <div class="form-group"> - <label class="control-label" for="clone_uri">${_('Remote repository')}:</label> + <label class="control-label" for="${field.field_key_prefixed}">${field.field_label} (${field.field_key}):</label> <div> - <div id="alter_clone_uri"> - ${h.text('clone_uri',class_='form-control', placeholder=_('Repository URL'))} - ${h.hidden('clone_uri_hidden', c.repo_info.clone_uri_hidden)} - </div> - <span id="alter_clone_uri_help_block" class="help-block"> - ${_('Optional: URL of a remote repository. If set, the repository can be pulled from this URL.')} - </span> - </div> - </div> - <div class="form-group"> - <label class="control-label" for="repo_group">${_('Repository group')}:</label> - <div> - ${h.select('repo_group','',c.repo_groups,class_='form-control')} - <span class="help-block">${_('Optionally select a group to put this repository into.')}</span> - </div> - </div> - <div class="form-group"> - <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label> - <div> - ${h.select('repo_landing_rev','',c.landing_revs,class_='form-control')} - <span class="help-block">${_('Default revision for files page, downloads, whoosh and readme')}</span> - </div> - </div> - <div class="form-group"> - <label class="control-label" for="owner">${_('Owner')}:</label> - <div> - ${h.text('owner',class_='form-control', placeholder=_('Type name of user'))} - <span class="help-block">${_('Change owner of this repository.')}</span> + ${h.text(field.field_key_prefixed, field.field_value, class_='form-control')} + %if field.field_desc: + <span class="help-block">${field.field_desc}</span> + %endif </div> </div> - <div class="form-group"> - <label class="control-label" for="repo_description">${_('Description')}:</label> - <div> - ${h.textarea('repo_description',class_='form-control')} - <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span> - </div> - </div> - - <div class="form-group"> - <label class="control-label" for="repo_private">${_('Private repository')}:</label> - <div> - ${h.checkbox('repo_private',value="True")} - <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span> - </div> - </div> - <div class="form-group"> - <label class="control-label" for="repo_enable_statistics">${_('Enable statistics')}:</label> - <div> - ${h.checkbox('repo_enable_statistics',value="True")} - <span class="help-block">${_('Enable statistics window on summary page.')}</span> - </div> + %endfor + %endif + <div class="form-group"> + <div class="buttons"> + ${h.submit('save',_('Save'),class_="btn btn-default")} + ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> - <div class="form-group"> - <label class="control-label" for="repo_enable_downloads">${_('Enable downloads')}:</label> - <div> - ${h.checkbox('repo_enable_downloads',value="True")} - <span class="help-block">${_('Enable download menu on summary page.')}</span> - </div> - </div> - - %if c.visual.repository_fields: - ## EXTRA FIELDS - %for field in c.repo_fields: - <div class="form-group"> - <label class="control-label" for="${field.field_key_prefixed}">${field.field_label} (${field.field_key}):</label> - <div> - ${h.text(field.field_key_prefixed, field.field_value, class_='form-control')} - %if field.field_desc: - <span class="help-block">${field.field_desc}</span> - %endif - </div> - </div> - %endfor - %endif - <div class="form-group"> - <div class="buttons"> - ${h.submit('save',_('Save'),class_="btn btn-default")} - ${h.reset('reset',_('Reset'),class_="btn btn-default")} - </div> - </div> + </div> </div> - ${h.end_form()} +${h.end_form()} <script> 'use strict'; $(document).ready(function(){ - $('#repo_landing_rev').select2({ + $('#repo_group').select2({ 'dropdownAutoWidth': true }); - $('#repo_group').select2({ + $('#repo_landing_rev').select2({ 'dropdownAutoWidth': true });
--- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html Mon Dec 12 23:01:11 2022 +0100 @@ -1,6 +1,5 @@ ${h.form(url('edit_user_group_perms_update', id=c.user_group.users_group_id))} <div class="form"> - <div> <div> <table id="permissions_manage" class="table"> <tr> @@ -31,7 +30,7 @@ <td> %if r2p.user.username !='default': <button type="button" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')"> - <i class="icon-minus-circled"></i>${_('Revoke')} + <i class="icon-minus-circled"></i>${_('Revoke')} </button> %endif </td> @@ -67,7 +66,7 @@ %endif </td> <td> - <button class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${g2p.user_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.user_group.users_group_name)}', '${g2p.user_group.users_group_name}')"> + <button type="button" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${g2p.user_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.user_group.users_group_name)}', '${g2p.user_group.users_group_name}')"> <i class="icon-minus-circled"></i>${_('Revoke')} </button> </td> @@ -77,7 +76,7 @@ <tr class="new_members last_new_member" id="add_perm_input"><td colspan="6"></td></tr> <tr> <td colspan="6"> - <button id="add_perm" class="btn btn-link btn-xs"> + <button type="button" id="add_perm" class="btn btn-link btn-xs"> <i class="icon-plus"></i>${_('Add new')} </button> </td> @@ -88,7 +87,6 @@ ${h.submit('save',_('Save'),class_="btn btn-default")} ${h.reset('reset',_('Reset'),class_="btn btn-default")} </div> - </div> </div> ${h.end_form()}
--- a/kallithea/templates/base/base.html Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/templates/base/base.html Mon Dec 12 23:01:11 2022 +0100 @@ -23,7 +23,7 @@ <a class="navbar-link" href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a>, %endif which is - <a class="navbar-link" href="${h.canonical_url('about')}#copyright">© 2010–2021 by various authors & licensed under GPLv3</a>. + <a class="navbar-link" href="${h.canonical_url('about')}#copyright">© 2010–2022 by various authors & licensed under GPLv3</a>. %if c.issues_url: – <a class="navbar-link" href="${c.issues_url}" target="_blank">${_('Support')}</a> %endif
--- a/kallithea/templates/changeset/diff_block.html Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/templates/changeset/diff_block.html Mon Dec 12 23:01:11 2022 +0100 @@ -4,7 +4,7 @@ cs_repo_name, cs_ref_name, cs_ref_type, cs_rev, file_diff_data)"> <div class="diff-collapse"> - <button data-target="${'diff-container-%s' % (id(file_diff_data))}" class="diff-collapse-button btn btn-link btn-sm">↑ ${_('Collapse Diff')} ↑</button> + <button type='button', data-target="${'diff-container-%s' % (id(file_diff_data))}" class="diff-collapse-button btn btn-link btn-sm">↑ ${_('Collapse Diff')} ↑</button> </div> %for id_fid, url_fid, op, a_filename, cs_filename, diff, stats in file_diff_data: ${diff_block_diffblock(id_fid, url_fid, op, diff,
--- a/kallithea/templates/data_table/_dt_elements.html Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/templates/data_table/_dt_elements.html Mon Dec 12 23:01:11 2022 +0100 @@ -70,7 +70,7 @@ <i class="icon-pencil"></i>${_('Edit')} </a> ${webutils.form(webutils.url('delete_repo', repo_name=repo_name))} - <button name="${'remove_%s' % repo_name}" class="btn btn-default btn-xs" + <button type="submit" name="${'remove_%s' % repo_name}" class="btn btn-default btn-xs" onclick="return confirm('${_('Confirm to delete this repository: %s') % repo_name}');"> <i class="icon-trashcan"></i>${_('Delete')} </button> @@ -92,7 +92,7 @@ <i class="icon-pencil"></i>${_('Edit')} </a> ${webutils.form(webutils.url('delete_user', id=user_id))} - <button id="${'remove_user_%s' % user_id}" name="${'remove_user_%s' % repo_name}" class="btn btn-default btn-xs" title="${_('Delete')}" + <button type="submit" id="${'remove_user_%s' % user_id}" name="${'remove_user_%s' % repo_name}" class="btn btn-default btn-xs" title="${_('Delete')}" onclick="return confirm('${_('Confirm to delete this user: %s') % username}');"> <i class="icon-trashcan"></i>${_('Delete')} </button> @@ -104,7 +104,7 @@ <i class="icon-pencil"></i>${_('Edit')} </a> ${webutils.form(webutils.url('delete_users_group', id=user_group_id))} - <button id="${'remove_group_%s' % user_group_id}" name="${'remove_user_%s' % repo_name}" class="btn btn-default btn-xs" title="${_('Delete')}" + <button type="submit" id="${'remove_group_%s' % user_group_id}" name="${'remove_user_%s' % repo_name}" class="btn btn-default btn-xs" title="${_('Delete')}" onclick="return confirm('${_('Confirm to delete this user group: %s') % user_group_name}');"> <i class="icon-trashcan"></i>${_('Delete')} </button> @@ -123,7 +123,7 @@ <i class="icon-pencil"></i>${_('Edit')} </a> ${webutils.form(webutils.url('delete_repo_group', group_name=repo_group_name))} - <button id="${'remove_%s' % repo_group_name}" name="${'remove_%s' % repo_group_name}" class="btn btn-default btn-xs" title="${_('Delete')}" + <button type="submit" id="${'remove_%s' % repo_group_name}" name="${'remove_%s' % repo_group_name}" class="btn btn-default btn-xs" title="${_('Delete')}" onclick="return confirm('${ungettext('Confirm to delete this group: %s with %s repository','Confirm to delete this group: %s with %s repositories',gr_count) % (repo_group_name, gr_count)}')"> <i class="icon-trashcan"></i>${_('Delete')} </button>
--- a/kallithea/tests/api/api_base.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/tests/api/api_base.py Mon Dec 12 23:01:11 2022 +0100 @@ -16,6 +16,7 @@ Tests for the JSON-RPC web api. """ +import datetime import os import random import re @@ -259,7 +260,7 @@ self._compare_error(id_, expected, given=response.body) def test_api_pull_remote(self): - # Note: pulling from local repos is a mis-feature - it will bypass access control + # Note: pulling from local repos is a misfeature - it will bypass access control # ... but ok, if the path already has been set in the database repo_name = 'test_pull' r = fixture.create_repo(repo_name, repo_type=self.REPO_TYPE) @@ -783,24 +784,73 @@ finally: RepoModel().revoke_user_permission(self.REPO, self.TEST_USER_LOGIN) - def test_api_create_repo(self): - repo_name = 'api-repo' + @base.parametrize('changing_attr,updates', [ + ('owner', {'owner': base.TEST_USER_REGULAR_LOGIN}), + ('description', {'description': 'new description'}), + ('clone_uri', {'clone_uri': 'http://example.com/repo'}), # will fail - pulling from non-existing repo should fail + ('clone_uri', {'clone_uri': '/repo'}), # will fail - pulling from local repo was a misfeature - it would bypass access control + ('clone_uri', {'clone_uri': None}), + ('landing_rev', {'landing_rev': 'branch:master'}), + ('private', {'private': True}), + ('enable_statistics', {'enable_statistics': True}), + ('enable_downloads', {'enable_downloads': True}), + ('repo_group', {'group': 'test_group_for_update'}), + ]) + def test_api_create_repo(self, changing_attr, updates): + repo_name = repo_name_full = 'new_repo' + + if changing_attr == 'repo_group': + group_name = updates['group'] + fixture.create_repo_group(group_name) + repo_name_full = '/'.join([group_name, repo_name]) + updates = {} + id_, params = _build_data(self.apikey, 'create_repo', - repo_name=repo_name, - owner=base.TEST_USER_ADMIN_LOGIN, - repo_type=self.REPO_TYPE, - ) + repo_type=self.REPO_TYPE, repo_name=repo_name_full, **updates) response = api_call(self, params) - repo = RepoModel().get_by_repo_name(repo_name) - assert repo is not None - ret = { - 'msg': 'Created new repository `%s`' % repo_name, - 'success': True, - } - expected = ret - self._compare_ok(id_, expected, given=response.body) - fixture.destroy_repo(repo_name) + try: + expected = { + 'msg': 'Created new repository `%s`' % repo_name_full, + 'success': True} + if changing_attr == 'clone_uri' and updates['clone_uri']: + expected = 'failed to create repository `%s`' % repo_name + self._compare_error(id_, expected, given=response.body) + return + else: + self._compare_ok(id_, expected, given=response.body) + + repo = db.Repository.get_by_repo_name(repo_name_full) + assert repo is not None + + expected_data = { + 'clone_uri': None, + 'created_on': repo.created_on, + 'description': repo_name, + 'enable_downloads': False, + 'enable_statistics': False, + 'fork_of': None, + 'landing_rev': ['rev', 'tip'], + 'last_changeset': {'author': '', + 'date': datetime.datetime(1970, 1, 1, 0, 0), + 'message': '', + 'raw_id': '0000000000000000000000000000000000000000', + 'revision': -1, + 'short_id': '000000000000'}, + 'owner': 'test_admin', + 'private': False, + 'repo_id': repo.repo_id, + 'repo_name': repo_name_full, + 'repo_type': self.REPO_TYPE, + } + expected_data.update(updates) + if changing_attr == 'landing_rev': + expected_data['landing_rev'] = expected_data['landing_rev'].split(':', 1) + assert repo.get_api_data() == expected_data + finally: + fixture.destroy_repo(repo_name_full) + if changing_attr == 'repo_group': + fixture.destroy_repo_group(group_name) @base.parametrize('repo_name', [ '', @@ -826,7 +876,7 @@ fixture.destroy_repo(repo_name) def test_api_create_repo_clone_uri_local(self): - # cloning from local repos was a mis-feature - it would bypass access control + # cloning from local repos was a misfeature - it would bypass access control # TODO: introduce other test coverage of actual remote cloning clone_uri = os.path.join(base.TESTS_TMP_PATH, self.REPO) repo_name = 'api-repo' @@ -1003,9 +1053,10 @@ ('owner', {'owner': base.TEST_USER_REGULAR_LOGIN}), ('description', {'description': 'new description'}), ('clone_uri', {'clone_uri': 'http://example.com/repo'}), # will fail - pulling from non-existing repo should fail - ('clone_uri', {'clone_uri': '/repo'}), # will fail - pulling from local repo was a mis-feature - it would bypass access control + ('clone_uri', {'clone_uri': '/repo'}), # will fail - pulling from local repo was a misfeature - it would bypass access control ('clone_uri', {'clone_uri': None}), ('landing_rev', {'landing_rev': 'branch:master'}), + ('private', {'private': True}), ('enable_statistics', {'enable_statistics': True}), ('enable_downloads', {'enable_downloads': True}), ('name', {'name': 'new_repo_name'}), @@ -1019,20 +1070,32 @@ id_, params = _build_data(self.apikey, 'update_repo', repoid=repo_name, **updates) - response = api_call(self, params) + if changing_attr == 'name': repo_name = updates['name'] if changing_attr == 'repo_group': repo_name = '/'.join([updates['group'], repo_name]) + expected = { + 'msg': 'updated repo ID:%s %s' % (repo.repo_id, repo_name), + 'repository': repo.get_api_data() + } + expected['repository'].update(updates) + if changing_attr == 'clone_uri' and updates['clone_uri'] is None: + expected['repository']['clone_uri'] = '' + if changing_attr == 'landing_rev': + expected['repository']['landing_rev'] = expected['repository']['landing_rev'].split(':', 1) + if changing_attr == 'name': + expected['repository']['repo_name'] = expected['repository'].pop('name') + if changing_attr == 'repo_group': + expected['repository']['repo_name'] = expected['repository'].pop('group') + '/' + repo.repo_name + + response = api_call(self, params) + try: if changing_attr == 'clone_uri' and updates['clone_uri']: expected = 'failed to update repo `%s`' % repo_name self._compare_error(id_, expected, given=response.body) else: - expected = { - 'msg': 'updated repo ID:%s %s' % (repo.repo_id, repo_name), - 'repository': repo.get_api_data() - } self._compare_ok(id_, expected, given=response.body) finally: fixture.destroy_repo(repo_name) @@ -1043,7 +1106,7 @@ ('owner', {'owner': base.TEST_USER_REGULAR_LOGIN}), ('description', {'description': 'new description'}), ('clone_uri', {'clone_uri': 'http://example.com/repo'}), # will fail - pulling from non-existing repo should fail - ('clone_uri', {'clone_uri': '/repo'}), # will fail - pulling from local repo was a mis-feature - it would bypass access control + ('clone_uri', {'clone_uri': '/repo'}), # will fail - pulling from local repo was a misfeature - it would bypass access control ('clone_uri', {'clone_uri': None}), ('landing_rev', {'landing_rev': 'branch:master'}), ('enable_statistics', {'enable_statistics': True}), @@ -1787,6 +1850,47 @@ ) self._compare_error(id_, expected, given=response.body) + @base.parametrize('changing_attr,updates', [ + ('owner', {'owner': base.TEST_USER_REGULAR_LOGIN}), + ('description', {'description': 'new description'}), + ('group_name', {'group_name': 'new_repo_name'}), + ('parent', {'parent': 'test_group_for_update'}), + ]) + def test_api_update_repo_group(self, changing_attr, updates): + group_name = 'lololo' + repo_group = fixture.create_repo_group(group_name) + + new_group_name = group_name + if changing_attr == 'group_name': + assert repo_group.parent_group_id is None # lazy assumption for this test + new_group_name = updates['group_name'] + if changing_attr == 'parent': + new_group_name = '/'.join([updates['parent'], group_name.rsplit('/', 1)[-1]]) + + expected = { + 'msg': 'updated repository group ID:%s %s' % (repo_group.group_id, new_group_name), + 'repo_group': repo_group.get_api_data() + } + expected['repo_group'].update(updates) + if 'description' in updates: + expected['repo_group']['group_description'] = expected['repo_group'].pop('description') + + if changing_attr == 'parent': + new_parent = fixture.create_repo_group(updates['parent']) + expected['repo_group']['parent_group'] = expected['repo_group'].pop('parent') + expected['repo_group']['group_name'] = new_group_name + + id_, params = _build_data(self.apikey, 'update_repo_group', + repogroupid=group_name, **updates) + response = api_call(self, params) + + try: + self._compare_ok(id_, expected, given=response.body) + finally: + if changing_attr == 'parent': + fixture.destroy_repo_group(new_parent.group_id) + fixture.destroy_repo_group(new_group_name) + @base.parametrize('name,perm,apply_to_children', [ ('none', 'group.none', 'none'), ('read', 'group.read', 'none'),
--- a/kallithea/tests/fixture.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/tests/fixture.py Mon Dec 12 23:01:11 2022 +0100 @@ -95,6 +95,8 @@ repo_group='-1', repo_description='DESC', repo_private=False, + repo_enable_statistics=False, + repo_enable_downloads=False, repo_landing_rev='rev:tip', repo_copy_permissions=False, repo_state=db.Repository.STATE_CREATED,
--- a/kallithea/tests/functional/test_admin_repo_groups.py Mon Dec 12 18:28:10 2022 +0100 +++ b/kallithea/tests/functional/test_admin_repo_groups.py Mon Dec 12 23:01:11 2022 +0100 @@ -1,26 +1,151 @@ -from kallithea.model import meta +from kallithea.model import db, meta from kallithea.model.repo_group import RepoGroupModel -from kallithea.tests.base import TestController, url +from kallithea.tests import base from kallithea.tests.fixture import Fixture fixture = Fixture() -class TestRepoGroupsController(TestController): +class TestRepoGroupsController(base.TestController): + + def test_index(self): + self.log_user() + response = self.app.get(base.url('repos_groups')) + response.mustcontain('"records": []') + + def test_new(self): + self.log_user() + response = self.app.get(base.url('new_repos_group')) + + def test_create(self): + self.log_user() + + group_name = 'foo' + + # creation with form error + response = self.app.post(base.url('repos_groups'), + {'group_name': group_name, + '_session_csrf_secret_token': self.session_csrf_secret_token()}) + response.mustcontain('name="group_name" type="text" value="%s"' % group_name) + response.mustcontain('<!-- for: group_description -->') + + # creation + response = self.app.post(base.url('repos_groups'), + {'group_name': group_name, + 'group_description': 'lala', + 'parent_group_id': '-1', + 'group_copy_permissions': 'True', + '_session_csrf_secret_token': self.session_csrf_secret_token()}) + self.checkSessionFlash(response, 'Created repository group %s' % group_name) + + # edit form + response = self.app.get(base.url('edit_repo_group', group_name=group_name)) + response.mustcontain('>lala<') + + # edit with form error + response = self.app.post(base.url('update_repos_group', group_name=group_name), + {'group_name': group_name, + '_session_csrf_secret_token': self.session_csrf_secret_token()}) + response.mustcontain('name="group_name" type="text" value="%s"' % group_name) + response.mustcontain('<!-- for: group_description -->') + + # edit + response = self.app.post(base.url('update_repos_group', group_name=group_name), + {'group_name': group_name, + 'owner': base.TEST_USER_REGULAR2_LOGIN, + 'group_description': 'lolo', + '_session_csrf_secret_token': self.session_csrf_secret_token()}) + self.checkSessionFlash(response, 'Updated repository group %s' % group_name) + response = response.follow() + response.mustcontain('name="group_name" type="text" value="%s"' % group_name) + response.mustcontain(no='<!-- for: group_description -->') + response.mustcontain('>lolo<') + + # listing + response = self.app.get(base.url('repos_groups')) + response.mustcontain('raw_name": "%s"' % group_name) + + # show + response = self.app.get(base.url('repos_group', group_name=group_name)) + response.mustcontain('href="/_admin/repo_groups/%s/edit"' % group_name) + + # show ignores extra trailing slashes in the URL + response = self.app.get(base.url('repos_group', group_name='%s//' % group_name)) + response.mustcontain('href="/_admin/repo_groups/%s/edit"' % group_name) + + # delete + response = self.app.post(base.url('delete_repo_group', group_name=group_name), + {'_session_csrf_secret_token': self.session_csrf_secret_token()}) + self.checkSessionFlash(response, 'Removed repository group %s' % group_name) + + def test_new_by_regular_user(self): + self.log_user(base.TEST_USER_REGULAR_LOGIN, base.TEST_USER_REGULAR_PASS) + response = self.app.get(base.url('new_repos_group'), status=403) def test_case_insensitivity(self): self.log_user() group_name = 'newgroup' - response = self.app.post(url('repos_groups'), + response = self.app.post(base.url('repos_groups'), fixture._get_repo_group_create_params(group_name=group_name, _session_csrf_secret_token=self.session_csrf_secret_token())) # try to create repo group with swapped case swapped_group_name = group_name.swapcase() - response = self.app.post(url('repos_groups'), + response = self.app.post(base.url('repos_groups'), fixture._get_repo_group_create_params(group_name=swapped_group_name, _session_csrf_secret_token=self.session_csrf_secret_token())) response.mustcontain('already exists') RepoGroupModel().delete(group_name) meta.Session().commit() + + def test_subgroup_deletion(self): + self.log_user() + parent = None + parent_name = 'parent' + sub = None + sub_name = 'sub' + sub_path = 'parent/sub' + + try: + # create parent group + assert db.RepoGroup.guess_instance(parent_name) is None + response = self.app.post( + base.url('repos_groups'), + fixture._get_repo_group_create_params( + group_name=parent_name, + _session_csrf_secret_token=self.session_csrf_secret_token() + ) + ) + parent = db.RepoGroup.guess_instance(parent_name) + assert parent is not None + + # create sub group + assert db.RepoGroup.guess_instance(sub_path) is None + response = self.app.post( + base.url('repos_groups'), + fixture._get_repo_group_create_params( + group_name=sub_name, + parent_group_id=parent.group_id, + _session_csrf_secret_token=self.session_csrf_secret_token() + ) + ) + sub = db.RepoGroup.guess_instance(sub_path) + assert sub is not None + + # delete sub group + response = self.app.post( + base.url('delete_repo_group', group_name=sub_path), + params={ + '_session_csrf_secret_token': self.session_csrf_secret_token() + }, + ) + sub = db.RepoGroup.guess_instance(sub_path) + assert sub is None + + finally: + if sub: + RepoGroupModel().delete(sub) + if parent: + RepoGroupModel().delete(parent) + meta.Session().commit()
--- a/kallithea/tests/functional/test_repo_groups.py Mon Dec 12 18:28:10 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -from kallithea.tests import base - - -class TestRepoGroupsController(base.TestController): - - def test_index(self): - self.log_user() - response = self.app.get(base.url('repos_groups')) - response.mustcontain('"records": []') - - def test_new(self): - self.log_user() - response = self.app.get(base.url('new_repos_group')) - - def test_create(self): - self.log_user() - - group_name = 'foo' - - # creation with form error - response = self.app.post(base.url('repos_groups'), - {'group_name': group_name, - '_session_csrf_secret_token': self.session_csrf_secret_token()}) - response.mustcontain('name="group_name" type="text" value="%s"' % group_name) - response.mustcontain('<!-- for: group_description -->') - - # creation - response = self.app.post(base.url('repos_groups'), - {'group_name': group_name, - 'group_description': 'lala', - 'parent_group_id': '-1', - 'group_copy_permissions': 'True', - '_session_csrf_secret_token': self.session_csrf_secret_token()}) - self.checkSessionFlash(response, 'Created repository group %s' % group_name) - - # edit form - response = self.app.get(base.url('edit_repo_group', group_name=group_name)) - response.mustcontain('>lala<') - - # edit with form error - response = self.app.post(base.url('update_repos_group', group_name=group_name), - {'group_name': group_name, - '_session_csrf_secret_token': self.session_csrf_secret_token()}) - response.mustcontain('name="group_name" type="text" value="%s"' % group_name) - response.mustcontain('<!-- for: group_description -->') - - # edit - response = self.app.post(base.url('update_repos_group', group_name=group_name), - {'group_name': group_name, - 'group_description': 'lolo', - '_session_csrf_secret_token': self.session_csrf_secret_token()}) - self.checkSessionFlash(response, 'Updated repository group %s' % group_name) - response = response.follow() - response.mustcontain('name="group_name" type="text" value="%s"' % group_name) - response.mustcontain(no='<!-- for: group_description -->') - response.mustcontain('>lolo<') - - # listing - response = self.app.get(base.url('repos_groups')) - response.mustcontain('raw_name": "%s"' % group_name) - - # show - response = self.app.get(base.url('repos_group', group_name=group_name)) - response.mustcontain('href="/_admin/repo_groups/%s/edit"' % group_name) - - # show ignores extra trailing slashes in the URL - response = self.app.get(base.url('repos_group', group_name='%s//' % group_name)) - response.mustcontain('href="/_admin/repo_groups/%s/edit"' % group_name) - - # delete - response = self.app.post(base.url('delete_repo_group', group_name=group_name), - {'_session_csrf_secret_token': self.session_csrf_secret_token()}) - self.checkSessionFlash(response, 'Removed repository group %s' % group_name) - - def test_new_by_regular_user(self): - self.log_user(base.TEST_USER_REGULAR_LOGIN, base.TEST_USER_REGULAR_PASS) - response = self.app.get(base.url('new_repos_group'), status=403)
--- a/setup.py Mon Dec 12 18:28:10 2022 +0100 +++ b/setup.py Mon Dec 12 23:01:11 2022 +0100 @@ -50,7 +50,7 @@ "tgext.routes >= 0.2.0, < 1", "Beaker >= 1.10.1, < 2", "WebHelpers2 >= 2.0, < 2.1", - "FormEncode >= 1.3.1, < 1.4", + "FormEncode >= 1.3.1, < 2.1", "SQLAlchemy >= 1.2.9, < 1.4", "Mako >= 0.9.1, < 1.2", "Pygments >= 2.2.0, < 2.7", @@ -63,10 +63,10 @@ "URLObject >= 2.3.4, < 2.5", "Routes >= 2.0, < 2.5", "dulwich >= 0.19.0, < 0.20", - "mercurial >= 5.2, < 5.9", + "mercurial >= 5.2, < 6.2", "decorator >= 4.2.1, < 4.5", "Paste >= 2.0.3, < 3.5", - "bleach >= 3.0, < 3.1.4", + "bleach >= 3.2, < 4.2", "Click >= 7.0, < 8", "ipaddr >= 2.2.0, < 2.3", "paginate >= 0.5, < 0.6",