kallithea Changeset - b2c3d4568a5f

Changeset - b2c3d4568a5f

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 36 0

Mads Kiilerich (mads) - 3 years ago 2023-03-31 21:29:14
mads@kiilerich.com

Merge stable

27 files changed:

CONTRIBUTORS

docs/api/api.rst

218

docs/conf.py

kallithea/controllers/admin/repo_groups.py

kallithea/controllers/api/api.py

519

kallithea/controllers/pullrequests.py

kallithea/i18n/be/LC_MESSAGES/kallithea.po

kallithea/i18n/de/LC_MESSAGES/kallithea.po

kallithea/i18n/el/LC_MESSAGES/kallithea.po

125

kallithea/i18n/es/LC_MESSAGES/kallithea.po

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

109

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po

kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

kallithea/i18n/pt/LC_MESSAGES/kallithea.po

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

kallithea/i18n/uk/LC_MESSAGES/kallithea.po

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

kallithea/model/db.py

kallithea/model/forms.py

kallithea/model/repo.py

kallithea/model/repo_group.py

kallithea/templates/about.html

kallithea/templates/admin/repo_groups/repo_group_edit_settings.html

kallithea/templates/admin/repos/repo_add_base.html

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)

CONTRIBUTORS

➞

Show inline comments

 List of contributors to Kallithea project:
     Mads Kiilerich <mads@kiilerich.com> 2016-2023
     Manuel Jacob <me@manueljacob.de> 2019-2020 2022-2023
     Mathias De Mare <mathias.de_mare@nokia.com> 2023
     Asterios Dimitriou <steve@pci.gr> 2016-2017 2020 2022
     Jaime Marquínez Ferrándiz <weblate@jregistros.fastmail.net> 2022
     Louis Bertrand <louis.bertrand@durhamcollege.ca> 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
     fresh <fresh190@protonmail.com> 2020-2021
     robertus <robertuss12@gmail.com> 2020-2021
     Eugenia Russell <eugenia.russell2019@gmail.com> 2021
     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
     J. Lavoie <j.lavoie@net-c.ca> 2020
     Ross Thomas <ross@lns-nevasoft.com> 2020
     Tim Ooms <tatankat@users.noreply.github.com> 2020
     Andrej Shadura <andrew@shadura.me> 2012 2014-2017 2019
     Étienne Gilli <etienne.gilli@gmail.com> 2015-2017 2019
     Adi Kriegisch <adi@cg.tuwien.ac.at> 2019
     Danni Randeris <danniranderis@gmail.com> 2019
     Edmund Wong <ewong@crazy-cat.org> 2019
     Elizabeth Sherrock <lizzyd710@gmail.com> 2019

docs/api/api.rst

➞

Show inline comments

@@ @@ -14,25 +14,25 @@ API keys @@
 Every Kallithea user automatically receives an API key, which they can
 view under "My Account". On this page, API keys can also be revoked, and
 additional API keys can be generated.
 API access
 ----------
 Clients must send JSON encoded JSON-RPC requests::
+    {
         "id: "<id>",
+        "id": "<id>",
         "api_key": "<api_key>",
         "method": "<method_name>",
         "args": {"<arg_key>": "<arg_val>"}
+    }
 For example, to pull to a local "CPython" mirror using curl::
     curl https://kallithea.example.com/_admin/api -X POST -H 'content-type:text/plain' \
         --data-binary '{"id":1,"api_key":"xe7cdb2v278e4evbdf5vs04v832v0efvcbcve4a3","method":"pull","args":{"repoid":"CPython"}}'
 In general, provide
  - *id*, a value of any type, can be used to match the response with the request that it is replying to.
@@ @@ -166,41 +166,40 @@ get_ip @@
 ^^^^^^
 Return IP address as seen from Kallithea server, together with all
 defined IP addresses for given user.
 This command can only be executed using the api_key of a user with admin rights.
 INPUT::
     id : <id_for_response>
     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>",
+                 "ip_addr_server" : <ip_from_client>",
                  "user_ips": [
+                                {
                                    "ip_addr": "<ip_with_mask>",
-                                   "ip_range": ["<start_ip>", "<end_ip>"],
+                                   "ip_range" : ["<start_ip>", "<end_ip>"]
                                 },
                                 ...
+                             ]
+             }
     error :  null
 get_user
 ^^^^^^^^
 Get a user by username or userid. The result is empty if user can't be found.
 If userid param is skipped, it is set to id of user who is calling this method.
 Any userid can be specified when the command is executed using the api_key of a user with admin rights.
 Regular users can only specify their own userid.
 INPUT::
@@ @@ -216,34 +215,34 @@ OUTPUT:: @@
     id : <id_given_in_input>
     result: None if user does not exist or
+            {
                 "user_id" :     "<user_id>",
                 "api_key" :     "<api_key>",
                 "username" :    "<username>",
                 "firstname":    "<firstname>",
                 "lastname" :    "<lastname>",
                 "email" :       "<email>",
                 "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>",
                 "permissions": {
                     "global": ["hg.create.repository",
                                "repository.read",
                                "hg.register.manual_activate"],
                     "repositories": {"repo1": "repository.none"},
                     "repositories_groups": {"Group1": "group.read"}
-                 },
+                 }
+            }
     error:  null
 get_users
 ^^^^^^^^^
 List all existing users.
 This command can only be executed using the api_key of a user with admin rights.
 INPUT::
     id : <id_for_response>
@@ @@ -256,27 +255,27 @@ OUTPUT:: @@
     id : <id_given_in_input>
     result: [
+              {
                 "user_id" :     "<user_id>",
                 "api_key" :     "<api_key>",
                 "username" :    "<username>",
                 "firstname":    "<firstname>",
                 "lastname" :    "<lastname>",
                 "email" :       "<email>",
                 "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
 .. _create-user:
 create_user
 ^^^^^^^^^^^
 Create new user.
 This command can only be executed using the api_key of a user with admin rights.
@@ @@ -301,28 +300,28 @@ OUTPUT:: @@
     id : <id_given_in_input>
     result: {
               "msg" : "created new user `<username>`",
               "user": {
                 "user_id" :  "<user_id>",
                 "username" : "<username>",
                 "firstname": "<firstname>",
                 "lastname" : "<lastname>",
                 "email" :    "<email>",
                 "emails":    "<list_of_all_additional_emails>",
                 "active" :   "<bool>",
-                "admin" :    "<bool>",
+                "admin" :    "<bool>",
                 "ldap_dn" :  "<ldap_dn>",
                 "last_login": "<last_login>",
               },
                 "last_login": "<last_login>"
+              }
+            }
     error:  null
 Example::
     kallithea-api create_user username:bent email:bent@example.com firstname:Bent lastname:Bentsen extern_type:ldap extern_name:uid=bent,dc=example,dc=com
 update_user
 ^^^^^^^^^^^
 Update the given user if such user exists.
 This command can only be executed using the api_key of a user with admin rights.
@@ @@ -349,44 +348,44 @@ OUTPUT:: @@
     id : <id_given_in_input>
     result: {
               "msg" : "updated user ID:<userid> <username>",
               "user": {
                 "user_id" :  "<user_id>",
                 "api_key" :  "<api_key>",
                 "username" : "<username>",
                 "firstname": "<firstname>",
                 "lastname" : "<lastname>",
                 "email" :    "<email>",
                 "emails":    "<list_of_all_additional_emails>",
                 "active" :   "<bool>",
-                "admin" :    "<bool>",
+                "admin" :    "<bool>",
                 "ldap_dn" :  "<ldap_dn>",
                 "last_login": "<last_login>",
               },
                 "last_login": "<last_login>"
+              }
+            }
     error:  null
 delete_user
 ^^^^^^^^^^^
 Delete the given user if such a user exists.
 This command can only be executed using the api_key of a user with admin rights.
 INPUT::
     id : <id_for_response>
     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: {
               "msg" : "deleted user ID:<userid> <username>",
               "user": null
+            }
     error:  null
 get_user_group
@@ @@ -413,27 +412,27 @@ OUTPUT:: @@
                "group_name" :     "<groupname>",
                "active":          "<bool>",
                "members" :  [
+                              {
                                 "user_id" :  "<user_id>",
                                 "api_key" :  "<api_key>",
                                 "username" : "<username>",
                                 "firstname": "<firstname>",
                                 "lastname" : "<lastname>",
                                 "email" :    "<email>",
                                 "emails":    "<list_of_all_additional_emails>",
                                 "active" :   "<bool>",
-                                "admin" :    "<bool>",
+                                "admin" :    "<bool>",
                                 "ldap_dn" :  "<ldap_dn>",
-                                "last_login": "<last_login>",
                                 "last_login": "<last_login>"
                               },
                               …
+                            ]
+             }
     error : null
 get_user_groups
 ^^^^^^^^^^^^^^^
 List all existing user groups.
 This command can only be executed using the api_key of a user with admin rights.
@@ @@ -442,25 +441,25 @@ INPUT:: @@
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "get_user_groups"
     args :    { }
 OUTPUT::
     id : <id_given_in_input>
     result : [
+               {
                "users_group_id" : "<id>",
                "group_name" :     "<groupname>",
-               "active":          "<bool>",
+               "active" :         "<bool>"
                },
                …
+              ]
     error : null
 create_user_group
 ^^^^^^^^^^^^^^^^^
 Create a new user group.
 This command can only be executed using the api_key of a user with admin rights.
 INPUT::
@@ @@ -473,109 +472,270 @@ INPUT:: @@
                 "owner" :     "<owner_name_or_id = Optional(=apiuser)>",
                 "active":     "<bool> = Optional(True)"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result: {
               "msg": "created new user group `<groupname>`",
               "users_group": {
                      "users_group_id" : "<id>",
                      "group_name" :     "<groupname>",
                      "active":          "<bool>",
                },
                      "active" :         "<bool>"
+               }
+            }
     error:  null
 add_user_to_user_group
 ^^^^^^^^^^^^^^^^^^^^^^
-Adds a user to a user group. If the user already is in that group, success will be
+Add a user to a user group. If the user already is in that group, success will be
 ``false``.
 This command can only be executed using the api_key of a user with admin rights.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "add_user_user_group"
     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
+              "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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Remove a user from a user group. If the user isn't in the given group, success will
 be ``false``.
 This command can only be executed using the api_key of a user with admin rights.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "remove_user_from_user_group"
     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
 get_repo_group
 ^^^^^^^^^^^^^^
 Get an existing repository group.
 This command can only be executed using the api_key of a user with admin rights.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "get_repo_group"
     args :    {
                 "repogroupid" : "<repo group id or name>"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result :
+               {
                "group_id" :          "<id>",
                "group_name" :        "<groupname>",
                "group_description" : "<groupdescription>",
                "parent_group" :      "<groupid>"|null,
                "repositories" :      "<list_of_all_repo_names_in_group>",
                "owner" :             "<owner>",
                "members" :           [
+                                       {
                                          "name" : "<name>",
                                          "type" : "user",
                                          "permission" : "group.(none|read|write|admin)"
                                        },
+                                       {
                                          "name" : "<name>",
                                          "type" : "user_group",
                                          "permission" : "group.(none|read|write|admin)"
                                        },
                                        …
+                                     ]
                },
     error : null
 get_repo_groups
 ^^^^^^^^^^^^^^^
 List all existing repository groups.
 This command can only be executed using the api_key of a user with admin rights.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "get_repo_groups"
     args :    { }
 OUTPUT::
     id : <id_given_in_input>
     result : [
+               {
                "group_id" :          "<id>",
                "group_name" :        "<groupname>",
                "group_description" : "<groupdescription>",
                "parent_group" :      "<groupid>"|null,
                "repositories" :      "<list_of_all_repo_names_in_group>",
                "owner" :             "<owner>"
                },
                …
+              ]
     error : null
 create_repo_group
 ^^^^^^^^^^^^^^^^^
 Create a new repository group.
 This command can only be executed using the api_key of a user with admin rights.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "create_repo_group"
     args :    {
                 "group_name" :       "<group_name>",
                 "description" :      "<description> = Optional("")",
                 "owner" :            "<username or user_id> = Optional(None)",
                 "parent" :           "<reponame or id> = Optional(None)",
                 "copy_permissions" : "<bool> = Optional(False)"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result : {
                 "msg" : "created new repo group `<group_name>`",
                 "repo_group" : {
                                  "group_id" :          <id>,
                                  "group_name" :        "<parent_group>/<group_name>",
                                  "group_description" : "<description>",
                                  "parent_group" :      <id>|null,
                                  "repositories" :      <list of repositories>,
                                  "owner" :             "<user_name>"
+                                }
 update_repo_group
 ^^^^^^^^^^^^^^^^^
 Update a repository group.
 This command can only be executed using the api_key of a user with admin rights.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "update_repo_group"
     args :    {
                 "repogroupid" :         "<id>",
                 "group_name" :       "<group_name> = Optional(None)",
                 "description" :      "<description> = Optional(None)",
                 "owner" :            "<username or user_id> = Optional(None)",
                 "parent" :           "<reponame or id> = Optional(None)"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result : {
                 "msg" : "updated repository group ID:<id> <group_name>",
                 "repo_group" : {
                                  "group_id" :          <id>,
                                  "group_name" :        "<parent_group>/<group_name>",
                                  "group_description" : "<description>",
                                  "parent_group" :      <id>|null,
                                  "repositories" :      <list of repositories>,
                                  "owner" :             "<user_name>"
+                                }
 delete_repo_group
 ^^^^^^^^^^^^^^^^^
 Delete a repository group.
 This command can only be executed using the api_key of a user with admin rights.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "delete_repo_group"
     args :    {
                 "repogroupid" : "<id>"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result : {
                 "msg" : "deleted repo group ID:<id> <group_name>",
                 "repo_group" : null
+              }
 get_repo
 ^^^^^^^^
 Get an existing repository by its name or repository_id. Members will contain
 either users_group or users associated to that repository.
 This command can only be executed using the api_key of a user with admin rights,
 or that of a regular user with at least read access to the repository.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "get_repo"
     args:     {
                 "repoid" : "<reponame or repo_id>",
                 "with_revision_names": "<bool> = Optional(False)",
-                "with_pullrequests": "<bool> = Optional(False)",
+                "with_pullrequests" : "<bool> = Optional(False)"
+              }
 OUTPUT::
     id : <id_given_in_input>
     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_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>",
@@ @@ -587,25 +747,25 @@ OUTPUT:: @@
                 "fork_of":           "<name_of_fork_parent>",
                 "members" :     [
+                                  {
                                     "type":        "user",
                                     "user_id" :    "<user_id>",
                                     "api_key" :    "<api_key>",
                                     "username" :   "<username>",
                                     "firstname":   "<firstname>",
                                     "lastname" :   "<lastname>",
                                     "email" :      "<email>",
                                     "emails":      "<list_of_all_additional_emails>",
                                     "active" :     "<bool>",
-                                    "admin" :      "<bool>",
+                                    "admin" :      "<bool>",
                                     "ldap_dn" :    "<ldap_dn>",
                                     "last_login":  "<last_login>",
                                     "permission" : "repository.(read|write|admin)"
                                   },
                                   …
+                                  {
                                     "type":      "users_group",
                                     "id" :       "<usersgroupid>",
                                     "name" :     "<usersgroupname>",
                                     "active":    "<bool>",
                                     "permission" : "repository.(read|write|admin)"
                                   },
@@ @@ -613,27 +773,27 @@ OUTPUT:: @@
                                 ],
                  "followers":   [
+                                  {
                                     "user_id" :     "<user_id>",
                                     "username" :    "<username>",
                                     "api_key" :     "<api_key>",
                                     "firstname":    "<firstname>",
                                     "lastname" :    "<lastname>",
                                     "email" :       "<email>",
                                     "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>",
                             ...
                          },
                  "branches": {
                             "<branchname>": "<raw_id>",
                             ...
                          },
@@ @@ -642,44 +802,44 @@ OUTPUT:: @@
                             ...
                          },
                 <if with_pullrequests == True>
                 "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": [
+                      {
-                        "username": "<user_id>",
+                        "username" : "<user_id>"
                       },
                       ...
                     ],
                     "org_repo_url": "<repo_url>",
                     "org_ref_parts": [
                       "<ref_type>",
                       "<ref_name>",
                       "<raw_id>"
                     ],
                     "other_ref_parts": [
                       "<ref_type>",
                       "<ref_name>",
                       "<raw_id>"
                     ],
                     "comments": [
+                      {
                         "username": "<user_id>",
                         "text": "<comment text>",
-                        "comment_id": "<comment_id>",
+                        "comment_id" : "<comment_id>"
                       },
                       ...
                     ],
                     "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
                       },
                       ...
                     ],
@@ @@ -704,66 +864,66 @@ INPUT:: @@
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "get_repos"
     args:     { }
 OUTPUT::
     id : <id_given_in_input>
     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>",
                 "enable_statistics": "<bool>"
               },
               …
+            ]
     error:  null
 get_repo_nodes
 ^^^^^^^^^^^^^^
 Return a list of files and directories for a given path at the given revision.
 It is possible to specify ret_type to show only ``files`` or ``dirs``.
 This command can only be executed using the api_key of a user with admin rights.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "get_repo_nodes"
     args:     {
                 "repoid" : "<reponame or repo_id>"
+                "repoid" : "<reponame or repo_id>",
                 "revision"  : "<revision>",
                 "root_path" : "<root_path>",
                 "ret_type"  : "<ret_type> = Optional('all')"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result: [
+              {
                 "name" :        "<name>"
                 "type" :        "<type>",
                 "name" :        "<name>",
                 "type" :        "<type>"
               },
               …
+            ]
     error:  null
 create_repo
 ^^^^^^^^^^^
 Create a repository. If the repository name contains "/", the repository will be
 created in the repository group indicated by that path. Any such repository
 groups need to exist before calling this method, or the call will fail.
 For example "foo/bar/baz" will create a repository "baz" inside the repository
@@ @@ -778,102 +938,102 @@ INPUT:: @@
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "create_repo"
     args:     {
                 "repo_name" :        "<reponame>",
                 "owner" :            "<owner_name_or_id = Optional(=apiuser)>",
                 "repo_type" :        "<repo_type> = Optional('hg')",
                 "description" :      "<description> = Optional('')",
                 "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_statistics": "<bool> = Optional(False)"
+              }
 OUTPUT::
     id : <id_given_in_input>
     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>",
               },
                 "enable_statistics": "<bool>"
+              }
+            }
     error:  null
 update_repo
 ^^^^^^^^^^^
 Update a repository.
 This command can only be executed using the api_key of a user with admin rights,
 or that of a regular user with create repository permission.
 Regular users cannot specify owner parameter.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "update_repo"
     args:     {
                 "repoid" :           "<reponame or repo_id>"
+                "repoid" :           "<reponame or repo_id>",
                 "name" :             "<reponame> = Optional('')",
                 "group" :            "<group_id> = Optional(None)",
                 "owner" :            "<owner_name_or_id = Optional(=apiuser)>",
                 "description" :      "<description> = Optional('')",
                 "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_statistics": "<bool> = Optional(False)"
+              }
 OUTPUT::
     id : <id_given_in_input>
     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>",
                 "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>",
                 "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
 fork_repo
 ^^^^^^^^^
 Create a fork of the given repo. If using Celery, this will
 return success message immediately and a fork will be created
 asynchronously.
 This command can only be executed using the api_key of a user with admin
 rights, or with the global fork permission, by a regular user with create
 repository permission and at least read access to the repository.
@@ @@ -883,25 +1043,24 @@ INPUT:: @@
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "fork_repo"
     args:     {
                 "repoid" :          "<reponame or repo_id>",
                 "fork_name":        "<forkname>",
                 "owner":            "<username or user_id = Optional(=apiuser)>",
                 "description":      "<description>",
                 "copy_permissions": "<bool>",
                 "private":          "<bool>",
                 "landing_rev":      "<landing_rev>"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result: {
               "msg": "Created fork of `<reponame>` as `<forkname>`",
               "success": true
+            }
     error:  null
 delete_repo
@@ @@ -934,51 +1093,51 @@ OUTPUT:: @@
 grant_user_permission
 ^^^^^^^^^^^^^^^^^^^^^
 Grant permission for a user on the given repository, or update the existing one if found.
 This command can only be executed using the api_key of a user with admin rights.
 INPUT::
     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))",
                 "repoid" : "<reponame or repo_id>",
                 "userid" : "<username or user_id>",
                 "perm" :       "(repository.(none|read|write|admin))"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result: {
               "msg" : "Granted perm: `<perm>` for user: `<username>` in repo: `<reponame>`",
               "success": true
+            }
     error:  null
 revoke_user_permission
 ^^^^^^^^^^^^^^^^^^^^^^
 Revoke permission for a user on the given repository.
 This command can only be executed using the api_key of a user with admin rights.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method  : "revoke_user_permission"
     args:     {
                 "repoid" : "<reponame or repo_id>"
+                "repoid" : "<reponame or repo_id>",
                 "userid" : "<username or user_id>"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result: {
               "msg" : "Revoked perm for user: `<username>` in repo: `<reponame>`",
               "success": true
+            }
     error:  null
@@ @@ -986,51 +1145,51 @@ grant_user_group_permission @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Grant permission for a user group on the given repository, or update the
 existing one if found.
 This command can only be executed using the api_key of a user with admin rights.
 INPUT::
     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))",
                 "repoid" : "<reponame or repo_id>",
                 "usersgroupid" : "<user group id or name>",
                 "perm" : "(repository.(none|read|write|admin))"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result: {
               "msg" : "Granted perm: `<perm>` for group: `<usersgroupname>` in repo: `<reponame>`",
               "success": true
+            }
     error:  null
 revoke_user_group_permission
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Revoke permission for a user group on the given repository.
 This command can only be executed using the api_key of a user with admin rights.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method  : "revoke_user_group_permission"
     args:     {
                 "repoid" : "<reponame or repo_id>"
+                "repoid" : "<reponame or repo_id>",
                 "usersgroupid" : "<user group id or name>"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result: {
               "msg" : "Revoked perm for group: `<usersgroupname>` in repo: `<reponame>`",
               "success": true
+            }
     error:  null
@@ @@ -1053,25 +1212,25 @@ INPUT:: @@
                 "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: [
+    {
       "raw_id": "<raw_id>",
-      "short_id": "short_id": "<short_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>]
     },
     ...
+    ]
     error:  null
@@ @@ -1148,58 +1307,58 @@ Example output:: @@
 get_pullrequest
 ^^^^^^^^^^^^^^^
 Get information and review status for a given pull request. This command can only be executed
 using the api_key of a user with read permissions to the original repository.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method  : "get_pullrequest"
     args:     {
-                "pullrequest_id" : "<pullrequest_id>",
                 "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": [
+          {
-            "username": "<user_name>",
+            "username" : "<user_name>"
           },
           ...
         ],
         "org_repo_url": "<repo_url>",
         "org_ref_parts": [
           "<ref_type>",
           "<ref_name>",
           "<raw_id>"
         ],
         "other_ref_parts": [
           "<ref_type>",
           "<ref_name>",
           "<raw_id>"
         ],
         "comments": [
+          {
             "username": "<user_name>",
             "text": "<comment text>",
-            "comment_id": "<comment_id>",
+            "comment_id" : "<comment_id>"
           },
           ...
         ],
         "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
           },
           ...
         ],
@@ @@ -1216,25 +1375,25 @@ comment_pullrequest @@
 Add comment, change status or close a given pull request. This command can only be executed
 using the api_key of a user with read permissions to the original repository.
 INPUT::
     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)",
+                "close_pr" :        Optional(False)"
+              }
 OUTPUT::
     id : <id_given_in_input>
     result: True
     error:  null
 API access for web views
 ------------------------

docs/conf.py

➞

Show inline comments

@@ @@ -38,25 +38,25 @@ templates_path = ['_templates'] @@
 # The suffix of source filenames.
 source_suffix = '.rst'
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'
 # The master toctree document.
 master_doc = 'index'
 # General information about the project.
 project = 'Kallithea'
-copyright = '2010-2022 by various authors, licensed as GPLv3.'
+copyright = '2010-2023 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
 # built documents.
+#
 # The short X.Y version.
 root = os.path.dirname(os.path.dirname(__file__))
 sys.path.append(root)
 version = kallithea.__version__
 # The full version, including alpha/beta/rc tags.
 release = kallithea.__version__

kallithea/controllers/admin/repo_groups.py

➞

Show inline comments

@@ @@ -67,24 +67,25 @@ class RepoGroupsController(base.BaseCont @@
         c.repo_groups = [rg for rg in repo_groups
                          if rg[0] not in exclude_group_ids]
     def __load_data(self, group_id):
         """
         Load defaults settings for edit, and update
         :param group_id:
         """
         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:
             data.update({'u_perm_%s' % p.user.username:
                              p.permission.permission_name})
         # fill repository group groups
         for p in repo_group.users_group_to_perm:
             data.update({'g_perm_%s' % p.users_group.users_group_name:
                              p.permission.permission_name})
         return data
@@ @@ -137,25 +138,25 @@ class RepoGroupsController(base.BaseCont @@
         self.__load_defaults()
         # permissions for can create group based on parent_id are checked
         # here in the Form
         repo_group_form = RepoGroupForm(repo_groups=c.repo_groups)
         form_result = None
         try:
             form_result = repo_group_form.to_python(dict(request.POST))
             gr = RepoGroupModel().create(
                 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()
             # TODO: in future action_logger(, '', '', '')
         except formencode.Invalid as errors:
             return htmlfill.render(
                 base.render('admin/repo_groups/repo_group_add.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False)

kallithea/controllers/api/api.py

➞

Show inline comments

@@ @@ -56,91 +56,79 @@ log = logging.getLogger(__name__) @@
 def store_update(updates, attr, name):
     """
     Stores param in updates dict if it's not None (i.e. if user explicitly set
     a parameter). This allows easy updates of passed in params.
     """
     if attr is not None:
         updates[name] = attr
 def get_user_or_error(userid):
     """
     Get user by id or name or return JsonRPCError if not found
     :param userid:
     """
     user = UserModel().get_user(userid)
     if user is None:
         raise JSONRPCError("user `%s` does not exist" % (userid,))
     return user
 def get_repo_or_error(repoid):
     """
     Get repo by id or name or return JsonRPCError if not found
     :param repoid:
     """
     repo = RepoModel().get_repo(repoid)
     if repo is None:
         raise JSONRPCError('repository `%s` does not exist' % (repoid,))
     return repo
 def get_repo_group_or_error(repogroupid):
     """
     Get repo group by id or name or return JsonRPCError if not found
     :param repogroupid:
     """
     repo_group = db.RepoGroup.guess_instance(repogroupid)
     if repo_group is None:
         raise JSONRPCError(
             'repository group `%s` does not exist' % (repogroupid,))
     return repo_group
 def get_user_group_or_error(usergroupid):
     """
     Get user group by id or name or return JsonRPCError if not found
     :param usergroupid:
     """
     user_group = UserGroupModel().get_group(usergroupid)
     if user_group is None:
         raise JSONRPCError('user group `%s` does not exist' % (usergroupid,))
     return user_group
 def get_perm_or_error(permid, prefix=None):
     """
     Get permission by id or name or return JsonRPCError if not found
     :param permid:
     """
     perm = db.Permission.get_by_key(permid)
     if perm is None:
         raise JSONRPCError('permission `%s` does not exist' % (permid,))
     if prefix:
         if not perm.permission_name.startswith(prefix):
             raise JSONRPCError('permission `%s` is invalid, '
                                'should start with %s' % (permid, prefix))
     return perm
 def get_gist_or_error(gistid):
     """
     Get gist by id or gist_access_id or return JsonRPCError if not found
     :param gistid:
     """
     gist = GistModel().get_gist(gistid)
     if gist is None:
         raise JSONRPCError('gist `%s` does not exist' % (gistid,))
     return gist
 class ApiController(JSONRPCController):
     """
     API Controller
     The authenticated user can be found as request.authuser.
@@ @@ -156,48 +144,33 @@ class ApiController(JSONRPCController): @@
     @HasPermissionAnyDecorator('hg.admin')
     def test(self, args):
         return args
     @HasPermissionAnyDecorator('hg.admin')
     def pull(self, repoid, clone_uri=None):
         """
         Triggers a pull from remote location on given repo. Can be used to
         automatically keep remote repos up to date. This command can be executed
         only using api_key belonging to user with admin rights
         :param repoid: repository name or repository id
         :type repoid: str or int
         :param clone_uri: repository URI to pull from (optional)
         :type clone_uri: str
         OUTPUT::
           id : <id_given_in_input>
           result : {
             "msg": "Pulled from `<repository name>`"
+                "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>`"
+          }
         """
         repo = get_repo_or_error(repoid)
         try:
             ScmModel().pull_changes(repo.repo_name,
                                     request.authuser.username,
                                     request.ip_addr,
                                     clone_uri=clone_uri)
             return dict(
                 msg='Pulled from `%s`' % repo.repo_name,
                 repository=repo.repo_name
+            )
         except Exception:
@@ @@ -205,84 +178,58 @@ class ApiController(JSONRPCController): @@
             raise JSONRPCError(
                 'Unable to pull changes from `%s`' % repo.repo_name
+            )
     @HasPermissionAnyDecorator('hg.admin')
     def rescan_repos(self, remove_obsolete=False):
         """
         Triggers rescan repositories action. If remove_obsolete is set
         than also delete repos that are in database but not in the filesystem.
         aka "clean zombies". This command can be executed only using api_key
         belonging to user with admin rights.
         :param remove_obsolete: deletes repositories from
             database that are not found on the filesystem
         :type remove_obsolete: Optional(bool)
         OUTPUT::
           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'
+          }
         """
         try:
             rm_obsolete = remove_obsolete
             added, removed = repo2db_mapper(ScmModel().repo_scan(),
                                             remove_obsolete=rm_obsolete)
             return {'added': added, 'removed': removed}
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError(
                 'Error occurred during rescan repositories action'
+            )
     def invalidate_cache(self, repoid):
         """
         Invalidate cache for repository.
         This command can be executed only using api_key belonging to user with admin
         rights or regular user that have write or admin or write access to repository.
         :param repoid: repository name or repository id
         :type repoid: str or int
         OUTPUT::
           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'
+          }
         """
         repo = get_repo_or_error(repoid)
         if not HasPermissionAny('hg.admin')():
             if not HasRepoPermissionLevel('write')(repo.repo_name):
                 raise JSONRPCError('repository `%s` does not exist' % (repoid,))
         try:
             ScmModel().mark_for_invalidation(repo.repo_name)
             return dict(
                 msg='Cache for repository `%s` was invalidated' % (repoid,),
                 repository=repo.repo_name
+            )
@@ @@ -292,205 +239,157 @@ class ApiController(JSONRPCController): @@
                 'Error occurred during cache invalidation action'
+            )
     @HasPermissionAnyDecorator('hg.admin')
     def get_ip(self, userid=None):
         """
         Shows IP address as seen from Kallithea server, together with all
         defined IP addresses for given user. If userid is not passed data is
         returned for user who's calling this function.
         This command can be executed only using api_key belonging to user with
         admin rights.
         :param userid: username to show ips for
         :type userid: Optional(str or int)
         OUTPUT::
             id : <id_given_in_input>
             result : {
-                         "server_ip_addr": "<ip_from_clien>",
+                         "server_ip_addr" : "<ip_from_client>",
                          "user_ips": [
+                                        {
                                            "ip_addr": "<ip_with_mask>",
-                                           "ip_range": ["<start_ip>", "<end_ip>"],
+                                           "ip_range" : ["<start_ip>", "<end_ip>"]
                                         },
                                         ...
+                                     ]
+            }
+            error : null
         """
         if userid is None:
             userid = request.authuser.user_id
         user = get_user_or_error(userid)
         ips = db.UserIpMap.query().filter(db.UserIpMap.user == user).all()
         return dict(
             server_ip_addr=request.ip_addr,
             user_ips=ips
+        )
     # alias for old
     show_ip = get_ip
     @HasPermissionAnyDecorator('hg.admin')
     def get_server_info(self):
         """
         return server info, including Kallithea version and installed packages
         OUTPUT::
           id : <id_given_in_input>
           result : {
             'modules': [<module name>,...]
+                'modules' : [ [<module name>, <module version>], ...]
             'py_version': <python version>,
             'platform': <platform type>,
             'kallithea_version': <kallithea version>
                 'kallithea_version' : <kallithea version>,
                 'git_version' : '<git version>',
                 'git_path' : '<git path>'
+          }
           error :  null
         """
         return db.Setting.get_server_info()
     def get_user(self, userid=None):
         """
         Gets a user by username or user_id, Returns empty result if user is
         not found. If userid param is skipped it is set to id of user who is
         calling this method. This command can be executed only using api_key
         belonging to user with admin rights, or regular users that cannot
         specify different userid than theirs
         :param userid: user to get data for
         :type userid: Optional(str or int)
         OUTPUT::
             id : <id_given_in_input>
             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>",
                         "lastname" :    "<lastname>",
                         "email" :       "<email>",
                         "emails":       "[<list of all emails including additional ones>]",
                         "ip_addresses": "[<ip_address_for_user>,...]",
                         "active" :      "<bool: user active>",
                         "admin" :       "<bool: user is admin>",
                         "extern_name" : "<extern_name>",
                         "extern_type" : "<extern type>
                         "last_login":   "<last_login>",
                         "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"}
                          },
                             "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,
             # he is not allowed to do that
             if userid is not None and userid != request.authuser.user_id:
                 raise JSONRPCError(
                     'userid is not the same as your user'
+                )
         if userid is None:
             userid = request.authuser.user_id
         user = get_user_or_error(userid)
         data = user.get_api_data()
         data['permissions'] = AuthUser(user_id=user.user_id).permissions
         return data
     @HasPermissionAnyDecorator('hg.admin')
     def get_users(self):
         """
         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
         """
         return [
             user.get_api_data()
             for user in db.User.query()
                 .order_by(db.User.username)
                 .filter_by(is_default_user=False)
+        ]
     @HasPermissionAnyDecorator('hg.admin')
     def create_user(self, username, email, password='',
                     firstname='', lastname='',
                     active=True, admin=False,
                     extern_type=db.User.DEFAULT_AUTH_TYPE,
                     extern_name=''):
         """
         Creates new user. Returns new user object. This command can
         be executed only using api_key belonging to user with admin rights.
         :param username: new username
         :type username: str or int
         :param email: email
         :type email: str
         :param password: password
         :type password: Optional(str)
         :param firstname: firstname
         :type firstname: Optional(str)
         :param lastname: lastname
         :type lastname: Optional(str)
         :param active: active
         :type active: Optional(bool)
         :param admin: admin
         :type admin: Optional(bool)
         :param extern_name: name of extern
         :type extern_name: Optional(str)
         :param extern_type: extern_type
         :type extern_type: Optional(str)
         OUTPUT::
             id : <id_given_in_input>
             result: {
                       "msg" : "created new user `<username>`",
                       "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>`"
+          }
         """
         if db.User.get_by_username(username):
             raise JSONRPCError("user `%s` already exist" % (username,))
         if db.User.get_by_email(email):
             raise JSONRPCError("email `%s` already exist" % (email,))
         try:
             user = UserModel().create_or_update(
                 username=username,
                 password=password,
                 email=email,
                 firstname=firstname,
@@ @@ -510,65 +409,33 @@ class ApiController(JSONRPCController): @@
             raise JSONRPCError('failed to create user `%s`' % (username,))
     @HasPermissionAnyDecorator('hg.admin')
     def update_user(self, userid, username=None,
                     email=None, password=None,
                     firstname=None, lastname=None,
                     active=None, admin=None,
                     extern_type=None, extern_name=None):
         """
         updates given user if such user exists. This command can
         be executed only using api_key belonging to user with admin rights.
         :param userid: userid to update
         :type userid: str or int
         :param username: new username
         :type username: str or int
         :param email: email
         :type email: str
         :param password: password
         :type password: Optional(str)
         :param firstname: firstname
         :type firstname: Optional(str)
         :param lastname: lastname
         :type lastname: Optional(str)
         :param active: active
         :type active: Optional(bool)
         :param admin: admin
         :type admin: Optional(bool)
         :param extern_name:
         :type extern_name: Optional(str)
         :param extern_type:
         :type extern_type: Optional(str)
         OUTPUT::
             id : <id_given_in_input>
             result: {
                       "msg" : "updated user ID:<userid> <username>",
-                      "user": <user_object>,
+                      "user" : <user_object>
+                    }
             error:  null
         ERROR OUTPUT::
           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
         updates = {}
         try:
             store_update(updates, username, 'username')
             store_update(updates, password, 'password')
             store_update(updates, email, 'email')
             store_update(updates, firstname, 'name')
             store_update(updates, lastname, 'lastname')
@@ @@ -587,149 +454,112 @@ class ApiController(JSONRPCController): @@
             log.error(traceback.format_exc())
             raise JSONRPCError('editing default user is forbidden')
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError('failed to update user `%s`' % (userid,))
     @HasPermissionAnyDecorator('hg.admin')
     def delete_user(self, userid):
         """
         deletes given user if such user exists. This command can
         be executed only using api_key belonging to user with admin rights.
         :param userid: user to delete
         :type userid: str or int
         OUTPUT::
             id : <id_given_in_input>
             result: {
                       "msg" : "deleted user ID:<userid> <username>",
                       "user": null
+                    }
             error:  null
         ERROR OUTPUT::
           id : <id_given_in_input>
           result : null
           error :  {
             "failed to delete user ID:<userid> <username>"
+          }
         """
         user = get_user_or_error(userid)
         try:
             UserModel().delete(userid)
             meta.Session().commit()
             return dict(
                 msg='deleted user ID:%s %s' % (user.user_id, user.username),
                 user=None
+            )
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError('failed to delete user ID:%s %s'
                                % (user.user_id, user.username))
     # permission check inside
     def get_user_group(self, usergroupid):
         """
         Gets an existing user group. This command can be executed only using api_key
         belonging to user with admin rights or user who has at least
         read access to user group.
         :param usergroupid: id of user_group to edit
         :type usergroupid: str or int
         OUTPUT::
             id : <id_given_in_input>
             result : None if group not exist
+                     {
                        "users_group_id" : "<id>",
                        "group_name" :     "<groupname>",
                        "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')():
             if not HasUserGroupPermissionLevel('read')(user_group.users_group_name):
                 raise JSONRPCError('user group `%s` does not exist' % (usergroupid,))
         data = user_group.get_api_data()
         return data
     # permission check inside
     def get_user_groups(self):
         """
         Lists all existing user groups. This command can be executed only using
         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')
+        ]
     @HasPermissionAnyDecorator('hg.admin', 'hg.usergroup.create.true')
     def create_user_group(self, group_name, description='',
                           owner=None, active=True):
         """
         Creates new user group. This command can be executed only using api_key
         belonging to user with admin rights or an user who has create user group
         permission
         :param group_name: name of new user group
         :type group_name: str
         :param description: group description
         :type description: str
         :param owner: owner of group. If not passed apiuser is the owner
         :type owner: Optional(str or int)
         :param active: group is active
         :type active: Optional(bool)
         OUTPUT::
             id : <id_given_in_input>
             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>`"
+          }
         """
         if UserGroupModel().get_by_name(group_name):
             raise JSONRPCError("user group `%s` already exist" % (group_name,))
         try:
             if owner is None:
                 owner = request.authuser.user_id
             owner = get_user_or_error(owner)
             ug = UserGroupModel().create(name=group_name, description=description,
                                          owner=owner, active=active)
             meta.Session().commit()
             return dict(
@@ @@ -739,52 +569,32 @@ class ApiController(JSONRPCController): @@
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError('failed to create group `%s`' % (group_name,))
     # permission check inside
     def update_user_group(self, usergroupid, group_name=None,
                           description=None, owner=None,
                           active=None):
         """
         Updates given usergroup.  This command can be executed only using api_key
         belonging to user with admin rights or an admin of given user group
         :param usergroupid: id of user group to update
         :type usergroupid: str or int
         :param group_name: name of new user group
         :type group_name: str
         :param description: group description
         :type description: str
         :param owner: owner of group.
         :type owner: Optional(str or int)
         :param active: group is active
         :type active: Optional(bool)
         OUTPUT::
           id : <id_given_in_input>
           result : {
             "msg": 'updated user group ID:<user group id> <user group name>',
             "user_group": <user_group_object>
+          }
           error :  null
         ERROR OUTPUT::
           id : <id_given_in_input>
           result : null
           error :  {
             "failed to update user group `<user group name>`"
+          }
         """
         user_group = get_user_group_or_error(usergroupid)
         if not HasPermissionAny('hg.admin')():
             if not HasUserGroupPermissionLevel('admin')(user_group.users_group_name):
                 raise JSONRPCError('user group `%s` does not exist' % (usergroupid,))
         if owner is not None:
             owner = get_user_or_error(owner)
         updates = {}
         store_update(updates, group_name, 'users_group_name')
         store_update(updates, description, 'user_group_description')
@@ @@ -800,45 +610,31 @@ class ApiController(JSONRPCController): @@
+            )
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError('failed to update user group `%s`' % (usergroupid,))
     # permission check inside
     def delete_user_group(self, usergroupid):
         """
         Delete given user group by user group id or name.
         This command can be executed only using api_key
         belonging to user with admin rights or an admin of given user group
         :param usergroupid:
         :type usergroupid: int
         OUTPUT::
           id : <id_given_in_input>
           result : {
             "msg": "deleted user group ID:<user_group_id> <user_group_name>"
+          }
           error :  null
         ERROR OUTPUT::
           id : <id_given_in_input>
           result : null
           error :  {
             "failed to delete user group ID:<user_group_id> <user_group_name>"
             or
             "RepoGroup assigned to <repo_groups_list>"
+          }
         """
         user_group = get_user_group_or_error(usergroupid)
         if not HasPermissionAny('hg.admin')():
             if not HasUserGroupPermissionLevel('admin')(user_group.users_group_name):
                 raise JSONRPCError('user group `%s` does not exist' % (usergroupid,))
         try:
             UserGroupModel().delete(user_group)
             meta.Session().commit()
             return dict(
                 msg='deleted user group ID:%s %s' %
                     (user_group.users_group_id, user_group.users_group_name),
@@ @@ -850,50 +646,35 @@ class ApiController(JSONRPCController): @@
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError('failed to delete user group ID:%s %s' %
                                (user_group.users_group_id,
                                 user_group.users_group_name)
+                               )
     # permission check inside
     def add_user_to_user_group(self, usergroupid, userid):
         """
         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
         :param usergroupid:
         :type usergroupid: int
         :param userid:
         :type userid: int
         belonging to user with admin rights or an admin of a given user group
         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>` |
+                "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>`"
+          }
         """
         user = get_user_or_error(userid)
         user_group = get_user_group_or_error(usergroupid)
         if not HasPermissionAny('hg.admin')():
             if not HasUserGroupPermissionLevel('admin')(user_group.users_group_name):
                 raise JSONRPCError('user group `%s` does not exist' % (usergroupid,))
         try:
             ugm = UserGroupModel().add_user_to_group(user_group, user)
             success = True if ugm is not True else False
             msg = 'added member `%s` to user group `%s`' % (
                 user.username, user_group.users_group_name
@@ @@ -911,38 +692,33 @@ class ApiController(JSONRPCController): @@
                 'failed to add member to user group `%s`' % (
                     user_group.users_group_name,
+                )
+            )
     # permission check inside
     def remove_user_from_user_group(self, usergroupid, userid):
         """
         Removes a user from a user group. If user is not in given 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
         :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
         """
         user = get_user_or_error(userid)
         user_group = get_user_group_or_error(usergroupid)
         if not HasPermissionAny('hg.admin')():
             if not HasUserGroupPermissionLevel('admin')(user_group.users_group_name):
                 raise JSONRPCError('user group `%s` does not exist' % (usergroupid,))
         try:
             success = UserGroupModel().remove_user_from_group(user_group, user)
             msg = 'removed member `%s` from user group `%s`' % (
                 user.username, user_group.users_group_name
+            )
@@ @@ -958,84 +734,78 @@ class ApiController(JSONRPCController): @@
+            )
     # permission check inside
     def get_repo(self, repoid,
                  with_revision_names=False,
                  with_pullrequests=False):
         """
         Gets an existing repository by it's name or repository_id. Members will return
         either users_group or user associated to that repository. This command can be
         executed only using api_key belonging to user with admin
         rights or regular user that have at least read access to repository.
         :param repoid: repository name or repository id
         :type repoid: str or int
         OUTPUT::
           id : <id_given_in_input>
           result : {
+            {
                 "repo_id" :          "<repo_id>",
                 "repo_name" :        "<reponame>"
+                        "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)
         if not HasPermissionAny('hg.admin')():
             if not HasRepoPermissionLevel('read')(repo.repo_name):
                 raise JSONRPCError('repository `%s` does not exist' % (repoid,))
         members = []
         for user in repo.repo_to_perm:
             perm = user.permission.permission_name
             user = user.user
             user_data = {
@@ @@ -1064,83 +834,72 @@ class ApiController(JSONRPCController): @@
                                  with_pullrequests=with_pullrequests)
         data['members'] = members
         data['followers'] = followers
         return data
     # permission check inside
     def get_repos(self):
         """
         Lists all existing repositories. This command can be executed only using
         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: [
+                      {
                         "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>",
                         "enable_statistics": "<bool>"
                       },
                       …
+                    ]
             error:  null
         """
         if not HasPermissionAny('hg.admin')():
             repos = request.authuser.get_all_user_repos()
         else:
             repos = db.Repository.query()
         return [
             repo.get_api_data()
             for repo in repos
+        ]
     # permission check inside
     def get_repo_nodes(self, repoid, revision, root_path,
                        ret_type='all'):
         """
         returns a list of nodes and it's children in a flat list for a given path
         at given revision. It's possible to specify ret_type to show only `files` or
         `dirs`.  This command can be executed only using api_key belonging to
         user with admin rights or regular user that have at least read access to repository.
         :param repoid: repository name or repository id
         :type repoid: str or int
         :param revision: revision for which listing should be done
         :type revision: str
         :param root_path: path from which start displaying
         :type root_path: str
         :param ret_type: return type 'all|files|dirs' nodes
         :type ret_type: Optional(str)
         OUTPUT::
             id : <id_given_in_input>
             result: [
+                      {
                         "name" :        "<name>"
                         "type" :        "<type>",
                         "name" :        "<name>",
                         "type" :        "<type>"
                       },
                       …
+                    ]
             error:  null
         """
         repo = get_repo_or_error(repoid)
         if not HasPermissionAny('hg.admin')():
             if not HasRepoPermissionLevel('read')(repo.repo_name):
                 raise JSONRPCError('repository `%s` does not exist' % (repoid,))
         _map = {}
@@ @@ -1169,64 +928,32 @@ class ApiController(JSONRPCController): @@
                     landing_rev='rev:tip',
                     enable_statistics=None,
                     enable_downloads=None,
                     copy_permissions=False):
         """
         Creates a repository. The repository name contains the full path, but the
         parent repository group must exist. For example "foo/bar/baz" require the groups
         "foo" and "bar" (with "foo" as parent), and create "baz" repository with
         "bar" as group. This command can be executed only using api_key
         belonging to user with admin rights or regular user that have create
         repository permission. Regular users cannot specify owner parameter
         :param repo_name: repository name
         :type repo_name: str
         :param owner: user_id or username
         :type owner: Optional(str)
         :param repo_type: 'hg' or 'git'
         :type repo_type: Optional(str)
         :param description: repository description
         :type description: Optional(str)
         :param private:
         :type private: bool
         :param clone_uri:
         :type clone_uri: str
         :param landing_rev: <rev_type>:<rev>
         :type landing_rev: str
         :param enable_downloads:
         :type enable_downloads: bool
         :param enable_statistics:
         :type enable_statistics: bool
         :param copy_permissions: Copy permission from group that repository is
             being created.
         :type copy_permissions: bool
         OUTPUT::
             id : <id_given_in_input>
             result: {
                       "msg": "Created new repository `<reponame>`",
                       "success": true,
                       "task": "<celery task id or None if done sync>"
                       "success" : true
+                    }
             error:  null
         ERROR OUTPUT::
           id : <id_given_in_input>
           result : null
           error :  {
              'failed to create repository `<repo_name>`
+          }
         """
         group_name = None
         repo_name_parts = repo_name.split('/')
         if len(repo_name_parts) > 1:
             group_name = '/'.join(repo_name_parts[:-1])
             repo_group = db.RepoGroup.get_by_group_name(group_name)
             if repo_group is None:
                 raise JSONRPCError("repo group `%s` not found" % group_name)
             if not(HasPermissionAny('hg.admin')() or HasRepoGroupPermissionLevel('write')(group_name)):
                 raise JSONRPCError("no permission to create repo in %s" % group_name)
         else:
             if not HasPermissionAny('hg.admin', 'hg.create.repository')():
@@ @@ -1257,64 +984,51 @@ class ApiController(JSONRPCController): @@
             enable_downloads = defs.get('repo_enable_downloads')
         try:
             data = dict(
                 repo_name=repo_name_parts[-1],
                 repo_name_full=repo_name,
                 repo_type=repo_type,
                 repo_description=description,
                 repo_private=private,
                 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,
+            )
             RepoModel().create(form_data=data, cur_user=owner.username)
             # no commit, it's done in RepoModel, or async via celery
             return dict(
                 msg="Created new repository `%s`" % (repo_name,),
                 success=True,  # cannot return the repo data here since fork
                                # can be done async
+            )
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError(
                 'failed to create repository `%s`' % (repo_name,))
     # permission check inside
     def update_repo(self, repoid, name=None,
                     owner=None,
                     group=None,
                     description=None, private=None,
                     clone_uri=None, landing_rev=None,
                     enable_statistics=None,
                     enable_downloads=None):
         """
         Updates repo
         :param repoid: repository name or repository id
         :type repoid: str or int
         :param name:
         :param owner:
         :param group:
         :param description:
         :param private:
         :param clone_uri:
         :param landing_rev:
         :param enable_statistics:
         :param enable_downloads:
         """
         repo = get_repo_or_error(repoid)
         if not HasPermissionAny('hg.admin')():
             if not HasRepoPermissionLevel('admin')(repo.repo_name):
                 raise JSONRPCError('repository `%s` does not exist' % (repoid,))
             if (name != repo.repo_name and repo.group_id is None and
                 not HasPermissionAny('hg.create.repository')()
             ):
                 raise JSONRPCError('no permission to create (or move) top level repositories')
             if owner is not None:
@@ @@ -1356,57 +1070,47 @@ class ApiController(JSONRPCController): @@
     @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository')
     def fork_repo(self, repoid, fork_name,
                   owner=None,
                   description='', copy_permissions=False,
                   private=False, landing_rev='rev:tip'):
         """
         Creates a fork of given repo. In case of using celery this will
         immediately return success message, while fork is going to be created
         asynchronous. This command can be executed only using api_key belonging to
         user with admin rights or regular user that have fork permission, and at least
         read access to forking repository. Regular users cannot specify owner parameter.
         :param repoid: repository name or repository id
         :type repoid: str or int
         :param fork_name:
         :param owner:
         :param description:
         :param copy_permissions:
         :param private:
         :param landing_rev:
         INPUT::
             id : <id_for_response>
             api_key : "<api_key>"
             method :  "fork_repo"
             args:     {
                         "repoid" :          "<reponame or repo_id>",
                         "fork_name":        "<forkname>",
                         "owner":            "<username or user_id = Optional(=apiuser)>",
                         "description":      "<description>",
                         "copy_permissions": "<bool>",
                         "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>"
                       "success" : true
+                    }
             error:  null
         """
         repo = get_repo_or_error(repoid)
         repo_name = repo.repo_name
         _repo = RepoModel().get_by_repo_name(fork_name)
         if _repo:
             type_ = 'fork' if _repo.fork else 'repo'
             raise JSONRPCError("%s `%s` already exist" % (type_, fork_name))
         group_name = None
         fork_name_parts = fork_name.split('/')
         if len(fork_name_parts) > 1:
@@ @@ -1463,38 +1167,32 @@ class ApiController(JSONRPCController): @@
                 'failed to fork repository `%s` as `%s`' % (repo_name,
                                                             fork_name)
+            )
     # permission check inside
     def delete_repo(self, repoid, forks=''):
         """
         Deletes a repository. This command can be executed only using api_key belonging
         to user with admin rights or regular user that have admin access to repository.
         When `forks` param is set it's possible to detach or delete forks of deleting
         repository
         :param repoid: repository name or repository id
         :type repoid: str or int
         :param forks: `detach` or `delete`, what do do with attached forks for repo
         :type forks: Optional(str)
         OUTPUT::
             id : <id_given_in_input>
             result: {
                       "msg": "Deleted repository `<reponame>`",
                       "success": true
+                    }
             error:  null
         """
         repo = get_repo_or_error(repoid)
         if not HasPermissionAny('hg.admin')():
             if not HasRepoPermissionLevel('admin')(repo.repo_name):
                 raise JSONRPCError('repository `%s` does not exist' % (repoid,))
         try:
             handle_forks = forks
             _forks_msg = ''
             _forks = [f for f in repo.forks]
             if handle_forks == 'detach':
@@ @@ -1517,30 +1215,24 @@ class ApiController(JSONRPCController): @@
             log.error(traceback.format_exc())
             raise JSONRPCError(
                 'failed to delete repository `%s`' % (repo.repo_name,)
+            )
     @HasPermissionAnyDecorator('hg.admin')
     def grant_user_permission(self, repoid, userid, perm):
         """
         Grant permission for user on given repository, or update existing one
         if found. This command can be executed only using api_key belonging to user
         with admin rights.
         :param repoid: repository name or repository id
         :type repoid: str or int
         :param userid:
         :param perm: (repository.(none|read|write|admin))
         :type perm: str
         OUTPUT::
             id : <id_given_in_input>
             result: {
                       "msg" : "Granted perm: `<perm>` for user: `<username>` in repo: `<reponame>`",
                       "success": true
+                    }
             error:  null
         """
         repo = get_repo_or_error(repoid)
         user = get_user_or_error(userid)
         perm = get_perm_or_error(perm)
@@ @@ -1561,39 +1253,33 @@ class ApiController(JSONRPCController): @@
             raise JSONRPCError(
                 'failed to edit permission for user: `%s` in repo: `%s`' % (
                     userid, repoid
+                )
+            )
     @HasPermissionAnyDecorator('hg.admin')
     def revoke_user_permission(self, repoid, userid):
         """
         Revoke permission for user on given repository. This command can be executed
         only using api_key belonging to user with admin rights.
         :param repoid: repository name or repository id
         :type repoid: str or int
         :param userid:
         OUTPUT::
             id : <id_given_in_input>
             result: {
                       "msg" : "Revoked perm for user: `<username>` in repo: `<reponame>`",
                       "success": true
+                    }
             error:  null
         """
         repo = get_repo_or_error(repoid)
         user = get_user_or_error(userid)
         try:
             RepoModel().revoke_user_permission(repo=repo, user=user)
             meta.Session().commit()
             return dict(
                 msg='Revoked perm for user: `%s` in repo: `%s`' % (
                     user.username, repo.repo_name
                 ),
                 success=True
+            )
         except Exception:
@@ @@ -1602,49 +1288,32 @@ class ApiController(JSONRPCController): @@
                 'failed to edit permission for user: `%s` in repo: `%s`' % (
                     userid, repoid
+                )
+            )
     # permission check inside
     def grant_user_group_permission(self, repoid, usergroupid, perm):
         """
         Grant permission for user group on given repository, or update
         existing one if found. This command can be executed only using
         api_key belonging to user with admin rights.
         :param repoid: repository name or repository id
         :type repoid: str or int
         :param usergroupid: id of usergroup
         :type usergroupid: str or int
         :param perm: (repository.(none|read|write|admin))
         :type perm: str
         OUTPUT::
           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>`'
+          }
         """
         repo = get_repo_or_error(repoid)
         perm = get_perm_or_error(perm)
         user_group = get_user_group_or_error(usergroupid)
         if not HasPermissionAny('hg.admin')():
             if not HasRepoPermissionLevel('admin')(repo.repo_name):
                 raise JSONRPCError('repository `%s` does not exist' % (repoid,))
             if not HasUserGroupPermissionLevel('read')(user_group.users_group_name):
                 raise JSONRPCError('user group `%s` does not exist' % (usergroupid,))
         try:
@@ @@ -1666,28 +1335,24 @@ class ApiController(JSONRPCController): @@
                 'failed to edit permission for user group: `%s` in '
                 'repo: `%s`' % (
                     usergroupid, repo.repo_name
+                )
+            )
     # permission check inside
     def revoke_user_group_permission(self, repoid, usergroupid):
         """
         Revoke permission for user group on given repository. This command can be
         executed only using api_key belonging to user with admin rights.
         :param repoid: repository name or repository id
         :type repoid: str or int
         :param usergroupid:
         OUTPUT::
             id : <id_given_in_input>
             result: {
                       "msg" : "Revoked perm for group: `<usersgroupname>` in repo: `<reponame>`",
                       "success": true
+                    }
             error:  null
         """
         repo = get_repo_or_error(repoid)
         user_group = get_user_group_or_error(usergroupid)
         if not HasPermissionAny('hg.admin')():
@@ @@ -1713,27 +1378,24 @@ class ApiController(JSONRPCController): @@
             raise JSONRPCError(
                 'failed to edit permission for user group: `%s` in '
                 'repo: `%s`' % (
                     user_group.users_group_name, repo.repo_name
+                )
+            )
     @HasPermissionAnyDecorator('hg.admin')
     def get_repo_group(self, repogroupid):
         """
         Returns given repo group together with permissions, and repositories
         inside the group
         :param repogroupid: id/name of repository group
         :type repogroupid: str or int
         """
         repo_group = get_repo_group_or_error(repogroupid)
         members = []
         for user in repo_group.repo_group_to_perm:
             perm = user.permission.permission_name
             user = user.user
             user_data = {
                 'name': user.username,
                 'type': "user",
                 'permission': perm
+            }
@@ @@ -1748,68 +1410,47 @@ class ApiController(JSONRPCController): @@
                 'permission': perm
+            }
             members.append(user_group_data)
         data = repo_group.get_api_data()
         data["members"] = members
         return data
     @HasPermissionAnyDecorator('hg.admin')
     def get_repo_groups(self):
         """
         Returns all repository groups
         """
         return [
             repo_group.get_api_data()
             for repo_group in db.RepoGroup.query()
+        ]
     @HasPermissionAnyDecorator('hg.admin')
     def create_repo_group(self, group_name, description='',
                           owner=None,
                           parent=None,
                           copy_permissions=False):
         """
         Creates a repository group. This command can be executed only using
         api_key belonging to user with admin rights.
         :param group_name:
         :type group_name:
         :param description:
         :type description:
         :param owner:
         :type owner:
         :param parent:
         :type parent:
         :param copy_permissions:
         :type copy_permissions:
         OUTPUT::
           id : <id_given_in_input>
           result : {
               "msg": "created new repo group `<repo_group_name>`"
+              "msg" : "created new repo group `<repo_group_name>`",
               "repo_group": <repogroup_object>
+          }
           error :  null
         ERROR OUTPUT::
           id : <id_given_in_input>
           result : null
           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,))
         if owner is None:
             owner = request.authuser.user_id
         group_description = description
         parent_group = None
         if parent is not None:
             parent_group = get_repo_group_or_error(parent)
         try:
@@ @@ -1826,68 +1467,59 @@ class ApiController(JSONRPCController): @@
                 repo_group=repo_group.get_api_data()
+            )
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError('failed to create repo group `%s`' % (group_name,))
     @HasPermissionAnyDecorator('hg.admin')
     def update_repo_group(self, repogroupid, group_name=None,
                           description=None,
                           owner=None,
                           parent=None):
         """
         TODO
         """
         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(
                 msg='updated repository group ID:%s %s' % (repo_group.group_id,
                                                            repo_group.group_name),
                 repo_group=repo_group.get_api_data()
+            )
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError('failed to update repository group `%s`'
                                % (repogroupid,))
     @HasPermissionAnyDecorator('hg.admin')
     def delete_repo_group(self, repogroupid):
         """
         :param repogroupid: name or id of repository group
         :type repogroupid: str or int
         OUTPUT::
           id : <id_given_in_input>
           result : {
             'msg': 'deleted repo group ID:<repogroupid> <repogroupname>
             'repo_group': null
+          }
           error :  null
         ERROR OUTPUT::
           id : <id_given_in_input>
           result : null
           error :  {
             "failed to delete repo group ID:<repogroupid> <repogroupname>"
+          }
         """
         repo_group = get_repo_group_or_error(repogroupid)
         try:
             RepoGroupModel().delete(repo_group)
             meta.Session().commit()
             return dict(
                 msg='deleted repo group ID:%s %s' %
                     (repo_group.group_id, repo_group.group_name),
                 repo_group=None
+            )
         except Exception:
@@ @@ -1896,51 +1528,33 @@ class ApiController(JSONRPCController): @@
                                (repo_group.group_id, repo_group.group_name)
+                               )
     # permission check inside
     def grant_user_permission_to_repo_group(self, repogroupid, userid,
                                             perm, apply_to_children='none'):
         """
         Grant permission for user on given repository group, or update existing
         one if found. This command can be executed only using api_key belonging
         to user with admin rights, or user who has admin right to given repository
         group.
         :param repogroupid: name or id of repository group
         :type repogroupid: str or int
         :param userid:
         :param perm: (group.(none|read|write|admin))
         :type perm: str
         :param apply_to_children: 'none', 'repos', 'groups', 'all'
         :type apply_to_children: str
         OUTPUT::
             id : <id_given_in_input>
             result: {
                       "msg" : "Granted perm: `<perm>` (recursive:<apply_to_children>) for user: `<username>` in repo group: `<repo_group_name>`",
                       "success": true
+                    }
             error:  null
         ERROR OUTPUT::
           id : <id_given_in_input>
           result : null
           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')():
             if not HasRepoGroupPermissionLevel('admin')(repo_group.group_name):
                 raise JSONRPCError('repository group `%s` does not exist' % (repogroupid,))
         user = get_user_or_error(userid)
         perm = get_perm_or_error(perm, prefix='group.')
         try:
             RepoGroupModel().add_permission(repo_group=repo_group,
                                             obj=user,
@@ @@ -1959,50 +1573,33 @@ class ApiController(JSONRPCController): @@
             raise JSONRPCError(
                 'failed to edit permission for user: `%s` in repo group: `%s`' % (
                     userid, repo_group.name))
     # permission check inside
     def revoke_user_permission_from_repo_group(self, repogroupid, userid,
                                                apply_to_children='none'):
         """
         Revoke permission for user on given repository group. This command can
         be executed only using api_key belonging to user with admin rights, or
         user who has admin right to given repository group.
         :param repogroupid: name or id of repository group
         :type repogroupid: str or int
         :param userid:
         :type userid:
         :param apply_to_children: 'none', 'repos', 'groups', 'all'
         :type apply_to_children: str
         OUTPUT::
             id : <id_given_in_input>
             result: {
                       "msg" : "Revoked perm (recursive:<apply_to_children>) for user: `<username>` in repo group: `<repo_group_name>`",
                       "success": true
+                    }
             error:  null
         ERROR OUTPUT::
           id : <id_given_in_input>
           result : null
           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')():
             if not HasRepoGroupPermissionLevel('admin')(repo_group.group_name):
                 raise JSONRPCError('repository group `%s` does not exist' % (repogroupid,))
         user = get_user_or_error(userid)
         try:
             RepoGroupModel().delete_permission(repo_group=repo_group,
                                                obj=user,
                                                obj_type="user",
@@ @@ -2022,51 +1619,32 @@ class ApiController(JSONRPCController): @@
                     userid, repo_group.name))
     # permission check inside
     def grant_user_group_permission_to_repo_group(
             self, repogroupid, usergroupid, perm,
             apply_to_children='none'):
         """
         Grant permission for user group on given repository group, or update
         existing one if found. This command can be executed only using
         api_key belonging to user with admin rights, or user who has admin
         right to given repository group.
         :param repogroupid: name or id of repository group
         :type repogroupid: str or int
         :param usergroupid: id of usergroup
         :type usergroupid: str or int
         :param perm: (group.(none|read|write|admin))
         :type perm: str
         :param apply_to_children: 'none', 'repos', 'groups', 'all'
         :type apply_to_children: str
         OUTPUT::
           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
+          }
           error :  null
         ERROR OUTPUT::
           id : <id_given_in_input>
           result : null
           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.')
         user_group = get_user_group_or_error(usergroupid)
         if not HasPermissionAny('hg.admin')():
             if not HasRepoGroupPermissionLevel('admin')(repo_group.group_name):
                 raise JSONRPCError(
                     'repository group `%s` does not exist' % (repogroupid,))
             if not HasUserGroupPermissionLevel('read')(user_group.users_group_name):
                 raise JSONRPCError(
                     'user group `%s` does not exist' % (usergroupid,))
@@ @@ -2094,48 +1672,32 @@ class ApiController(JSONRPCController): @@
+                )
+            )
     # permission check inside
     def revoke_user_group_permission_from_repo_group(
             self, repogroupid, usergroupid,
             apply_to_children='none'):
         """
         Revoke permission for user group on given repository. This command can be
         executed only using api_key belonging to user with admin rights, or
         user who has admin right to given repository group.
         :param repogroupid: name or id of repository group
         :type repogroupid: str or int
         :param usergroupid:
         :param apply_to_children: 'none', 'repos', 'groups', 'all'
         :type apply_to_children: str
         OUTPUT::
             id : <id_given_in_input>
             result: {
                       "msg" : "Revoked perm (recursive:<apply_to_children>) for user group: `<usersgroupname>` in repo group: `<repo_group_name>`",
                       "success": true
+                    }
             error:  null
         ERROR OUTPUT::
           id : <id_given_in_input>
           result : null
           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)
         if not HasPermissionAny('hg.admin')():
             if not HasRepoGroupPermissionLevel('admin')(repo_group.group_name):
                 raise JSONRPCError(
                     'repository group `%s` does not exist' % (repogroupid,))
             if not HasUserGroupPermissionLevel('read')(user_group.users_group_name):
                 raise JSONRPCError(
                     'user group `%s` does not exist' % (usergroupid,))
@@ @@ -2153,41 +1715,35 @@ class ApiController(JSONRPCController): @@
+            )
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError(
                 'failed to edit permission for user group: `%s` in repo group: `%s`' % (
                     user_group.users_group_name, repo_group.name
+                )
+            )
     def get_gist(self, gistid):
         """
         Get given gist by id
         :param gistid: id of private or public gist
         :type gistid: str
         """
         gist = get_gist_or_error(gistid)
         if not HasPermissionAny('hg.admin')():
             if gist.owner_id != request.authuser.user_id:
                 raise JSONRPCError('gist `%s` does not exist' % (gistid,))
         return gist.get_api_data()
     def get_gists(self, userid=None):
         """
         Get all gists for given user. If userid is empty returned gists
         are for user who called the api
         :param userid: user to get gists for
         :type userid: Optional(str or int)
         """
         if not HasPermissionAny('hg.admin')():
             # make sure normal user does not pass someone else userid,
             # he is not allowed to do that
             if userid is not None and userid != request.authuser.user_id:
                 raise JSONRPCError(
                     'userid is not the same as your user'
+                )
         if userid is None:
             user_id = request.authuser.user_id
         else:
@@ @@ -2195,58 +1751,35 @@ class ApiController(JSONRPCController): @@
         return [
             gist.get_api_data()
             for gist in db.Gist().query()
                 .filter_by(is_expired=False)
                 .filter(db.Gist.owner_id == user_id)
                 .order_by(db.Gist.created_on.desc())
+        ]
     def create_gist(self, files, owner=None,
                     gist_type=db.Gist.GIST_PUBLIC, lifetime=-1,
                     description=''):
         """
         Creates new Gist
         :param files: files to be added to gist
             {'filename': {'content':'...', 'lexer': null},
              'filename2': {'content':'...', 'lexer': null}}
         :type files: dict
         :param owner: gist owner, defaults to api method caller
         :type owner: Optional(str or int)
         :param gist_type: type of gist 'public' or 'private'
         :type gist_type: Optional(str)
         :param lifetime: time in minutes of gist lifetime
         :type lifetime: Optional(int)
         :param description: gist description
         :type description: Optional(str)
         OUTPUT::
           id : <id_given_in_input>
           result : {
             "msg": "created new gist",
-            "gist": {}
+            "gist" : <gist_object>
+          }
           error :  null
         ERROR OUTPUT::
           id : <id_given_in_input>
           result : null
           error :  {
             "failed to create gist"
+          }
         """
         try:
             if owner is None:
                 owner = request.authuser.user_id
             owner = get_user_or_error(owner)
             gist = GistModel().create(description=description,
                                       owner=owner,
                                       ip_addr=request.ip_addr,
                                       gist_mapping=files,
                                       gist_type=gist_type,
@@ @@ -2256,97 +1789,101 @@ class ApiController(JSONRPCController): @@
                 msg='created new gist',
                 gist=gist.get_api_data()
+            )
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError('failed to create gist')
     # permission check inside
     def delete_gist(self, gistid):
         """
         Deletes existing gist
         :param gistid: id of gist to delete
         :type gistid: str
         OUTPUT::
           id : <id_given_in_input>
           result : {
             "deleted gist ID: <gist_id>",
+            "msg" : "deleted gist ID: <gist_id>",
             "gist": null
+          }
           error :  null
         ERROR OUTPUT::
           id : <id_given_in_input>
           result : null
           error :  {
             "failed to delete gist ID:<gist_id>"
+          }
         """
         gist = get_gist_or_error(gistid)
         if not HasPermissionAny('hg.admin')():
             if gist.owner_id != request.authuser.user_id:
                 raise JSONRPCError('gist `%s` does not exist' % (gistid,))
         try:
             GistModel().delete(gist)
             meta.Session().commit()
             return dict(
                 msg='deleted gist ID:%s' % (gist.gist_access_id,),
                 gist=None
+            )
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError('failed to delete gist ID:%s'
                                % (gist.gist_access_id,))
     # permission check inside
     def get_changesets(self, repoid, start=None, end=None, start_date=None,
                        end_date=None, branch_name=None, reverse=False, with_file_list=False, max_revisions=None):
         """
         TODO
         """
         repo = get_repo_or_error(repoid)
         if not HasRepoPermissionLevel('read')(repo.repo_name):
             raise JSONRPCError('Access denied to repo %s' % repo.repo_name)
         format = "%Y-%m-%dT%H:%M:%S"
         try:
             return [e.__json__(with_file_list) for e in
                 repo.scm_instance.get_changesets(start,
                                                  end,
                                                  datetime.strptime(start_date, format) if start_date else None,
                                                  datetime.strptime(end_date, format) if end_date else None,
                                                  branch_name,
                                                  reverse, max_revisions)]
         except EmptyRepositoryError as e:
             raise JSONRPCError('Repository is empty')
     # permission check inside
     def get_changeset(self, repoid, raw_id, with_reviews=False):
     def get_changeset(self, repoid, raw_id, with_reviews=False, with_comments=False, with_inline_comments=False):
         """
         TODO
         """
         repo = get_repo_or_error(repoid)
         if not HasRepoPermissionLevel('read')(repo.repo_name):
             raise JSONRPCError('Access denied to repo %s' % repo.repo_name)
         changeset = repo.get_changeset(raw_id)
         if isinstance(changeset, EmptyChangeset):
             raise JSONRPCError('Changeset %s does not exist' % raw_id)
         info = dict(changeset.as_dict())
         if with_reviews:
             reviews = ChangesetStatusModel().get_statuses(
                                 repo.repo_name, raw_id)
+                                repo.repo_name, changeset.raw_id)
             info["reviews"] = reviews
         if with_comments:
             comments = ChangesetCommentsModel().get_comments(
                                 repo.repo_id, changeset.raw_id)
             info["comments"] = comments
         if with_inline_comments:
             inline_comments = ChangesetCommentsModel().get_inline_comments(
                                 repo.repo_id, changeset.raw_id)
             info["inline_comments"] = inline_comments
         return info
     # permission check inside
     def get_pullrequest(self, pullrequest_id):
         """
         Get given pull request by id
         """
         pull_request = db.PullRequest.get(pullrequest_id)
         if pull_request is None:
             raise JSONRPCError('pull request `%s` does not exist' % (pullrequest_id,))
         if not HasRepoPermissionLevel('read')(pull_request.org_repo.repo_name):
             raise JSONRPCError('not allowed')

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -26,24 +26,25 @@ Original author and date, and relevant c @@
 """
 import logging
 import traceback
 import formencode
 import mercurial.unionrepo
 from tg import request
 from tg import tmpl_context as c
 from tg.i18n import ugettext as _
 from webob.exc import HTTPBadRequest, HTTPForbidden, HTTPFound, HTTPNotFound
 import kallithea
 import kallithea.lib.helpers as h
 from kallithea.controllers import base
 from kallithea.controllers.changeset import create_cs_pr_comment, delete_cs_pr_comment
 from kallithea.lib import auth, diffs, webutils
 from kallithea.lib.auth import HasRepoPermissionLevelDecorator, LoginRequired
 from kallithea.lib.graphmod import graph_data
 from kallithea.lib.page import Page
 from kallithea.lib.utils2 import ascii_bytes, safe_bytes, safe_int
 from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError, EmptyRepositoryError
 from kallithea.lib.webutils import url
 from kallithea.model import db, meta
 from kallithea.model.changeset_status import ChangesetStatusModel
@@ @@ -485,24 +486,26 @@ class PullrequestsController(base.BaseRe @@
         c.is_range = False
         try:
             if c.a_ref_type == 'rev': # this looks like a free range where target is ancestor
                 cs_a = org_scm_instance.get_changeset(c.a_rev)
                 root_parents = c.cs_ranges[0].parents
                 c.is_range = cs_a in root_parents
                 #c.merge_root = len(root_parents) > 1 # a range starting with a merge might deserve a warning
         except ChangesetDoesNotExistError: # probably because c.a_rev not found
             pass
         except IndexError: # probably because c.cs_ranges is empty, probably because revisions are missing
             pass
         rev_limit = safe_int(kallithea.CONFIG.get('next_iteration_rev_limit'), 0)
         avail_revs = set()
         avail_show = []
         c.cs_branch_name = c.cs_ref_name
         c.a_branch_name = None
         other_scm_instance = c.a_repo.scm_instance
         c.update_msg = ""
         c.update_msg_other = ""
         try:
             if not c.cs_ranges:
                 c.update_msg = _('Error: changesets not found when displaying pull request from %s.') % c.cs_rev
             elif org_scm_instance.alias == 'hg' and c.a_ref_name != 'ancestor':
                 if c.cs_ref_type != 'branch':
@@ @@ -554,24 +557,32 @@ class PullrequestsController(base.BaseRe @@
                         show.add(revs[0]) # make sure graph shows this so we can see how they relate
                         c.update_msg_other = _('Note: Branch %s has another head: %s.') % (c.cs_branch_name,
                             org_scm_instance.get_changeset(max(brevs)).short_id)
                     avail_show = sorted(show, reverse=True)
             elif org_scm_instance.alias == 'git':
                 c.cs_repo.scm_instance.get_changeset(c.cs_rev) # check it exists - raise ChangesetDoesNotExistError if not
                 c.update_msg = _("Git pull requests don't support iterating yet.")
         except ChangesetDoesNotExistError:
             c.update_msg = _('Error: some changesets not found when displaying pull request from %s.') % c.cs_rev
         if rev_limit:
             if len(avail_revs) - 1 > rev_limit:
                 c.update_msg = _('%d additional changesets are not shown.') % (len(avail_revs) - 1)
                 avail_show = []
             elif len(avail_show) - 1 > rev_limit:
                 c.update_msg = _('%d changesets available for merging are not shown.') % (len(avail_show) - len(avail_revs))
                 avail_show = sorted(avail_revs, reverse=True)
         c.avail_revs = avail_revs
         c.avail_cs = [org_scm_instance.get_changeset(r) for r in avail_show]
         c.avail_jsdata = graph_data(org_scm_instance, avail_show)
         raw_ids = [x.raw_id for x in c.cs_ranges]
         c.cs_comments = c.cs_repo.get_comments(raw_ids)
         c.cs_statuses = c.cs_repo.statuses(raw_ids)
         ignore_whitespace_diff = h.get_ignore_whitespace_diff(request.GET)
         diff_context_size = h.get_diff_context_size(request.GET)
         fulldiff = request.GET.get('fulldiff')
         diff_limit = None if fulldiff else self.cut_off_limit

kallithea/i18n/be/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # Copyright (C) 2016 Various authors, licensing as GPLv3
 # This file is distributed under the same license as the Kallithea project.
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 msgid "Repository not found in the filesystem"
 msgstr "Рэпазітар не знойдзены на файлавай сістэме"
 msgid "There are no changesets yet"
 msgstr "Яшчэ не было змен"
 msgid "Changeset for %s %s not found in %s"
 msgstr "Набор змен для %s %s не знойдзены ў %s"
 msgid "None"
 msgstr "Нічога"
@@ @@ -1405,36 +1405,39 @@ msgstr "Абедзьве" @@
 msgid "Remove this group"
 msgstr "Выдаліць гэту групу"
 msgid "Confirm to delete this group"
 msgstr "Пацвердзіце выдаленне гэтай групы карыстальнікаў"
 msgid "Repository Groups Administration"
 msgstr "Адміністраванне груп рэпазітароў"
 msgid "Number of Top-level Repositories"
 msgstr "Лік рэпазітароў верхняга ўзроўня"
 msgid "Type of repository to create."
 msgstr "Тып стваранага рэпазітара."
 msgid "Repository URL"
 msgstr "URL рэпазітара"
 msgid ""
 "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 "Кароткае і асэнсаванае. Для разгорнутага апісання выкарыстоўвайце файл "
 "README."
 msgid "Optionally select a group to put this repository into."
 msgstr "Апцыянальна абраць групу, у якую змясціць дадзены рэпазітар."
 msgid "Type of repository to create."
 msgstr "Тып стваранага рэпазітара."
 msgid "Landing revision"
 msgstr "Рэвізія для выгрузкі"
 msgid "%s Creating Repository"
 msgstr "Стварэнне рэпазітара %s"
 msgid "Creating repository"
 msgstr "Стварэнне рэпазітара"
 msgid "%s Repository Settings"
 msgstr "Налады рэпазітара %s"
@@ @@ -1520,31 +1523,24 @@ msgstr "Прыватны рэпазітар" @@
 msgid "Remote repository URL"
 msgstr "URL аддаленага рэпазітара"
 msgid "Pull Changes from Remote Repository"
 msgstr "Занесці змены з аддаленага рэпазітара"
 msgid "Confirm to pull changes from remote repository."
 msgstr "Пацвердзіце спампоўку змен з аддаленага рэпазітара."
 msgid "Remote repository"
 msgstr "Аддалены рэпазітар"
 msgid "Repository URL"
 msgstr "URL рэпазітара"
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 "Рэвізія па змоўчанні, з якой будзе рабіцца выгрузка файлаў пры спампоўцы"
 msgid "Change owner of this repository."
 msgstr "Змяніць уладальніка рэпазітара."
 msgid "Reset Statistics"
 msgstr "Скід статыстыкі"
 msgid "Confirm to remove current statistics."
 msgstr "Пацвердзіце скіданне статыстыкі."
 msgid "Repositories Administration"
 msgstr "Адміністраванне рэпазітароў"
@@ @@ -1882,29 +1878,29 @@ msgstr "Загрузка..." @@
 msgid "loading ..."
 msgstr "загрузка..."
 msgid "Search truncated"
 msgstr "Пошук усечаны"
 msgid "No matching files"
 msgstr "Няма супадзенняў"
 msgid "Open New Pull Request from {0}"
 msgstr "Стварыць новы pull-запыт з {0}"
 msgid "Open New Pull Request for {0} &rarr; {1}"
 msgstr "Стварыць новы pull-запыт для {0} &rarr; {1}"
 msgid "Show Selected Changesets {0} &rarr; {1}"
 msgstr "Паказаць выбраныя наборы змен: {0} &rarr; {1}"
 msgid "Open New Pull Request for {0}"
 msgstr "Стварыць новы pull-запыт для {0}"
 msgid "Show Selected Changesets {0}"
 msgstr "Паказаць выбраныя наборы змен {0}"
 msgid "Selection Link"
 msgstr "Спасылка выбару"
 msgid "Collapse Diff"
 msgstr "Згарнуць параўнанне"
 msgid "Expand Diff"
 msgstr "Разгарнуць параўнанне"
 msgid "No revisions"
 msgstr "Няма рэвізій"

kallithea/i18n/de/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -949,26 +949,26 @@ msgstr "Üngültige(nicht ASCII) Zeichen im Passwort" @@
 msgid "Invalid old password"
 msgstr "Ungültiges altes Passwort"
 msgid "Passwords do not match"
 msgstr "Die Passwörter stimmen nicht überein"
 msgid "Repository named %(repo)s already exists"
 msgstr "Es gibt bereits ein Repository mit \"%(repo)s\""
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr ""
 "Es gibt bereits ein Repository mit \"%(repo)s\" in der Gruppe \"%(group)s"
 "\""
 "Es gibt bereits ein Repository mit \"%(repo)s\" in der Gruppe "
 "\"%(group)s\""
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr "Eine Repositorygruppe mit dem Namen \"%(repo)s\" existiert bereits"
 msgid "Invalid repository URL"
 msgstr "Ungültige Repository-URL"
 msgid "Fork has to be the same type as parent"
 msgstr "Forke um den selben typ wie der Vorgesetze zu haben"
 msgid "You don't have permissions to create repository in this group"
 msgstr ""
@@ @@ -1606,63 +1606,69 @@ msgstr "Auf untergeordnete Elemente anwe @@
 msgid "Both"
 msgstr "Beide"
 msgid ""
 "Set or revoke permission to all children of that group, including non-"
 "private repositories and other groups if selected."
 msgstr ""
 "Setzen oder zurückziehen von Berechtigungen bezüglich aller "
 "untergeordneten Elemente, einschließlich nicht-privater Repositories und "
 "anderer Gruppen, falls ausgewählt."
 msgid "Type name of user"
 msgstr "Typname des Benutzers"
 msgid "Remove this group"
 msgstr "Diese Gruppe löschen"
 msgid "Confirm to delete this group"
 msgstr "Löschen der Gruppe bestätigen"
 msgid "Repository group %s"
 msgstr "Repository-Gruppe %s"
 msgid "Repository Groups Administration"
 msgstr "Repositorygruppenverwaltung"
 msgid "Number of Top-level Repositories"
 msgstr "Anzahl der Repositories oberster Ebene"
 msgid "Type of repository to create."
 msgstr "Repository Typ der erstellt werden soll."
 msgid "Clone remote repository"
 msgstr "Entferntes Repository clonen"
 msgid "Repository URL"
 msgstr "Repository URL"
 msgid ""
 "Optional: URL of a remote repository. If set, the repository will be "
 "created as a clone from this URL."
 msgstr ""
 "Optional: URL eines entfernten Repositories. Falls gesetzt, dann wird das "
 "Repository als Clon von dieser URL erstellt."
 msgid ""
 "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 "Halten Sie es kurz und prägnant. Benutzen Sie eine README-Datei für "
 "längere Beschreibungen."
 msgid "Optionally select a group to put this repository into."
 msgstr ""
 "Wähle bei Bedarf eine Gruppe, der dieses Repository zugeordnet werden "
 "soll."
 msgid "Type of repository to create."
 msgstr "Repository Typ der erstellt werden soll."
 msgid "Landing revision"
 msgstr "Start Revision"
 msgid ""
 "Default revision for files page, downloads, full text search index and "
 "readme generation"
 msgstr ""
 "Vorgabe-Revision für Datei-Seiten, Downloads, Volltext-Indizierung und "
 "Doku-Erzeugung"
 msgid "%s Creating Repository"
 msgstr "%s Erstelle Repository"
@@ @@ -1785,58 +1791,34 @@ msgstr "Fork des Repository" @@
 msgid "Remote repository URL"
 msgstr "URL des entfernten Repository"
 msgid "Pull Changes from Remote Repository"
 msgstr "Hole Änderungen vom entfernten Repository"
 msgid "Confirm to pull changes from remote repository."
 msgstr "Bestätige die Abholung von Änderungen vom entfernten Repository."
 msgid "This repository does not have a remote repository URL."
 msgstr "Für dieses Repository ist keine nicht-lokale URL angegeben."
 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 "Remote repository"
 msgstr "Entferntes Repository"
 msgid "Repository URL"
 msgstr "Repository URL"
 msgid ""
 "Optional: URL of a remote repository. If set, the repository can be "
 "pulled from this URL."
 msgstr ""
 "Optional: URL eines entfernten Repositories. Falls gesetzt, dann kann das "
 "Repository von dieser URL bezogen werden."
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr "Standardrevision für Dateiseite, Downloads, Whoosh und Readme"
 msgid "Type name of user"
 msgstr "Typname des Benutzers"
 msgid "Change owner of this repository."
 msgstr "Besitzer des Repositorys ändern."
 msgid "Processed commits"
 msgstr "Verarbeitete Commits"
 msgid "Processed progress"
 msgstr "Verarbeiteter Fortschritt"
 msgid "Reset Statistics"
 msgstr "Statistiken zurücksetzen"
@@ @@ -2487,17 +2469,14 @@ msgstr "Herunterladen als zip" @@
 msgid "Feed"
 msgstr "Feed"
 msgid "Latest Changes"
 msgstr "Letzte Änderungen"
 msgid "Quick Start"
 msgstr "Schnelleinstieg"
 msgid "Add or upload files directly via Kallithea"
 msgstr "Dateien direkt über Kallithea hinzufügen oder hochladen"
 msgid "Readme file from revision %s:%s"
 msgstr "Liesmich-Datei von Revision %s:%s"
 msgid "Download %s as %s"
 msgstr "%s als %s herunterladen"

kallithea/i18n/el/LC_MESSAGES/kallithea.po

➞

Show inline comments

 msgid "Error occurred during updating visualisation settings"
 msgstr "Παρουσιάστηκε σφάλμα κατά την ενημέρωση των ρυθμίσεων απεικόνισης"
 msgid "Please enter email address"
 msgstr "Παρακαλώ εισάγετε την διεύθυνση ηλεκτρονικού ταχυδρομείου"
 msgid "Send email task created"
 msgstr "Δημιουργήθηκε η εργασία της αποστολής ηλεκτρονικού ταχυδρομείου"
 msgid "Hook already exists"
 msgstr "Το άγκιστρο υπάρχει ήδη"
 msgid ""
 "Hook names with \".kallithea_\" are reserved for internal use. Please use "
 "another hook name."
 msgstr ""
 "Άγκιστρα με το όνομα \".kallithea_\" είναι δεσμευμένα για εσωτερική "
 "χρήση. Παρακαλώ δώστε άλλο όνομα στο άγκιστρο."
 msgid "Added new hook"
 msgstr "Προσθήκη νέου άγκιστρου"
 msgid "Updated hooks"
 msgstr "Τα άγκιστρα ενημερώθηκαν"
 msgid "Error occurred during hook creation"
 msgstr "Παρουσιάστηκε σφάλμα κατά την δημιουργία του άγκιστρου"
 msgid "Whoosh reindex task scheduled"
 msgstr "Προγραμματίστηκε η αναδημιουργία ευρετηρίου για το Whoosh"
 msgid "Binary file"
 msgstr "Δυαδικό αρχείο"
 msgid ""
 "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 "Το σετ αλλαγών ήταν πολύ μεγάλο και αποκόπηκε, χρησιμοποιήστε το μενού "
 "διαφορών για να εμφανίσετε τις διαφορές"
 msgid "No changes detected"
 msgstr "Δεν εντοπίστηκαν αλλαγές"
 msgid "Show whitespace changes"
 msgstr "Εμφάνιση αλλαγής κενού"
 msgid "Ignore whitespace changes"
 msgstr "Αγνόηση αλλαγής κενού"
 msgid "Increase diff context to %(num)s lines"
 msgstr "Αύξηση του diff πλαισίου σε %(num)s γραμμές"
 msgid "Deleted branch: %s"
 msgstr "Διαγραφή κλάδου: %s"
 msgid "Created tag: %s"
 msgstr "Δημιουργηθείσα ετικέτα: %s"
 msgid "Changeset %s not found"
 msgstr "Δεν βρέθηκε το σετ αλλαγών %s"
@@ @@ -773,24 +786,72 @@ msgstr "τροποποιημένο" @@
 msgid "del"
 msgstr "διαγραμμένο"
 msgid "rename"
 msgstr "μετονομασία"
 msgid "chmod"
 msgstr "chmod"
 msgid "SSH key is missing"
 msgstr "Το κλειδί SSH λείπει"
 msgid ""
 "Invalid SSH key - it must have both a key type and a base64 part, like "
 "'ssh-rsa ASRNeaZu4FA...xlJp='"
 msgstr ""
 "Άκυρο κλειδί SSH - πρέπει να έχει έναν τύπο κλειδιού καθώς και ένα τμήμα "
 "base64, όπως \"ssh-rsa ASRNeaZu4FA ... xlJp =\""
 msgid ""
 "Invalid SSH key - it must start with key type 'ssh-rsa', 'ssh-dss', 'ssh-"
 "ed448', or 'ssh-ed25519'"
 msgstr ""
 "Άκυρο κλειδί SSH - πρέπει να ξεκινά με τύπο κλειδιού 'ssh-rsa',ssh-"
 "dss','ssh-ed448' ή 'ssh-ed25519'"
 msgid "Invalid SSH key - unexpected characters in base64 part %r"
 msgstr "Άκυρο κλειδί SSH - μη αναμενόμενοι χαρακτήρες στο τμήμα base64 %r"
 msgid ""
 "Invalid SSH key - base64 part %r seems truncated (it can't be decoded)"
 msgstr ""
 "Άκυρο κλειδί SSH - το base64 μέρος %r φαίνεται κομμένο (δεν μπορεί να "
 "αποκωδικοποιηθεί)"
 msgid ""
 "Invalid SSH key - base64 part %r seems truncated (it contains a partial "
 "string length)"
 msgstr ""
 "Άκυρο κλειδί SSH - το base64 μέρος %r φαίνεται κομμένο (περιέχει ένα "
 "μερικό μήκος συμβολοσειράς)"
 msgid ""
 "Invalid SSH key - base64 part %r seems truncated (it is too short for "
 "declared string length %s)"
 msgstr ""
 "Άκυρο κλειδί SSH - το τμήμα base64 %r φαίνεται να είναι κομμένο (είναι "
 "πολύ μικρό για το δηλωμένο μήκος συμβολοσειράς %s)"
 msgid ""
 "Invalid SSH key - base64 part %r seems truncated (it contains too few "
 "strings for a %s key)"
 msgstr ""
 "Άκυρο κλειδί SSH - το base64 τμήμα %r φαίνεται να είναι περικομμένο "
 "(περιέχει πολύ λίγες συμβολοσειρές για ένα κλειδί %s)"
 msgid "Invalid SSH key - it is a %s key but the base64 part contains %r"
 msgstr ""
 "Άκυρο κλειδί SSH - είναι ένα κλειδί %s αλλά το base64 μέρος περιέχει %r"
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d έτος"
 msgstr[1] "%d έτη"
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d μήνας"
 msgstr[1] "%d μήνες"
 msgid "%d day"
 msgid_plural "%d days"
 msgid "Enter a value %(min)i characters long or more"
 msgstr "Εισαγάγετε μια τιμή με μήκος %(min)i χαρακτήρες ή περισσότερους"
 msgid "Please enter a password"
 msgstr "Παρακαλώ εισάγετε έναν κωδικό πρόσβασης"
 msgid "Enter %(min)i characters or more"
 msgstr "Εισαγάγετε %(min)i χαρακτήρες ή περισσότερους"
 msgid "Name must not contain only digits"
 msgstr "Το όνομα δεν πρέπει να περιέχει μόνο ψηφία"
 msgid ""
 "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on "
 "%(branch)s by %(cs_author_username)s"
 msgstr ""
 "[Σχόλιο] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" στο "
 "%(branch)s από %(cs_author_username)s"
 msgid "New user %(new_username)s registered"
 msgstr "Καταχωρήθηκε νέος χρήστης %(new_username)s"
 msgid ""
 "[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from "
 "%(pr_source_branch)s by %(pr_owner_username)s"
 msgstr ""
 "[Κριτική] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" στο "
 "%(pr_source_branch)s από %(pr_owner_username)s"
 msgid ""
 "[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from "
 "%(pr_source_branch)s by %(pr_owner_username)s"
 msgstr ""
 "[Σχόλιο] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" στο "
 "%(pr_source_branch)s από %(pr_owner_username)s"
 msgid "Closing"
 msgstr "Κλείσιμο"
 msgid "Cannot create empty pull request"
 msgstr "Δεν είναι δυνατή η δημιουργία κενής αίτησης έλξης"
 msgid ""
 "Cannot create pull request - criss cross merge detected, please merge a "
 "later %s revision to %s"
 msgstr ""
 "Δεν είναι δυνατή η δημιουργία αίτησης έλξης - εντοπίστηκε διασταυρούμενη "
 "συγχώνευση, παρακαλώ συγχωνεύστε μια μεταγενέστερη αναθεώρηση %s στο %s"
 msgid "Repository named %(repo)s already exists"
 msgstr "Το αποθετήριο με το όνομα %(repo)s υπάρχει ήδη"
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "Το αποθετήριο \"%(repo)s\" υπάρχει ήδη στην ομάδα \"%(group)s\""
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr "Η ομάδα αποθετηρίου με το όνομα \"%(repo)s\" υπάρχει ήδη"
 msgid "Invalid repository URL"
 msgstr "Μη έγκυρη διεύθυνση URL αποθετηρίου"
 msgid "Invalid repository URL. It must be a valid http, https, or ssh URL"
 msgstr ""
 "Μη έγκυρο αποθετήριο URL. Πρέπει να είναι μια έγκυρη http, https ή ssh "
 "διεύθυνση URL"
 msgid "Fork has to be the same type as parent"
 msgstr "Ο κλώνος πρέπει να έχει τον ίδιο τύπο με τον γονέα του"
 msgid "You don't have permissions to create repository in this group"
 msgstr "Δεν έχετε δικαιώματα δημιουργίας αποθετηρίου σε αυτήν την ομάδα"
 msgid "no permission to create repository in root location"
 msgstr "Δεν υπάρχει δικαίωμα δημιουργίας αποθετηρίου στη ριζική τοποθεσία"
 msgid "You don't have permissions to create a group in this location"
 msgstr "Δεν έχετε δικαιώματα δημιουργίας ομάδας σε αυτήν την τοποθεσία"
@@ @@ -1814,62 +1901,68 @@ msgstr "Εφαρμογή στα θυγατρικά" @@
 msgid "Both"
 msgstr "Και τα δυο"
 msgid ""
 "Set or revoke permission to all children of that group, including non-"
 "private repositories and other groups if selected."
 msgstr ""
 "Ορίστε ή ανακαλέστε τα θυγατρικά δικαιώματα αυτής της ομάδας, "
 "συμπεριλαμβανομένων των μη ιδιωτικών αποθετηρίων και άλλων ομάδων, εάν "
 "επιλεγεί."
 msgid "Type name of user"
 msgstr "Πληκτρολογήστε το όνομα του χρήστη"
 msgid "Remove this group"
 msgstr "Κατάργηση αυτής της ομάδας"
 msgid "Confirm to delete this group"
 msgstr "Επιβεβαιώστε για να διαγράψετε αυτή την ομάδα"
 msgid "Repository group %s"
 msgstr "Ομάδα αποθετηρίων %s"
 msgid "Repository Groups Administration"
 msgstr "Διαχείριση Ομάδων Αποθετηρίου"
 msgid "Number of Top-level Repositories"
 msgstr "Αριθμός αποθετηρίων ανώτατου επιπέδου"
 msgid "Type of repository to create."
 msgstr "Τύπος αποθετηρίου προς δημιουργία."
 msgid "Clone remote repository"
 msgstr "Κλωνοποίηση απομακρυσμένου αποθετηρίου"
 msgid "Repository URL"
 msgstr "URL Αποθετηρίου"
 msgid ""
 "Optional: URL of a remote repository. If set, the repository will be "
 "created as a clone from this URL."
 msgstr ""
 "Προαιρετικό: Διεύθυνση URL ενός απομακρυσμένου αποθετηρίου. Εάν οριστεί, "
 "το αποθετήριο θα δημιουργηθεί ως κλώνος από αυτήν τη διεύθυνση URL."
 msgid ""
 "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 "Κρατήστε τη σύντομη και περιεκτική. Χρησιμοποιήστε ένα αρχείο README για "
 "μεγαλύτερες περιγραφές."
 msgid "Optionally select a group to put this repository into."
 msgstr ""
 "Προαιρετικά, επιλέξτε μια ομάδα για να τοποθετήσετε αυτό το αποθετήριο."
 msgid "Type of repository to create."
 msgstr "Τύπος αποθετηρίου προς δημιουργία."
 msgid "Landing revision"
 msgstr "Αναθεώρηση εκφόρτωσης"
 msgid ""
 "Default revision for files page, downloads, full text search index and "
 "readme generation"
 msgstr ""
 "Προεπιλεγμένη αναθεώρηση για τη σελίδα αρχείων, λήψεων, ευρετήριο "
 "αναζήτησης πλήρους κειμένου και δημιουργία readme"
 msgid "%s Creating Repository"
 msgstr "%s Δημιουργία Αποθετηρίου"
 msgid "Confirm to pull changes from remote repository."
 msgstr ""
 "Επιβεβαιώστε ότι θα τραβήξετε αλλαγές από το απομακρυσμένο αποθετήριο "
 "δεδομένων."
 msgid "This repository does not have a remote repository URL."
 msgstr ""
 "Αυτό το αποθετήριο δεν έχει διεύθυνση URL απομακρυσμένου αποθετηρίου."
 msgid "Permanent URL"
 msgstr "Μόνιμη διεύθυνση URL"
 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 "Remote repository"
 msgstr "Απομακρυσμένο αποθετήριο"
 msgid "Repository URL"
 msgstr "URL Αποθετηρίου"
 msgid ""
 "Optional: URL of a remote repository. If set, the repository can be "
 "pulled from this URL."
 msgstr ""
 "Προαιρετικό: Διεύθυνση URL ενός απομακρυσμένου αποθετηρίου. Εάν οριστεί, "
 "το αποθετήριο μπορεί να τραβηχτεί από αυτήν τη διεύθυνση URL."
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 "Προεπιλεγμένη αναθεώρηση για τη σελίδα αρχείων, λήψεων, Whoosh και readme"
 msgid "Type name of user"
 msgstr "Πληκτρολογήστε το όνομα του χρήστη"
 msgid "Change owner of this repository."
 msgstr "Αλλάξτε τον κάτοχο αυτού του αποθετηρίου."
 msgid "Processed commits"
 msgstr "Επεξεργασμένα commits"
 msgid "Processed progress"
 msgstr "Επεξεργασμένη πρόοδος"
 msgid "Reset Statistics"
 msgstr "Επαναφορά Στατιστικών"
@@ @@ -2127,24 +2193,27 @@ msgid "ReCaptcha private key" @@
 msgstr "Ιδιωτικό κλειδί ReCaptcha"
 msgid ""
 "Private key for reCaptcha system. Setting this value will enable captcha "
 "on registration."
 msgstr ""
 "Ιδιωτικό κλειδί για το σύστημα reCaptcha. Ο καθορισμός αυτής της τιμής θα "
 "ενεργοποιήσει το captcha κατά την εγγραφή."
 msgid "Save Settings"
 msgstr "Αποθήκευση Ρυθμίσεων"
 msgid "Custom Hooks are not enabled"
 msgstr "Τα προσαρμοσμένα άγκιστρα δεν είναι ενεργά"
 msgid "Failed to remove hook"
 msgstr "Απέτυχε η αφαίρεση γάντζου"
 msgid "Rescan options"
 msgstr "Επιλογές Επανασάρωσης"
 msgid "Delete records of missing repositories"
 msgstr "Διαγραφή εγγραφών αποθετηρίων που λείπουν"
 msgid ""
 "Check this option to remove all comments, pull requests and other records "
 "related to repositories that no longer exist in the filesystem."
@@ @@ -2155,24 +2224,36 @@ msgstr "" @@
 msgid "Invalidate cache for all repositories"
 msgstr "Ακυρώνει την προσωρινή αποθήκευση για όλα τα αποθετήρια"
 msgid "Check this to reload data and clear cache keys for all repositories."
 msgstr ""
 "Επιλέξτε αυτό για να φορτώσετε ξανά τα δεδομένα και να καταργήστε την "
 "cache για όλα τα αποθετήρια."
 msgid "Install Git hooks"
 msgstr "Εγκατάσταση Git hooks"
 msgid "Install and overwrite Git hooks"
 msgstr "Εγκατάσταση και επανεγγραφή Git hooks"
 msgid ""
 "Install Kallithea's internal hooks for all Git repositories. Existing "
 "hooks that don't seem to come from Kallithea will be disabled by renaming "
 "to .bak extension."
 msgstr ""
 "Εγκαταστήστε τα εσωτερικά hooks της Kallithea για όλα τα αποθετήρια Git. "
 "Τα υπάρχοντα hooks που δεν φαίνεται να προέρχονται από την Kallithea θα "
 "απενεργοποιηθούν με τη μετονομασία σε επέκταση .bak."
 msgid "Rescan Repositories"
 msgstr "Επανασάρωση αποθετηρίων"
 msgid "Index build option"
 msgstr "Επιλογή δημιουργίας ευρετηρίου"
 msgid "Build from scratch"
 msgstr "Κατασκευή από το μηδέν"
 msgid ""
 "This option completely reindexes all of the repositories for proper "
 "fulltext search capabilities."
@@ @@ -2656,29 +2737,29 @@ msgstr "Φόρτωση..." @@
 msgid "loading ..."
 msgstr "φόρτωση ..."
 msgid "Search truncated"
 msgstr "Περικομμένη αναζήτηση"
 msgid "No matching files"
 msgstr "Δεν υπάρχουν αρχεία που να ταιριάζουν"
 msgid "Open New Pull Request from {0}"
 msgstr "Άνοιγμα νέας αίτησης έλξης από {0}"
 msgid "Open New Pull Request for {0} &rarr; {1}"
 msgstr "Άνοιγμα νέου αιτήματος έλξης για {0} &rarr; {1}"
 msgid "Show Selected Changesets {0} &rarr; {1}"
 msgstr "Εμφάνιση Επιλεγμένων Σετ Αλλαγών {0} &rarr; {1}"
 msgid "Open New Pull Request for {0}"
 msgstr "Άνοιγμα νέου αιτήματος έλξης για {0}"
 msgid "Show Selected Changesets {0}"
 msgstr "Εμφάνιση Επιλεγμένων Σετ Αλλαγών {0}"
 msgid "Selection Link"
 msgstr "Σύνδεσμος Επιλογής"
 msgid "Collapse Diff"
 msgstr "Σύμπτυξη Διαφοράς"
 msgid "Expand Diff"
 msgstr "Ανάπτυξη Διαφοράς"
 msgid "No revisions"
 msgstr "Χωρίς αναθεωρήσεις"
@@ @@ -2763,24 +2844,27 @@ msgid "Position in this list of changese @@
 msgstr "Θέση σε αυτήν τη λίστα των αλλαγών"
 msgid ""
 "Changeset status: %s by %s\n"
 "Click to open associated pull request %s"
 msgstr ""
 "Κατάσταση συνόλου αλλαγών: %s από %s\n"
 "Κάντε κλικ για να ανοίξετε το συσχετισμένο αίτημα έλξης %s"
 msgid "Changeset status: %s by %s"
 msgstr "Κατάσταση σετ αλλαγών: %s από %s"
 msgid "(No commit message)"
 msgstr "(Χωρίς κείμενο commit)"
 msgid "Expand commit message"
 msgstr "Ανάπτυξη μηνύματος commit"
 msgid "%s comments"
 msgstr "%s σχόλια"
 msgid "Bookmark %s"
 msgstr "Σελιδοδείκτης %s"
 msgid "Tag %s"
 msgstr "Ετικέτα %s"
@@ @@ -2925,24 +3009,30 @@ msgstr "Άγνωστη λειτουργία: %r" @@
 msgid "No file after"
 msgstr "Δεν υπάρχει αρχείο μετά"
 msgid "File after"
 msgstr "Αρχείο μετά"
 msgid "Show full diff for this file"
 msgstr "Εμφάνιση πλήρους διαφοράς για αυτό το αρχείο"
 msgid "Show full side-by-side diff for this file"
 msgstr "Εμφάνιση πλήρους διαφοράς δίπλα-δίπλα για αυτό το αρχείο"
 msgid "Raw diff for this file"
 msgstr "Διαφορές για αυτό το αρχείο"
 msgid "Download diff for this file"
 msgstr "Μεταφόρτωση διαφοράς για αυτό το αρχείο"
 msgid "Show inline comments"
 msgstr "Εμφάνιση ενσωματωμένων σχολίων"
 msgid "No changesets"
 msgstr "Χωρίς σετ αλλαγών"
 msgid "Criss cross merge situation with multiple merge ancestors detected!"
 msgstr ""
 "Εντοπίστηκε κατάσταση διασταυρούμενης συγχώνευσης με πολλούς προγόνους "
 "συγχώνευσης!"
 msgid ""
@@ @@ -3611,17 +3701,14 @@ msgstr "Τελευταίες Αλλαγές" @@
 msgid "Quick Start"
 msgstr "Γρήγορη Εκκίνηση"
 msgid "Add or upload files directly via Kallithea"
 msgstr "Προσθέστε ή ανεβάστε αρχεία απευθείας μέσω Καλλιθέας"
 msgid "Push new repository"
 msgstr "Ώθηση νέου αποθετηρίου"
 msgid "Existing repository?"
 msgstr "Υπάρχον αποθετήριο;"
 msgid "Readme file from revision %s:%s"
 msgstr "Αρχείο Readme από την αναθεώρηση %s:%s"
 msgid "Download %s as %s"
 msgstr "Λήψη %s ως %s"

kallithea/i18n/es/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -4,24 +4,27 @@ @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 msgid "There are no changesets yet"
 msgstr "Aún no hay cambios"
 msgid "SSH access is disabled."
 msgstr "El acceso mediante SSH está desactivado."
 msgid "None"
 msgstr "Ninguno"
 msgid "(closed)"
 msgstr "(cerrado)"
 msgid "Successfully deleted pull request %s"
 msgstr "Petición de pull %s eliminada correctamente"
 msgid "Such revision does not exist for this repository"
 msgstr "La revisión no existe en este repositorio"
@@ @@ -68,24 +71,27 @@ msgstr "" @@
 msgid "%s committed on %s"
 msgstr "%s anotó en %s"
 msgid "Changeset was too big and was cut off..."
 msgstr "El cambio era demasiado grande y se redució..."
 msgid "%s %s feed"
 msgstr "%s%s canal"
 msgid "Click here to add new file"
 msgstr "Haga clic aquí para añadir un archivo nuevo"
 msgid "There are no files yet."
 msgstr "Aún no hay archivos."
 msgid "%s at %s"
 msgstr "%s en %s"
 msgid "You can only delete files with revision being a valid branch"
 msgstr ""
 "Sólo puede borrar archivos si la revisión pertenece a una rama válida"
 msgid "Deleted file %s via Kallithea"
 msgstr "Archivo %s eliminado mediante Kallithea"
 msgid "Successfully deleted file %s"
 msgstr "El archivo %s se eliminó correctamente"
@@ @@ -202,24 +208,27 @@ msgstr "Ocurrió un error al crear la petición de pull" @@
 msgid "Successfully opened new pull request"
 msgstr "La petición de pull se ha creado correctamente"
 msgid "No description"
 msgstr "No hay descripción"
 msgid "Pull request updated"
 msgstr "Petición pull actualizada"
 msgid "Successfully deleted pull request"
 msgstr "Petición pull eliminada correctamente"
 msgid "Revision %s not found in %s"
 msgstr "No se ha encontrado la revisión %s en %s"
 msgid "This pull request has already been merged to %s."
 msgstr "La petición pull ya ha sido incluida a %s."
 msgid "This pull request has been closed and can not be updated."
 msgstr "La petición pull esta cerrada y no se puede actualizar."
 msgid "Invalid search query. Try quoting it."
 msgstr "Consulta de búsqueda inválida. Inténtelo entre comillas."
 msgid "An error occurred during search operation."
 msgstr "Ocurrió un error mientras se ejecutaba la búsqueda."

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -229,25 +229,25 @@ msgid "Changeset" @@
 msgstr "Changements"
 msgid "Special"
 msgstr "Spécial"
 msgid "Peer branches"
 msgstr "Branches appairées"
 msgid "Bookmarks"
 msgstr "Signets"
 msgid "Error creating pull request: %s"
-msgstr "Erreur de création de la demande de pull : %s"
+msgstr "Erreur de création de la demande de pull : %s"
 msgid "Error occurred while creating pull request"
 msgstr "Une erreur est survenue durant la création de la pull request"
 msgid "Successfully opened new pull request"
 msgstr "La requête de pull a été ouverte avec succès"
 msgid "New pull request iteration created"
 msgstr "Nouvelle itération de requête de pull créée"
 msgid "Meanwhile, the following reviewers have been added: %s"
 msgstr "Entretemps, les relecteurs suivants on été ajoutés : %s"
 msgid "This pull request has been closed and can not be updated."
 msgstr "Cette pull request a été fermée et ne peut pas être mise à jour."
 msgid "The following additional changes are available on %s:"
 msgstr ""
 "Les modifications additionnelles suivantes sont disponibles sur %s :"
 msgid "No additional changesets found for iterating on this pull request."
 msgstr "Pas de changeset additionnel trouvé pour cette requête de pull."
 msgid "Note: Branch %s has another head: %s."
-msgstr "Note : La branche %s a une autre tête : %s."
+msgstr "Note : La branche %s a une autre tête : %s."
 msgid "Git pull requests don't support iterating yet."
 msgstr ""
 "Les itérations des requêtes de pull Git ne sont pas encore supportées."
 msgid ""
 "Error: some changesets not found when displaying pull request from %s."
 msgstr ""
 "Erreur : certains changesets n'ont pas été trouvés lors de l'affichage la "
 "requête de pull depuis %s."
 msgid "The diff can't be shown - the PR revisions could not be found."
@@ @@ -362,40 +362,40 @@ msgstr "Non modifié" @@
 msgid "Successfully updated gist content"
 msgstr "Le contenu du gist a été mis à jour avec succès"
 msgid "Successfully updated gist data"
 msgstr "Les données du gist on été mises à jour avec succès"
 msgid "Error occurred during update of gist %s"
 msgstr "Une erreur est survenue durant la mise à jour du gist %s"
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
-"Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon "
+"Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon "
 "fonctionnement de l’application"
 msgid "Your account was updated successfully"
 msgstr "Votre compte a été mis à jour avec succès"
 msgid "Error occurred during update of user %s"
 msgstr "Une erreur est survenue durant la mise à jour de l'utilisateur %s"
 msgid "Error occurred during update of user password"
 msgstr ""
 "Une erreur est survenue durant la mise à jour du mot de passe de "
 "l'utilisateur"
 msgid "Added email %s to user"
-msgstr "L’e-mail « %s » a été ajouté à l’utilisateur"
+msgstr "L’e-mail « %s » a été ajouté à l’utilisateur"
 msgid "An error occurred during email saving"
 msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail"
 msgid "Removed email from user"
 msgstr "L’e-mail a été enlevé de l’utilisateur"
 msgid "API key successfully created"
 msgstr "Clé d'API créée avec succès"
 msgid "API key successfully reset"
 msgstr "Clé d'API remise à zéro avec succès"
@@ @@ -552,25 +552,25 @@ msgid "An error occurred during deletion @@
 msgstr ""
 "Une erreur est survenue durant la suppression des statistiques du dépôt"
 msgid "Updated VCS settings"
 msgstr "Réglages des gestionnaires de versions mis à jour"
 msgid "Error occurred while updating application settings"
 msgstr ""
 "Une erreur est survenue durant la mise à jour des réglages de "
 "l'application"
 msgid "Repositories successfully rescanned. Added: %s. Removed: %s."
-msgstr "Dépôts ré-analysés avec succès. Ajouté : %s. Supprimé : %s."
+msgstr "Dépôts ré-analysés avec succès. Ajouté : %s. Supprimé : %s."
 msgid "Invalidated %s repositories"
 msgstr "%s dépôts invalidés"
 msgid "Updated application settings"
 msgstr "Réglages mis à jour"
 msgid "Updated visualisation settings"
 msgstr "Réglages d’affichage mis à jour"
 msgid "Error occurred during updating visualisation settings"
 msgstr ""
@@ @@ -581,26 +581,26 @@ msgid "Please enter email address" @@
 msgstr "Veuillez entrer votre adresse e-mail"
 msgid "Send email task created"
 msgstr "Tâche d'envoi d'e-mail créée"
 msgid "Hook already exists"
 msgstr "Le hook existe déjà"
 msgid ""
 "Hook names with \".kallithea_\" are reserved for internal use. Please use "
 "another hook name."
 msgstr ""
 "Les noms de hook avec \".kallithea_\" sont réservés pour un usage interne. "
 "Merci de choisir un autre nom pour le hook."
 "Les noms de hook avec \".kallithea_\" sont réservés pour un usage "
 "interne. Merci de choisir un autre nom pour le hook."
 msgid "Added new hook"
 msgstr "Le nouveau hook a été ajouté"
 msgid "Updated hooks"
 msgstr "Hooks mis à jour"
 msgid "Error occurred during hook creation"
 msgstr "Une erreur est survenue durant la création du hook"
 msgid "Whoosh reindex task scheduled"
 msgstr "La tâche de réindexation Whoosh a été planifiée"
@@ @@ -670,43 +670,43 @@ msgstr "" @@
 "Vous devez être un utilisateur enregistré pour effectuer cette action"
 msgid "You need to be signed in to view this page"
 msgstr "Vous devez être connecté pour visualiser cette page"
 msgid "Binary file"
 msgstr "Fichier binaire"
 msgid ""
 "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 "Cet ensemble de changements était trop gros pour être affiché et a été "
-"découpé, utilisez le menu « diff » pour afficher les différences"
+"découpé, utilisez le menu « diff » pour afficher les différences"
 msgid "No changes detected"
 msgstr "Aucun changement détecté"
 msgid "Show whitespace changes"
 msgstr "Afficher les modifications d'espaces et de tabulations"
 msgid "Ignore whitespace changes"
 msgstr "Ignorer les modifications d'espaces et de tabulations"
 msgid "Increase diff context to %(num)s lines"
 msgstr "Augmenter le contexte du diff à %(num)s lignes"
 msgid "Deleted branch: %s"
-msgstr "Branche supprimée : %s"
+msgstr "Branche supprimée : %s"
 msgid "Created tag: %s"
-msgstr "Étiquette créée : %s"
+msgstr "Étiquette créée : %s"
 msgid "Changeset %s not found"
 msgstr "Ensemble de changements %s non trouvé"
 msgid "Show all combined changesets %s->%s"
 msgstr "Afficher les changements combinés %s->%s"
 msgid "Compare view"
 msgstr "Vue de comparaison"
 msgid "and"
 msgstr "et"
@@ @@ -832,36 +832,37 @@ msgstr "" @@
 msgid ""
 "Invalid SSH key - base64 part %r seems truncated (it contains a partial "
 "string length)"
 msgstr ""
 "Clé SSH invalide – la partie base64 %r semble tronquée (elle contient une "
 "taille partielle)"
 msgid ""
 "Invalid SSH key - base64 part %r seems truncated (it is too short for "
 "declared string length %s)"
 msgstr ""
 "Clé SSH invalide – la partie base64 %r semble tronquée (elle est trop court "
 "pour la taille déclarée %s)"
 "Clé SSH invalide – la partie base64 %r semble tronquée (elle est trop "
 "court pour la taille déclarée %s)"
 msgid ""
 "Invalid SSH key - base64 part %r seems truncated (it contains too few "
 "strings for a %s key)"
 msgstr ""
 "Clé SSH invalide – la partie base64 %r semble tronquée (elle ne contient pas "
 "assez de parties pour une clé %s)"
 "Clé SSH invalide – la partie base64 %r semble tronquée (elle ne contient "
 "pas assez de parties pour une clé %s)"
 msgid "Invalid SSH key - it is a %s key but the base64 part contains %r"
 msgstr "Clé SSH invalide – c'est une clé %s mais la partie base64 contient %r"
 msgstr ""
 "Clé SSH invalide – c'est une clé %s mais la partie base64 contient %r"
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d an"
 msgstr[1] "%d ans"
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mois"
 msgstr[1] "%d mois"
 msgid "%d day"
@@ @@ -1010,211 +1011,212 @@ msgid "Please enter a password" @@
 msgstr "Veuillez entrer un mot de passe"
 msgid "Enter %(min)i characters or more"
 msgstr "Entrez au moins %(min)i caractères"
 msgid "Name must not contain only digits"
 msgstr "Le nom ne doit pas contenir seulement des chiffres"
 msgid ""
 "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on "
 "%(branch)s by %(cs_author_username)s"
 msgstr ""
 "[Commentaire] Changeset %(short_id)s « %(message_short)s » de %(repo_name)s "
 "dans %(branch)s par %(cs_author_username)s"
 "[Commentaire] Changeset %(short_id)s « %(message_short)s » de "
 "%(repo_name)s dans %(branch)s par %(cs_author_username)s"
 msgid "New user %(new_username)s registered"
 msgstr "Nouvel utilisateur %(new_username)s enregistré"
 msgid ""
 "[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from "
 "%(pr_source_branch)s by %(pr_owner_username)s"
 msgstr ""
-"[Revue] %(repo_name)s PR %(pr_nice_id)s « %(pr_title_short)s » depuis "
+"[Revue] %(repo_name)s PR %(pr_nice_id)s « %(pr_title_short)s » depuis "
 "%(pr_source_branch)s par %(pr_owner_username)s"
 msgid ""
 "[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from "
 "%(pr_source_branch)s by %(pr_owner_username)s"
 msgstr ""
-"[Commentaire] %(repo_name)s PR %(pr_nice_id)s « %(pr_title_short)s » "
+"[Commentaire] %(repo_name)s PR %(pr_nice_id)s « %(pr_title_short)s » "
 "depuis %(pr_source_branch)s par %(pr_owner_username)s"
 msgid "Closing"
 msgstr "Fermeture"
 msgid "Cannot create empty pull request"
 msgstr "Impossible de créer une requête de pull vide"
 msgid ""
 "Cannot create pull request - criss cross merge detected, please merge a "
 "later %s revision to %s"
 msgstr ""
 "Impossible de créer la requête de pull : fusion croisée détectée, merci "
 "de fusionner une révision plus vieille de %s vers %s"
 msgid "You are not authorized to create the pull request"
 msgstr "Vous n'êtes pas autorisé à créer cette requête de pull"
 msgid "Missing changesets since the previous iteration:"
-msgstr "Changeset manquant depuis la précédente itération :"
+msgstr "Changeset manquant depuis la précédente itération :"
 msgid "New changesets on %s %s since the previous iteration:"
-msgstr "Nouveau changeset sur %s %s depuis la précédente itération :"
+msgstr "Nouveau changeset sur %s %s depuis la précédente itération :"
 msgid "Ancestor didn't change - diff since previous iteration:"
 msgstr "L'ancêtre n'a pas changé - diff depuis l'itération précédente :"
 msgid ""
 "This iteration is based on another %s revision and there is no simple "
 "diff."
 msgstr ""
 "Cette itération est basée sur une autre révision %s et il n'y a pas de "
 "diff simple."
 msgid "No changes found on %s %s since previous iteration."
 msgstr "Aucun changement constaté sur %s %s depuis l'itération précédente."
 msgid "Closed, next iteration: %s ."
 msgstr "Fermé, itération suivante : %s."
 msgid "latest tip"
 msgstr "Dernier sommet"
 msgid "SSH key %r is invalid: %s"
-msgstr "La clé SSH %r est invalide : %s"
+msgstr "La clé SSH %r est invalide : %s"
 msgid "SSH key %s is already used by %s"
 msgstr "La clé SSH %s est déjà utilisée par %s"
 msgid "SSH key with fingerprint %r found"
 msgstr "Clé SSH avec l'empreinte %r trouvée"
 msgid ""
 "You can't remove this user since it is crucial for the entire application"
 msgstr ""
-"Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le "
+"Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le "
 "bon fonctionnement de l’application"
 msgid ""
 "User \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories: %s"
 msgstr ""
 "L’utilisateur \"%s\" possède %s dépôts et ne peut être supprimé. Changez "
-"les propriétaires ou supprimez ces dépôts : %s"
+"les propriétaires ou supprimez ces dépôts : %s"
 msgid ""
 "User \"%s\" still owns %s repository groups and cannot be removed. Switch "
 "owners or remove those repository groups: %s"
 msgstr ""
 "L’utilisateur \"%s\" possède %s groupes de dépôt et ne peut être "
-"supprimé. Changez les propriétaires ou supprimez ces dépôts : %s"
+"supprimé. Changez les propriétaires ou supprimez ces dépôts : %s"
 msgid ""
 "User \"%s\" still owns %s user groups and cannot be removed. Switch "
 "owners or remove those user groups: %s"
 msgstr ""
-"L’utilisateur « %s » possède %s groupes d'utilisateurs et ne peut pas "
+"L’utilisateur « %s » possède %s groupes d'utilisateurs et ne peut pas "
 "être supprimé. Changez les propriétaires de ces groupes d'utilisateurs ou "
 "supprimez-les : %s"
 msgid "Password reset link"
 msgstr "Lien de remise à zéro du mot de passe"
 msgid "Password reset notification"
 msgstr "Notification de réinitialisation du mot de passe"
 msgid ""
 "The password to your account %s has been changed using password reset "
 "form."
 msgstr ""
 "Le mot de passe de votre compte %s a été changé via le formulaire de "
 "réinitialisation du mot de passe."
 msgid "Value cannot be an empty list"
 msgstr "Cette valeur ne peut être une liste vide"
 msgid "Username \"%(username)s\" already exists"
-msgstr "Le nom d’utilisateur « %(username)s » existe déjà"
+msgstr "Le nom d’utilisateur « %(username)s » existe déjà"
 msgid "Username \"%(username)s\" cannot be used"
-msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide"
+msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide"
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or "
 "dashes and must begin with an alphanumeric character or underscore"
 msgstr ""
 "Le nom d'utilisateur ne peut contenir que des caractères alphanumériques, "
 "des underscores (_), points, traits d'union et doit commencer avec un "
 "caractère alphanumérique ou un underscore"
 msgid "The input is not valid"
 msgstr "L'entrée n'est pas valide"
 msgid "Username %(username)s is not valid"
-msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide"
+msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide"
 msgid "Invalid user group name"
 msgstr "Nom de groupe d'utilisateurs invalide"
 msgid "User group \"%(usergroup)s\" already exists"
-msgstr "Le groupe d'utilisateurs « %(usergroup)s » existe déjà"
+msgstr "Le groupe d'utilisateurs « %(usergroup)s » existe déjà"
 msgid ""
 "user group name may only contain alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr ""
 "Le nom du groupe d'utilisateurs ne peut contenir que des caractères "
 "alphanumériques, des tirets, des points, des traits d'union et doit "
 "commencer avec un caractère alphanumérique"
 msgid "Cannot assign this group as parent"
 msgstr "Impossible d’assigner ce groupe en tant que parent"
 msgid "Group \"%(group_name)s\" already exists"
-msgstr "Le groupe « %(group_name)s » existe déjà"
+msgstr "Le groupe « %(group_name)s » existe déjà"
 msgid "Repository with name \"%(group_name)s\" already exists"
-msgstr "Un dépôt portant le nom « %(group_name)s » existe déjà"
+msgstr "Un dépôt portant le nom « %(group_name)s » existe déjà"
 msgid "Invalid characters (non-ascii) in password"
 msgstr "Caractères incorrects (non-ASCII) dans le mot de passe"
 msgid "Invalid old password"
 msgstr "Ancien mot de passe invalide"
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 msgid "Invalid username or password"
 msgstr "Nom d'utilisateur ou mot de passe invalide"
 msgid "Repository name %(repo)s is not allowed"
-msgstr "Le nom de dépôt « %(repo)s » n’est pas autorisé"
+msgstr "Le nom de dépôt « %(repo)s » n’est pas autorisé"
 msgid "Repository named %(repo)s already exists"
-msgstr "Un dépôt portant le nom « %(repo)s » existe déjà"
+msgstr "Un dépôt portant le nom « %(repo)s » existe déjà"
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
-msgstr "Le dépôt « %(repo)s » existe déjà dans le groupe « %(group)s »"
+msgstr "Le dépôt « %(repo)s » existe déjà dans le groupe « %(group)s »"
 msgid "Repository group with name \"%(repo)s\" already exists"
-msgstr "Un groupe de dépôts avec le nom « %(repo)s » existe déjà"
+msgstr "Un groupe de dépôts avec le nom « %(repo)s » existe déjà"
 msgid "Invalid repository URL"
 msgstr "URL de dépôt invalide"
 msgid "Invalid repository URL. It must be a valid http, https, or ssh URL"
 msgstr ""
 "URL de dépôt invalide. Ce doit être une URL valide de type http, https ou ssh"
 "URL de dépôt invalide. Ce doit être une URL valide de type http, https ou "
 "ssh"
 msgid "Fork has to be the same type as parent"
 msgstr "Le fork doit être du même type que le parent"
 msgid "You don't have permissions to create repository in this group"
 msgstr "Vous n’avez pas la permission de créer un dépôt dans ce"
 msgid "no permission to create repository in root location"
 msgstr "pas de permission de créer un dépôt dans la racine"
 msgid "You don't have permissions to create a group in this location"
 msgstr ""
@@ @@ -1222,25 +1224,25 @@ msgstr "" @@
 msgid "This username or user group name is not valid"
 msgstr ""
 "Ce nom d'utilisateur ou nom de groupe d'utilisateurs n'est pas valide"
 msgid "This is not a valid path"
 msgstr "Ceci n’est pas un chemin valide"
 msgid "This email address is already in use"
 msgstr "Cette adresse e-mail est déjà enregistrée"
 msgid "Email address \"%(email)s\" not found"
-msgstr "L’adresse e-mail « %(email)s » n’existe pas"
+msgstr "L’adresse e-mail « %(email)s » n’existe pas"
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom "
 "d’utilisateur"
 msgid "Please enter a valid IPv4 or IPv6 address"
 msgstr "Veuillez entrer une adresse IPv4 ou IPv6 valide"
 msgid ""
@@ @@ -1299,28 +1301,28 @@ msgid "Log In to %s" @@
 msgstr "Se connecter à %s"
 msgid "Username"
 msgstr "Nom d’utilisateur"
 msgid "Password"
 msgstr "Mot de passe"
 msgid "Stay logged in after browser restart"
 msgstr "Rester connecté après un redémarrage du navigateur"
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié?"
+msgstr "Mot de passe oublié ?"
 msgid "Don't have an account?"
-msgstr "Vous n’avez pas de compte ?"
+msgstr "Vous n’avez pas de compte ?"
 msgid "Sign In"
 msgstr "Connexion"
 msgid "Password Reset"
 msgstr "Remettre le mot de passe à zéro"
 msgid "Reset Your Password to %s"
 msgstr "Réinitialiser votre mot de passe à %s"
 msgid "Reset Your Password"
 msgstr "Réinitialiser votre mot de passe"
@@ @@ -1587,31 +1589,31 @@ msgid "Owned Repositories" @@
 msgstr "Dépôts possédés"
 msgid "Watched Repositories"
 msgstr "Dépôts surveillés"
 msgid "Show Permissions"
 msgstr "Afficher les permissions"
 msgid "Built-in"
 msgstr "Inclus"
 msgid "Confirm to reset this API key: %s"
-msgstr "Confirmer la remise à zéro de cette clé d'API : %s"
+msgstr "Confirmer la remise à zéro de cette clé d'API : %s"
 msgid "Expired"
 msgstr "a expiré"
 msgid "Confirm to remove this API key: %s"
-msgstr "Confirmer la suppression de cette clé d'API : %s"
+msgstr "Confirmer la suppression de cette clé d'API : %s"
 msgid "Remove"
 msgstr "Supprimer"
 msgid "No additional API keys specified"
 msgstr "Pas de clés d'API supplémentaires spécifiées"
 msgid "New API key"
 msgstr "Nouvelle clé d'API"
 msgid "Add"
 msgstr "Ajouter"
@@ @@ -1636,25 +1638,25 @@ msgstr "" @@
 "\n"
 "Comme les mots de passe, les clés API ne devraient donc jamais être "
 "diffusées à des tiers,\n"
 "ni passés à des scripts ou services auxquels vous ne faites pas "
 "confiance. Si cette diffusion a tout de même lieu,\n"
 "vous pouvez réinitialiser la clé API sur cette page pour qu'elle ne "
 "puisse plus être utilisée.\n"
 msgid "Primary"
 msgstr "Primaire"
 msgid "Confirm to delete this email: %s"
-msgstr "Veuillez confirmer la suppression de l’e-mail : %s"
+msgstr "Veuillez confirmer la suppression de l’e-mail : %s"
 msgid "No additional emails specified."
 msgstr "Pas d'adresse e-mail supplémentaires spécifiées."
 msgid "New email address"
 msgstr "Nouvelle adresse e-mail"
 msgid "Change Your Account Password"
 msgstr "Changer le mot de passe de votre compte"
 msgid "Current password"
 msgstr "Mot de passe actuel"
@@ @@ -1686,25 +1688,25 @@ msgid "Repositories You Own" @@
 msgstr "Dépôts dont vous êtes le propriétaire"
 msgid "Name"
 msgstr "Nom"
 msgid "Fingerprint"
 msgstr "Empreinte"
 msgid "Last Used"
 msgstr "Dernière utilisation"
 msgid "Confirm to remove this SSH key: %s"
-msgstr "Confirmer la suppression de cette clé SSH : %s"
+msgstr "Confirmer la suppression de cette clé SSH : %s"
 msgid "No SSH keys have been added"
 msgstr "Aucune clé SSH n'a été ajoutée"
 msgid "New SSH key"
 msgstr "Nouvelle clé SSH"
 msgid "Public key"
 msgstr "Clé publique"
 msgid "Public key (contents of e.g. ~/.ssh/id_rsa.pub)"
 msgstr "Clé publique (contenus de par ex. ~/.ssh/id_rsa.pub)"
@@ @@ -1812,25 +1814,25 @@ msgstr "Fork de dépôt" @@
 msgid "Enable this to allow non-admins to fork repositories."
 msgstr ""
 "Activer pour autoriser les non-administrateurs à faire des fork de dépôt."
 msgid "Registration"
 msgstr "Enregistrement"
 msgid "External auth account activation"
 msgstr "Activation de l'authentification externe"
 msgid "Confirm to delete this IP address: %s"
-msgstr "Confirmer la suppression de cette adresse IP : %s"
+msgstr "Confirmer la suppression de cette adresse IP : %s"
 msgid "All IP addresses are allowed."
 msgstr "Toutes les adresses IP sont autorisées."
 msgid "New IP address"
 msgstr "Nouvelle adresse IP"
 msgid "Repository Groups"
 msgstr "Groupes de dépôts"
 msgid "Group name"
 msgstr "Nom de groupe"
@@ @@ -1851,42 +1853,42 @@ msgid "Add Child Group" @@
 msgstr "Ajouter un groupe enfant"
 msgid "Settings"
 msgstr "Options"
 msgid "Advanced"
 msgstr "Avancé"
 msgid "Permissions"
 msgstr "Permissions"
 msgid "Repository Group: %s"
-msgstr "Groupe de dépôts : %s"
+msgstr "Groupe de dépôts : %s"
 msgid "Top level repositories"
 msgstr "Dépôts de niveau supérieur"
 msgid "Total repositories"
 msgstr "Dépôts totaux"
 msgid "Children groups"
 msgstr "Groupes enfants"
 msgid "Created on"
 msgstr "Créé le"
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
 msgstr[0] "Confirmer la suppression de ce groupe : %s avec %s dépôt"
 msgstr[1] "Confirmer la suppression de ce groupe : %s avec %s dépôts"
 msgstr[0] "Confirmer la suppression de ce groupe : %s avec %s dépôt"
 msgstr[1] "Confirmer la suppression de ce groupe : %s avec %s dépôts"
 msgid "Delete this repository group"
 msgstr "Supprimer ce groupe de dépôts"
 msgid "Not visible"
 msgstr "Non visible"
 msgid "Visible"
 msgstr "Visible"
 msgid "Add repos"
 msgstr "Ajouter un dépôt"
@@ @@ -1910,83 +1912,89 @@ msgid "Apply to children" @@
 msgstr "Appliquer aux enfants"
 msgid "Both"
 msgstr "Les deux"
 msgid ""
 "Set or revoke permission to all children of that group, including non-"
 "private repositories and other groups if selected."
 msgstr ""
 "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é."
 msgid "Type name of user"
 msgstr "Saisir le nom de l'utilisateur"
 msgid "Remove this group"
 msgstr "Supprimer ce groupe"
 msgid "Confirm to delete this group"
 msgstr "Confirmer la suppression de ce groupe"
 msgid "Repository group %s"
 msgstr "Groupe de dépôts %s"
 msgid "Repository Groups Administration"
 msgstr "Administration des groupes de dépôts"
 msgid "Number of Top-level Repositories"
 msgstr "Nombre de dépôts de niveau supérieur"
 msgid "Type of repository to create."
 msgstr "Type de dépôt à créer."
 msgid "Clone remote repository"
 msgstr "Cloner le dépôt distant"
 msgid "Repository URL"
 msgstr "URL du dépôt"
 msgid ""
 "Optional: URL of a remote repository. If set, the repository will be "
 "created as a clone from this URL."
 msgstr ""
 "Optionnel : URL d'un dépôt distant. Si renseigné, le dépôt sera créé "
 "comme un clone à partir de cette URL."
 msgid ""
 "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 "Gardez cette description précise et concise. Utilisez un fichier README "
 "pour des descriptions plus détaillées."
 msgid "Optionally select a group to put this repository into."
 msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt."
 msgid "Type of repository to create."
 msgstr "Type de dépôt à créer."
 msgid "Landing revision"
 msgstr "Révision d’arrivée"
 msgid ""
 "Default revision for files page, downloads, full text search index and "
 "readme generation"
 msgstr ""
 "Révision par défaut pour les pages de fichiers, de téléchargement, de "
 "l'index de recherche dans le texte complet, et de génération de "
 "documentation (readme)"
 msgid "%s Creating Repository"
 msgstr "Création du dépôt %s"
 msgid "Creating repository"
 msgstr "Création du dépôt"
 msgid ""
 "Repository \"%(repo_name)s\" is being created, you will be redirected "
 "when this process is finished.repo_name"
 msgstr ""
-"Le dépôt « %(repo_name)s » est en cours de création, vous allez être "
+"Le dépôt « %(repo_name)s » est en cours de création, vous allez être "
 "redirigé quand cette opération sera terminée."
 msgid ""
 "We're sorry but error occurred during this operation. Please check your "
 "Kallithea server logs, or contact administrator."
 msgstr ""
 "Désolé, une erreur est survenue pendant l'opération. Vérifiez les "
 "journaux du serveur Kallithea, ou contactez votre administrateur."
 msgid "%s Repository Settings"
 msgstr "Réglages du dépôt %s"
@@ @@ -2091,61 +2099,34 @@ msgid "Pull Changes from Remote Reposito @@
 msgstr "Récupérer les modifications depuis le dépôt distant"
 msgid "Confirm to pull changes from remote repository."
 msgstr ""
 "Voulez-vous vraiment récupérer les changements depuis le dépôt distant ?"
 msgid "This repository does not have a remote repository URL."
 msgstr "Ce dépôt n'a pas d'URL de dépôt distant."
 msgid "Permanent URL"
 msgstr "URL permanente"
 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 "Remote repository"
 msgstr "Dépôt distant"
 msgid "Repository URL"
 msgstr "URL du dépôt"
 msgid ""
 "Optional: URL of a remote repository. If set, the repository can be "
 "pulled from this URL."
 msgstr ""
 "Optionel : URL d'un dépôt distant. Si renseigné, le dépôt sera pullé à "
 "partir de cette URL."
 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"
 msgid "Type name of user"
 msgstr "Saisir le nom de l'utilisateur"
 msgid "Change owner of this repository."
 msgstr "Changer le propriétaire de ce dépôt."
 msgid "Processed commits"
 msgstr "Commits traités"
 msgid "Processed progress"
 msgstr "Avancement"
 msgid "Reset Statistics"
 msgstr "Remettre les statistiques à zéro"
@@ @@ -2239,27 +2220,27 @@ msgstr "" @@
 "Les hooks peuvent être utilisés pour déclencher des actions lors de "
 "certains évènements comme le push et le pull. Ils peuvent déclencher des "
 "fonctions Python ou des applications externes."
 msgid "Git Hooks"
 msgstr "Git Hooks"
 msgid ""
 "Kallithea has no support for custom Git hooks. Kallithea will use Git "
 "post-receive hooks internally. Installation of these hooks is managed in "
 "%s."
 msgstr ""
 "Kallithea ne supporte pas les hooks Git personnalisés. Kallithea utilise des "
 "hooks Git de post-réception en interne. L'installation de ces hooks est "
 "gérée dans %s."
 "Kallithea ne supporte pas les hooks Git personnalisés. Kallithea utilise "
 "des hooks Git de post-réception en interne. L'installation de ces hooks "
 "est gérée dans %s."
 msgid "Custom Hooks are not enabled"
 msgstr "Les Hooks personnalisés ne sont pas activés"
 msgid "Failed to remove hook"
 msgstr "Erreur lors de la suppression du hook"
 msgid "Rescan options"
 msgstr "Options de scan"
 msgid "Delete records of missing repositories"
 msgstr "Supprimer les enregistrements de dépôts manquants"
@@ @@ -2290,27 +2271,27 @@ msgstr "" @@
 "Installe les hooks internes de Kallithea pour tous les dépôts Git où ils "
 "sont absents ou s'ils peuvent être mis à jour. Les hooks existants qui ne "
 "semblent pas être livrés avec Kallithea ne seront pas impactés."
 msgid "Install and overwrite Git hooks"
 msgstr "Installer et surcharger des hooks Git"
 msgid ""
 "Install Kallithea's internal hooks for all Git repositories. Existing "
 "hooks that don't seem to come from Kallithea will be disabled by renaming "
 "to .bak extension."
 msgstr ""
 "Installe les hooks internes de Kallithea pour tous les dépôts Git. Les hooks "
 "existants qui ne semblent pas être livrés avec Kallithea seront désactivés "
 "en les renommant avec l'extension .bak."
 "Installe les hooks internes de Kallithea pour tous les dépôts Git. Les "
 "hooks existants qui ne semblent pas être livrés avec Kallithea seront "
 "désactivés en les renommant avec l'extension .bak."
 msgid "Rescan Repositories"
 msgstr "Relancer le scan des dépôts"
 msgid "Index build option"
 msgstr "Option de construction de l'index"
 msgid "Build from scratch"
 msgstr "Construire ex nihilo"
 msgid ""
 "This option completely reindexes all of the repositories for proper "
@@ @@ -2443,40 +2424,41 @@ msgid "" @@
 "                                                    {netloc} network "
 "location/server host of running Kallithea server,\n"
 "                                                    {repo}   full "
 "repository name,\n"
 "                                                    {repoid} ID of "
 "repository, can be used to construct clone-by-id,\n"
 "                                                    {system_user}  name "
 "of the Kallithea system user,\n"
 "                                                    {hostname}  server "
 "hostname\n"
 "                                                    "
 msgstr ""
 "Modèle de construction d'URL de clone. Par exemple : "
 "'{scheme}://{user}@{netloc}/{repo}'.\n"
 "Modèle de construction d'URL de clone. Par exemple : '{scheme}://{user}"
 "@{netloc}/{repo}'.\n"
 "                                                       Les variables "
 "suivantes sont disponibles :\n"
 "                                                        {scheme}    'http' "
 "ou 'https' envoyé à partir du serveur Kallithea en cours d'utilisation,\n"
 "                                                        {scheme}    "
 "'http' ou 'https' envoyé à partir du serveur Kallithea en cours "
 "d'utilisation,\n"
 "                                                        {user}     nom de "
 "l'utilisateur courant,\n"
 "                                                        {netloc}    "
 "emplacement réseau/hôte du serveur Kallithea en cours d'utilisation,\n"
 "                                                        {repo}    nom "
 "complet du dépôt,\n"
 "                                                        {repoid}    ID du "
 "dépôt, peut être utilisé pour cloner par ID,\n"
 "                                                        {system_user}  nom "
 "de l'utilisateur système Kallithea,\n"
 "                                                        {system_user}  "
 "nom de l'utilisateur système Kallithea,\n"
 "                                                        {hostname}  nom "
 "d'hôte du serveur\n"
 "                                                    "
 msgid ""
 "Schema for constructing SSH clone URL, eg. 'ssh://{system_user}"
 "@{hostname}/{repo}'."
 msgstr ""
 "Schéma de construction d'une URL de clone SSH, par exemple. 'ssh://"
 "{system_user}@{hostname}/{repo}'."
 msgid "Repository page size"
@@ @@ -2500,25 +2482,25 @@ msgstr "" @@
 "d'afficher la pagination."
 msgid "Icons"
 msgstr "Icônes"
 msgid "Show public repository icon on repositories"
 msgstr "Afficher l’icône de dépôt public sur les dépôts"
 msgid "Show private repository icon on repositories"
 msgstr "Afficher l’icône de dépôt privé sur les dépôts"
 msgid "Show public/private icons next to repository names."
-msgstr "Afficher l’icône « public/privé » à côté du nom des dépôts."
+msgstr "Afficher l’icône « public/privé » à côté du nom des dépôts."
 msgid "Meta Tagging"
 msgstr "Meta-tagging"
 msgid ""
 "Parses meta tags from the repository description field and turns them "
 "into colored tags."
 msgstr ""
 "Analyser les méta-tags dans le champ de description du dépôt et les "
 "transformer en tags colorés."
 msgid "Stylify recognised meta tags:"
@@ @@ -2591,25 +2573,25 @@ msgid "User: %s" @@
 msgstr "Utilisateur : %s"
 msgid "Source of Record"
 msgstr "Source de l'enregistrement"
 msgid "Last Login"
 msgstr "Dernière connexion"
 msgid "Member of User Groups"
 msgstr "Membre des groupes d'utilisateurs"
 msgid "Confirm to delete this user: %s"
-msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?"
+msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?"
 msgid "Delete this user"
 msgstr "Supprimer cet utilisateur"
 msgid "Inherited from %s"
 msgstr "Hérité de %s"
 msgid "Name in Source of Record"
 msgstr "Nom dans la source de l'enregistrement"
 msgid "New password confirmation"
 msgstr "Confirmation du nouveau mot de passe"
@@ @@ -2705,25 +2687,25 @@ msgid "Search in repositories" @@
 msgstr "Recherche dans les dépôts"
 msgid "My Pull Requests"
 msgstr "Mes requêtes de pull"
 msgid "Not Logged In"
 msgstr "Non connecté"
 msgid "Login to Your Account"
 msgstr "Connexion à votre compte"
 msgid "Forgot password?"
-msgstr "Mot de passe oublié ?"
+msgstr "Mot de passe oublié ?"
 msgid "Log Out"
 msgstr "Se déconnecter"
 msgid "Parent rev."
 msgstr "Révision parente"
 msgid "Child rev."
 msgstr "Révision fille"
 msgid "Create repositories"
 msgstr "Création de dépôts"
@@ @@ -2791,29 +2773,29 @@ msgstr "Chargement..." @@
 msgid "loading ..."
 msgstr "chargement..."
 msgid "Search truncated"
 msgstr "Recherche tronquée"
 msgid "No matching files"
 msgstr "Aucun fichier correspondant"
 msgid "Open New Pull Request from {0}"
 msgstr "Ouvrir une nouvelle requête de pull à partir de {0}"
 msgid "Open New Pull Request for {0} &rarr; {1}"
 msgstr "Ouvrir une nouvelle requête de pull pour {0} &rarr; {1}"
 msgid "Show Selected Changesets {0} &rarr; {1}"
 msgstr "Afficher les changesets sélectionnés {0} &rarr; {1}"
 msgid "Open New Pull Request for {0}"
 msgstr "Ouvrir une nouvelle requête de pull pour {0}"
 msgid "Show Selected Changesets {0}"
 msgstr "Afficher les changesets sélectionnés {0}"
 msgid "Selection Link"
 msgstr "Lien vers la sélection"
 msgid "Collapse Diff"
 msgstr "Replier le Diff"
 msgid "Expand Diff"
 msgstr "Déplier le Diff"
 msgid "No revisions"
 msgstr "Aucune révision"
@@ @@ -3138,28 +3120,28 @@ msgid "No changesets yet" @@
 msgstr "Dépôt vide"
 msgid "Subscribe to %s rss feed"
 msgstr "S’abonner au flux RSS de %s"
 msgid "Subscribe to %s atom feed"
 msgstr "S’abonner au flux ATOM de %s"
 msgid "Creating"
 msgstr "En cours de création"
 msgid "Mention in Comment on Changeset \"%s\""
-msgstr "Mention dans le commentaire sur le changeset « %s »"
+msgstr "Mention dans le commentaire sur le changeset « %s »"
 msgid "Comment on Changeset \"%s\""
-msgstr "Commentaire sur le changeset « %s »"
+msgstr "Commentaire sur le changeset « %s »"
 msgid "Changeset on"
 msgstr "Changeset sur"
 msgid "branch"
 msgstr "branche"
 msgid "by"
 msgstr "par"
 msgid "View Comment"
 msgstr "Afficher le commentaire"
@@ @@ -3200,49 +3182,49 @@ msgid "" @@
 msgstr ""
 "Si vous ne pouvez pas utiliser le lien ci-dessus, merci de saisir le code "
 "suivant dans le formulaire de réinitialisation de mot de passe"
 msgid ""
 "If it weren't you who requested the password reset, just disregard this "
 "message."
 msgstr ""
 "Si vous n'avez pas demandé la réinitialisation de votre mot de passe, ne "
 "tenez pas compte de ce message."
 msgid "Mention on Pull Request %s \"%s\" by %s"
-msgstr "Mention sur la requête de pull %s « %s » par %s"
+msgstr "Mention sur la requête de pull %s « %s » par %s"
 msgid "Added as Reviewer of Pull Request %s \"%s\" by %s"
-msgstr "Ajouté comme relecteur de la requête de pull %s « %s » par %s"
+msgstr "Ajouté comme relecteur de la requête de pull %s « %s » par %s"
 msgid "Pull request"
 msgstr "Requête de pull"
 msgid "from"
 msgstr "depuis"
 msgid "to"
 msgstr "vers"
 msgid "View Pull Request"
 msgstr "Afficher la requête de pull"
 msgid "Mention in Comment on Pull Request %s \"%s\""
-msgstr "Mention dans le commentaire sur la requête de pull %s « %s »"
+msgstr "Mention dans le commentaire sur la requête de pull %s « %s »"
 msgid "Pull Request %s \"%s\" Closed"
-msgstr "Requête de pull %s « %s » fermée"
+msgstr "Requête de pull %s « %s » fermée"
 msgid "Comment on Pull Request %s \"%s\""
-msgstr "Commentaire sur la requête de pull %s « %s »"
+msgstr "Commentaire sur la requête de pull %s « %s »"
 msgid "New User Registration"
 msgstr "Nouvel enregistrement d'utilisateur"
 msgid "Full Name"
 msgstr "Nom complet"
 msgid "View User Profile"
 msgstr "Afficher le profil utilisateur"
 msgid "%s File side-by-side diff"
 msgstr "Diff côte-à-côte de fichier pour %s"
@@ @@ -3754,17 +3736,14 @@ msgstr "Derniers changements" @@
 msgid "Quick Start"
 msgstr "Démarrage rapide"
 msgid "Add or upload files directly via Kallithea"
 msgstr "Ajouter ou téléverser des fichiers directement via Kallithea"
 msgid "Push new repository"
 msgstr "Pusher le nouveau dépôt"
 msgid "Existing repository?"
 msgstr "Le dépôt existe déjà ?"
 msgid "Readme file from revision %s:%s"
 msgstr "Fichier Lisez-moi de la revision %s:%s"
 msgid "Download %s as %s"
 msgstr "Télécharge %s comme %s"

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -1403,38 +1403,41 @@ msgstr "" @@
 msgid "Remove this group"
 msgstr "このグループを削除"
 msgid "Confirm to delete this group"
 msgstr "このグループを削除してもよろしいですか？: %s"
 msgid "Repository Groups Administration"
 msgstr "リポジトリグループ管理"
 msgid "Number of Top-level Repositories"
 msgstr "トップレベルリポジトリ数"
 msgid "Type of repository to create."
 msgstr "作成するリポジトリの種別を指定します"
 msgid "Clone remote repository"
 msgstr "リモートリポジトリをクローン"
 msgid "Repository URL"
 msgstr "リポジトリURL"
 msgid ""
 "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。"
 msgid "Optionally select a group to put this repository into."
 msgstr "オプション：このリポジトリが属するグループを選択します"
 msgid "Type of repository to create."
 msgstr "作成するリポジトリの種別を指定します"
 msgid "Landing revision"
 msgstr "ランディングリビジョン"
 msgid ""
 "Default revision for files page, downloads, full text search index and "
 "readme generation"
 msgstr ""
 "ファイルページ、ダウンロード、全文検索インデックス、READMEなどの生成に使う"
 "デフォルトのリビジョン"
 msgid "Creating repository"
 msgstr "リポジトリを作成中"
@@ @@ -1538,56 +1541,34 @@ msgstr "非公開リポジトリ" @@
 msgid "Remote repository URL"
 msgstr "リモートリポジトリURL"
 msgid "Pull Changes from Remote Repository"
 msgstr "リモートリポジトリから変更を取り込む"
 msgid "Confirm to pull changes from remote repository."
 msgstr "リモートリポジトリから変更を取り込んでもよろしいですか？"
 msgid "This repository does not have a remote repository URL."
 msgstr "このリポジトリにリモートURLは設定されていません"
 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 "Remote repository"
 msgstr "リモートリポジトリ"
 msgid "Repository URL"
 msgstr "リポジトリURL"
 msgid ""
 "Optional: URL of a remote repository. If set, the repository can be "
 "pulled from this URL."
 msgstr ""
 "オプション: リモートリポジトリのURLです。設定した場合、このURLから変更を取"
 "得することができます。"
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定し"
 "ます"
 msgid "Change owner of this repository."
 msgstr "リポジトリの所有者を変更"
 msgid "Processed commits"
 msgstr "処理済みコミット数"
 msgid "Processed progress"
 msgstr "処理状況"
 msgid "Reset Statistics"
 msgstr "統計情報をリセット"
@@ @@ -2048,28 +2029,28 @@ msgstr "読み込み中..." @@
 msgid "loading ..."
 msgstr "読み込み中..."
 msgid "Search truncated"
 msgstr "検索結果は省略されています"
 msgid "No matching files"
 msgstr "マッチするファイルはありません"
 msgid "Open New Pull Request from {0}"
 msgstr "新しいプルリクエストを{0}から作成"
-msgid "Open New Pull Request for {0} &rarr; {1}"
 msgid "Open New Pull Request for {0}"
 msgstr "{0} &rarr; {1}から新しいプルリクエストを作成する"
-msgid "Show Selected Changesets {0} &rarr; {1}"
 msgid "Show Selected Changesets {0}"
 msgstr "選択したチェンジセット{0} &rarr; {0}を表示"
 msgid "Collapse Diff"
 msgstr "差分をたたむ"
 msgid "Expand Diff"
 msgstr "差分を表示"
 msgid "No revisions"
 msgstr "リビジョンなし"
 msgid "Failed to revoke permission"
@@ @@ -2748,17 +2729,14 @@ msgstr "最近の変更" @@
 msgid "Quick Start"
 msgstr "クイックスタート"
 msgid "Add or upload files directly via Kallithea"
 msgstr "Kallithea経由で直接ファイルを追加またはアップロード"
 msgid "Push new repository"
 msgstr "新しいリポジトリをプッシュ"
 msgid "Existing repository?"
 msgstr "存在するリポジトリをプッシュ"
 msgid "Readme file from revision %s:%s"
 msgstr "リビジョン %s:%s の README ファイル"
 msgid "Download %s as %s"
 msgstr "%s を %s でダウンロード"

kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -887,24 +887,27 @@ msgstr "Bruker/brukergruppe" @@
 msgid "Default"
 msgstr "Forvalg"
 msgid "Revoke"
 msgstr "Tilbakekall"
 msgid "Add new"
 msgstr "Legg til ny"
 msgid "Both"
 msgstr "Begge"
 msgid "Type name of user"
 msgstr "Skriv inn brukerens navn"
 msgid "Remove this group"
 msgstr "Fjern denne gruppen"
 msgid "Confirm to delete this group"
 msgstr "Bekreft sletting av denne gruppen"
 msgid "Repository group %s"
 msgstr "Pakkebrønnsgruppe %s"
 msgid "Extra Fields"
 msgstr "Ekstra felter"
@@ @@ -946,27 +949,24 @@ msgstr "Ny feltbeskrivelse" @@
 msgid "Enter description of a field"
 msgstr "Skriv inn beskrivelse for et felt"
 msgid "Extra fields are disabled."
 msgstr "Ekstra felter avskrudd."
 msgid "Private Repository"
 msgstr "Privat pakkebrønn"
 msgid "Fork of repository"
 msgstr "Forgrening av pakkebrønn"
 msgid "Type name of user"
 msgstr "Skriv inn brukerens navn"
 msgid "Processed commits"
 msgstr "Behandlede innsendelser"
 msgid "Processed progress"
 msgstr "Behandlingsframdrift"
 msgid "Reset Statistics"
 msgstr "Tilbakestill statistikk"
 msgid "Settings Administration"
 msgstr "Innstillingsadministrasjon"

kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -206,26 +206,26 @@ msgstr "Changeset %s werd niet gevonden" @@
 msgid "Add repos"
 msgstr "Repositories toevoegen"
 msgid "Fork of repository"
 msgstr "Fork van repository"
 msgid "Repository page size"
 msgstr "Repository paginagrootte"
 msgid "Open New Pull Request from {0}"
 msgstr "Open nieuwe pull request vanaf {0}"
 msgid "Show Selected Changesets {0} &rarr; {1}"
 msgstr "Toon geselecteerde changesets {0} &rarr; {1}"
 msgid "Show Selected Changesets {0}"
 msgstr "Toon geselecteerde changesets {0}"
 msgid "Select changeset"
 msgstr "Selecteer een changeset"
 msgid "Specify changeset"
 msgstr "Specifieer een changeset"
 msgid "Changeset status: %s by %s"
 msgstr "Changeset status: %s door %s"
 msgid "%s comments"
 msgstr "%s opmerkingen"

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # Copyright (C) 2014 RhodeCode GmbH, and others.
 # This file is distributed under the same license as the Kallithea project.
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n"
 "%100<10 || n%100>=20) ? 1 : 2;\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && "
 "(n%100<10 || n%100>=20) ? 1 : 2;\n"
 msgid ""
 "CSRF token leak has been detected - all form tokens have been expired"
 msgstr ""
 "Wykryto wyciek tokenu CSRF — wszystkie tokeny formularza zostały "
 "unieważnione"
 msgid "There are no changesets yet"
 msgstr "Brak zestawienia zmian"
 msgid "Changeset for %s %s not found in %s"
 msgstr "Zmiany dla %s %s nie zostały znalezione w %s"
@@ @@ -167,24 +167,27 @@ msgstr "Uwierzytelnienie nie powiodło się." @@
 msgid "You have successfully registered with %s"
 msgstr "Udało Ci się zarejestrować w %s"
 msgid "A password reset confirmation code has been sent"
 msgstr "Twój link zresetowania hasła został wysłany"
 msgid "Invalid password reset token"
 msgstr "Nieprawidłowy token resetowania hasła"
 msgid "Successfully updated password"
 msgstr "Pomyślnie zaktualizowano hasło"
 msgid "Invalid reviewer \"%s\" specified"
 msgstr "Podano nieprawidłowego recenzenta \"%s\""
 msgid "%s (closed)"
 msgstr "%s (zamknięty)"
 msgid "Changeset"
 msgstr "Grupy zmian"
 msgid "Special"
 msgstr "Specjalne"
 msgid "Peer branches"
 msgstr "gałęzie"
 msgstr[1] "Potwierdź żeby usunąć grupę %s wraz z %s repozytoriami"
 msgstr[2] "Potwierdź żeby usunąć grupę %s wraz z %s repozytoriami"
 msgid "Delete this repository group"
 msgstr "Usuń tę grupę repozytoriów"
 msgid "Add new"
 msgstr "Dodaj nowe"
 msgid "Both"
 msgstr "Oba"
 msgid "Type of repository to create."
 msgstr "Rodzaj repozytorium do stworzenia."
 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."
 msgid "Optionally select a group to put this repository into."
 msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium."
 msgid "Type of repository to create."
 msgstr "Rodzaj repozytorium do stworzenia."
 msgid "Landing revision"
 msgstr "Docelowa rewizja"
 msgid "Remote"
 msgstr "Zdalnie"
 msgid "Statistics"
 msgstr "Statystyki"
 msgid "Set"
 msgstr "Ustaw"
@@ @@ -1553,27 +1556,24 @@ msgstr "Nowe pole klucza" @@
 msgid "New field label"
 msgstr "Nowa etykieta pola"
 msgid "Enter short label"
 msgstr "Wpisz krótką etykietę"
 msgid "New field description"
 msgstr "Nowy opis pola"
 msgid "Enter description of a field"
 msgstr "Wprowadź opis pola"
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr "Wersja domyślna dla plików stronicowania, pobierania plików, readme"
 msgid "Change owner of this repository."
 msgstr "Zmiana właściciela tego repozytorium."
 msgid "Hooks"
 msgstr "Aktualizacja"
 msgid "Send"
 msgstr "Wyślij"
 msgid "Site branding"
 msgstr "Nazwa strony"

kallithea/i18n/pt/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -880,36 +880,36 @@ msgstr "Permissões" @@
 msgid "Created on"
 msgstr "Criado em"
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
 msgstr[0] "Confirme para apagar este grupo: %s com %s repositório"
 msgstr[1] "Confirme para apagar este grupo: %s com %s repositórios"
 msgid "Add new"
 msgstr "Adicionar novo"
 msgid "Type of repository to create."
 msgstr "Tipo de repositório a criar."
 msgid ""
 "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 "Seja sucinto e objetivo. Use um ficheiro README para descrições mais "
 "longas."
 msgid "Optionally select a group to put this repository into."
 msgstr "Opcionalmente selecione um grupo no qual pôr esse repositório."
 msgid "Type of repository to create."
 msgstr "Tipo de repositório a criar."
 msgid "Landing revision"
 msgstr "Revisão de pouso"
 msgid "Remote"
 msgstr "Remoto"
 msgid "Statistics"
 msgstr "Estatísticas"
 msgid "Remove from public journal"
 msgstr "Remover do diário público"
@@ @@ -934,29 +934,24 @@ msgstr "Próxima chave de campo" @@
 msgid "New field label"
 msgstr "Próximo rótulo de campo"
 msgid "Enter short label"
 msgstr "Entre com o rótulo curto"
 msgid "New field description"
 msgstr "Nova descrição de campo"
 msgid "Enter description of a field"
 msgstr "Entre com a descrição de um campo"
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 "Revisão predefinida para página de ficheiros, descarregamentos, whoosh e "
 "readme"
 msgid "Change owner of this repository."
 msgstr "Mudar o dono desse repositório."
 msgid "Hooks"
 msgstr "Ganchos"
 msgid "Send"
 msgstr "Enviar"
 msgid "Site branding"
 msgstr "Marca do site"

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -880,36 +880,36 @@ msgstr "Permissões" @@
 msgid "Created on"
 msgstr "Criado em"
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
 msgstr[0] "Confirme para excluir este grupo: %s com %s repositório"
 msgstr[1] "Confirme para excluir este grupo: %s com %s repositórios"
 msgid "Add new"
 msgstr "Adicionar novo"
 msgid "Type of repository to create."
 msgstr "Tipo de repositório a criar."
 msgid ""
 "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 "Seja sucinto e objetivo. Use um arquivo README para descrições mais "
 "longas."
 msgid "Optionally select a group to put this repository into."
 msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório."
 msgid "Type of repository to create."
 msgstr "Tipo de repositório a criar."
 msgid "Landing revision"
 msgstr "Revisão de pouso"
 msgid "Remote"
 msgstr "Remoto"
 msgid "Statistics"
 msgstr "Estatísticas"
 msgid "Remove from public journal"
 msgstr "Remover do diário público"
@@ @@ -934,27 +934,24 @@ msgstr "Próxima chave de campo" @@
 msgid "New field label"
 msgstr "Próximo rótulo de campo"
 msgid "Enter short label"
 msgstr "Entre com o rótulo curto"
 msgid "New field description"
 msgstr "Nova descrição de campo"
 msgid "Enter description of a field"
 msgstr "Entre com a descrição de um campo"
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr "Revisão padrão para página de arquivos, downloads, whoosh e readme"
 msgid "Change owner of this repository."
 msgstr "Mudar o dono desse repositório."
 msgid "Hooks"
 msgstr "Ganchos"
 msgid "Send"
 msgstr "Enviar"
 msgid "Site branding"
 msgstr "Marca do site"

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # Copyright (C) 2014 RhodeCode GmbH, and others.
 # This file is distributed under the same license as the Kallithea project.
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 msgid ""
 "CSRF token leak has been detected - all form tokens have been expired"
 msgstr "Обнаружена утечка CSRF-токена — истёк срок действия токенов форм"
 msgid "Repository not found in the filesystem"
 msgstr "Репозиторий не найден на файловой системе"
 msgid "There are no changesets yet"
 msgstr "Наборы изменений отсутствуют"
 msgid "Changeset for %s %s not found in %s"
@@ @@ -925,24 +925,31 @@ msgstr "Пожалуйста, введите логин" @@
 msgid "Enter a value %(min)i characters long or more"
 msgstr "Введите значение длиной не менее %(min)i символов"
 msgid "Please enter a password"
 msgstr "Пожалуйста, введите пароль"
 msgid "Enter %(min)i characters or more"
 msgstr "Введите не менее %(min)i символов"
 msgid "Name must not contain only digits"
 msgstr "Имя не может состоять только из цифр"
 msgid ""
 "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on "
 "%(branch)s by %(cs_author_username)s"
 msgstr ""
 "[Комментарий] к набору изменений %(short_id)s «%(message_short)s» "
 "репозитория %(repo_name)s в %(branch)s от %(cs_author_username)s"
 msgid "New user %(new_username)s registered"
 msgstr "Новый пользователь \"%(new_username)s\" зарегистрирован"
 msgid ""
 "[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from "
 "%(pr_source_branch)s by %(pr_owner_username)s"
 msgstr ""
 "[Ревью] к PR %(pr_nice_id)s «%(pr_title_short)s» из %(pr_source_branch)s "
 "репозитория %(repo_name)s от %(pr_owner_username)s"
 msgid ""
 "[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from "
@@ @@ -1802,60 +1809,66 @@ msgid "Apply to children" @@
 msgstr "Применить к дочерним"
 msgid "Both"
 msgstr "Все"
 msgid ""
 "Set or revoke permission to all children of that group, including non-"
 "private repositories and other groups if selected."
 msgstr ""
 "Установить или отозвать права всех дочерних элементов этой группы, "
 "включая публичные репозитории и другие группы, если они выбраны."
 msgid "Type name of user"
 msgstr "Введите имя пользователя"
 msgid "Remove this group"
 msgstr "Удалить группу"
 msgid "Confirm to delete this group"
 msgstr "Подтвердите удаление этой группы пользователей"
 msgid "Repository group %s"
 msgstr "Группа репозиториев %s"
 msgid "Repository Groups Administration"
 msgstr "Администрирование групп репозиториев"
 msgid "Number of Top-level Repositories"
 msgstr "Число репозиториев верхнего уровня"
 msgid "Type of repository to create."
 msgstr "Тип создаваемого репозитория."
 msgid "Clone remote repository"
 msgstr "Клонировать удалённый репозиторий"
 msgid "Repository URL"
 msgstr "URL репозитория"
 msgid ""
 "Optional: URL of a remote repository. If set, the repository will be "
 "created as a clone from this URL."
 msgstr ""
 "Опционально: URL удалённого репозитория. Если параметр задан, то будет "
 "создан клон репозитория, расположенного по этому адресу."
 msgid ""
 "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 "Короткое и осмысленное. Для развернутого описания используйте файл README."
 msgid "Optionally select a group to put this repository into."
 msgstr "Опционально выбрать группу, в которую поместить данный репозиторий."
 msgid "Type of repository to create."
 msgstr "Тип создаваемого репозитория."
 msgid "Landing revision"
 msgstr "Ревизия для выгрузки"
 msgid ""
 "Default revision for files page, downloads, full text search index and "
 "readme generation"
 msgstr ""
 "Ревизия по умолчанию для страницы файлов, загрузки, полнотекстовый "
 "поисковый индекс и генерация readme"
 msgid "%s Creating Repository"
 msgstr "Создание репозитория %s"
 msgid "Pull Changes from Remote Repository"
 msgstr "Получить изменения из удалённого репозитория"
 msgid "Confirm to pull changes from remote repository."
 msgstr "Подтвердите применение изменений из удалённого репозитория."
 msgid "This repository does not have a remote repository URL."
 msgstr "Данный репозиторий не имеет URL удалённого репозитория."
 msgid "Permanent URL"
 msgstr "Постоянный URL"
 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 "Remote repository"
 msgstr "Удалённый репозиторий"
 msgid "Repository URL"
 msgstr "URL репозитория"
 msgid ""
 "Optional: URL of a remote repository. If set, the repository can be "
 "pulled from this URL."
 msgstr ""
 "Опционально: URL удалённого репозитория. Если задан, то репозиторий можно "
 "получить по заданному адресу."
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 "Ревизия по умолчанию, из которой будет производиться выгрузка файлов при "
 "скачивании"
 msgid "Type name of user"
 msgstr "Введите имя пользователя"
 msgid "Change owner of this repository."
 msgstr "Изменить владельца репозитория."
 msgid "Processed commits"
 msgstr "Обработанные фиксации"
 msgid "Processed progress"
 msgstr "Обработанный прогресс"
 msgid "Reset Statistics"
 msgstr "Сброс статистики"
@@ @@ -2636,29 +2623,29 @@ msgstr "Загрузка..." @@
 msgid "loading ..."
 msgstr "загрузка..."
 msgid "Search truncated"
 msgstr "Поиск усечен"
 msgid "No matching files"
 msgstr "Нет совпадений"
 msgid "Open New Pull Request from {0}"
 msgstr "Открыть новый pull-запрос от {0}"
 msgid "Open New Pull Request for {0} &rarr; {1}"
 msgstr "Открыть новый pull-запрос для {0} &rarr; {1}"
 msgid "Show Selected Changesets {0} &rarr; {1}"
 msgstr "Показать выбранные наборы изменений: {0} &rarr; {1}"
 msgid "Open New Pull Request for {0}"
 msgstr "Открыть новый pull-запрос для {0}"
 msgid "Show Selected Changesets {0}"
 msgstr "Показать выбранные наборы изменений: {0}"
 msgid "Selection Link"
 msgstr "Ссылка выбора"
 msgid "Collapse Diff"
 msgstr "Свернуть сравнение"
 msgid "Expand Diff"
 msgstr "Раскрыть сравнение"
 msgid "No revisions"
 msgstr "Нет ревизий"
@@ @@ -3589,17 +3576,14 @@ msgstr "Последние изменения" @@
 msgid "Quick Start"
 msgstr "Быстрый старт"
 msgid "Add or upload files directly via Kallithea"
 msgstr "Добавить или загрузить файлы через Kallithea"
 msgid "Push new repository"
 msgstr "Отправить новый репозиторий"
 msgid "Existing repository?"
 msgstr "Существующий репозиторий?"
 msgid "Readme file from revision %s:%s"
 msgstr "Файл readme из ревизии %s:%s"
 msgid "Download %s as %s"
 msgstr "Скачать %s как %s"

kallithea/i18n/uk/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # Copyright (C) 2017 Various authors, licensing as GPLv3
 # This file is distributed under the same license as the Kallithea project.
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 msgid ""
 "CSRF token leak has been detected - all form tokens have been expired"
 msgstr "Виявлено витік токенів CSRF - всі маркери форми минули"
 msgid "Repository not found in the filesystem"
 msgstr "Репозиторій не знайдено у файловій системі"
 msgid "There are no changesets yet"
 msgstr "Наборів змін немає"
 msgid "Changeset for %s %s not found in %s"
@@ @@ -1045,48 +1045,54 @@ msgid "Apply to children" @@
 msgstr "Застосовувати до дочірніх"
 msgid "Both"
 msgstr "Обидва"
 msgid ""
 "Set or revoke permission to all children of that group, including non-"
 "private repositories and other groups if selected."
 msgstr ""
 "Встановіть або скасуйте дозвіл для всіх дітей цієї групи, включно з "
 "неприватними репозиторіями та іншими групами, якщо вони вибрані."
 msgid "Type name of user"
 msgstr "Введіть ім'я користувача"
 msgid "Remove this group"
 msgstr "Видалити цю групу"
 msgid "Confirm to delete this group"
 msgstr "Підтвердіть, щоб видалити цю групу"
 msgid "Repository group %s"
 msgstr "Група репозиторію: %s"
 msgid "Repository Groups Administration"
 msgstr "Адміністрування Груп Репозиторіїв"
 msgid "Number of Top-level Repositories"
 msgstr "Кількість репозиторіїв верхнього рівня"
 msgid "Type of repository to create."
 msgstr "Тип сховища для створення."
 msgid "Clone remote repository"
 msgstr "Клонувати віддалений репозиторій"
 msgid "Repository URL"
 msgstr "URL репозиторію"
 msgid "Optionally select a group to put this repository into."
 msgstr "За бажанням виберіть групу, в яку буде розміщено цей репозиторій."
 msgid "Type of repository to create."
 msgstr "Тип сховища для створення."
 msgid "Landing revision"
 msgstr "Цільова редакція"
 msgid ""
 "Default revision for files page, downloads, full text search index and "
 "readme generation"
 msgstr ""
 "Стандартна редакція для файлів сторінок, завантажень, повнотекстового "
 "індексу пошуку та генерації readme"
 msgid "%s Creating Repository"
 msgstr "%s створення репозиторію"
 msgid "Pull Changes from Remote Repository"
 msgstr "Витягнути зміни з віддаленого сховища"
 msgid "Confirm to pull changes from remote repository."
 msgstr "Підтвердьте, щоб витягнути зміни з віддаленого сховища."
 msgid "This repository does not have a remote repository URL."
 msgstr "У цьому сховищі немає URL-адреси віддаленого сховища."
 msgid "Remote repository"
 msgstr "Віддалений репозиторій"
 msgid "Repository URL"
 msgstr "URL репозиторію"
 msgid ""
 "Optional: URL of a remote repository. If set, the repository can be "
 "pulled from this URL."
 msgstr ""
 "Опціонально: URL-адреса віддаленого сховища. Якщо встановлено, сховище "
 "можна витягнути з цієї URL-адреси."
 msgid "Type name of user"
 msgstr "Введіть ім'я користувача"
 msgid "Change owner of this repository."
 msgstr "Змінити власника цього сховища."
 msgid "Processed commits"
 msgstr "Оброблені коміти"
 msgid "Processed progress"
 msgstr "Оброблений прогрес"
 msgid "Reset Statistics"
 msgstr "Скинути статистику"

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

➞

Show inline comments

 msgid "Fork has to be the same type as parent"
 msgstr "复刻版本库必须和父版本库类型相同"
 msgid "You don't have permissions to create repository in this group"
 msgstr "没有在该版本库组中创建版本库的权限"
 msgid "This is not a valid path"
 msgstr "不是一个合法的路径"
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
-msgstr "LDAP 登陆属性的 CN 必须指定 - 这个名字作为用户名"
+msgstr "LDAP 登录属性的 CN 必须指定 - 这个名字作为用户名"
 msgid "Repository"
 msgstr "版本库"
 msgid "Description"
 msgstr "描述"
 msgid "Last Change"
 msgstr "最后修改"
 msgid "Tip"
 msgstr "Tip"
@@ @@ -706,55 +706,52 @@ msgid "Settings" @@
 msgstr "设置"
 msgid "Permissions"
 msgstr "权限"
 msgid "Created on"
 msgstr "创建于"
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
 msgstr[0] "确认删除这个版本库组：%s包含%s个版本库"
 msgid "Type of repository to create."
 msgstr "要创建的版本库类型。"
 msgid ""
 "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr "保持简短。用README文件来写更长的描述。"
 msgid "Optionally select a group to put this repository into."
 msgstr "可选的选择一个组将版本库放到其中。"
 msgid "Type of repository to create."
 msgstr "要创建的版本库类型。"
 msgid "Landing revision"
 msgstr "默认修订"
 msgid "Remote"
 msgstr "远程"
 msgid "Statistics"
 msgstr "统计"
 msgid "Remove from public journal"
 msgstr "从公共日志删除"
 msgid "Confirm to delete this repository: %s"
 msgstr "确认删除版本库：%s"
 msgid "Key"
 msgstr "键"
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr "文件浏览、下载、whoosh和README的默认修订版本"
 msgid "Change owner of this repository."
 msgstr "修改这个版本库的所有者。"
 msgid "Hooks"
 msgstr "钩子"
 msgid "Send"
 msgstr "发送"
 msgid "Failed to remove hook"
 msgstr "移除钩子失败"
@@ @@ -854,26 +851,26 @@ msgstr "权限" @@
 msgid "Edit Permission"
 msgstr "编辑权限"
 msgid "Stop following this repository"
 msgstr "停止关注该版本库"
 msgid "Start following this repository"
 msgstr "开始关注该版本库"
 msgid "Group"
 msgstr "组"
 msgid "Show Selected Changesets {0} &rarr; {1}"
 msgstr "显示选中的修订集 {0} &rarr; {1}"
 msgid "Show Selected Changesets {0}"
 msgstr "显示选中的修订集 {0}"
 msgid "Select changeset"
 msgstr "选择修订集"
 msgid "Specify changeset"
 msgstr "指定修订集"
 msgid "Click to sort ascending"
 msgstr "点击以升序排列"
 msgid "Click to sort descending"
 msgstr "点击以降序排列"
@@ @@ -937,25 +934,25 @@ msgid "on this changeset" @@
 msgstr "在此修订集"
 msgid "Set changeset status"
 msgstr "设置修订集状态"
 msgid "Comment"
 msgstr "评论"
 msgid "You need to be logged in to comment."
 msgstr "您必须登录才能评论。"
 msgid "Login now"
-msgstr "现在登陆"
+msgstr "现在登录"
 msgid "Hide"
 msgstr "隐藏"
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d条评论"
 msgid "%s Changesets"
 msgstr "%s 修订集"
 msgid "Changeset status: %s"

kallithea/model/db.py

➞

Show inline comments

@@ @@ -904,25 +904,25 @@ class Repository(meta.Base, BaseDbModel) @@
         Index('r_repo_name_idx', 'repo_name'),
         _table_args_default_dict,
+    )
     DEFAULT_CLONE_URI = '{scheme}://{user}@{netloc}/{repo}'
     DEFAULT_CLONE_SSH = 'ssh://{system_user}@{hostname}/{repo}'
     STATE_CREATED = 'repo_state_created'
     STATE_PENDING = 'repo_state_pending'
     STATE_ERROR = 'repo_state_error'
     repo_id = Column(Integer(), primary_key=True)
     repo_name = Column(Unicode(255), nullable=False, unique=True)
+    repo_name = Column(Unicode(255), nullable=False, unique=True)  # full path, must be updated (based on get_new_name) when name or path changes
     repo_state = Column(String(255), nullable=False)
     clone_uri = Column(String(255), nullable=True) # FIXME: not nullable?
     repo_type = Column(String(255), nullable=False) # 'hg' or 'git'
     owner_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
     private = Column(Boolean(), nullable=False)
     enable_statistics = Column("statistics", Boolean(), nullable=False, default=True)
     enable_downloads = Column("downloads", Boolean(), nullable=False, default=True)
     description = Column(Unicode(10000), nullable=False)
     created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     updated_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     _landing_revision = Column("landing_revision", String(255), nullable=False)
@@ @@ -1328,25 +1328,25 @@ class Repository(meta.Base, BaseDbModel) @@
+        )
 class RepoGroup(meta.Base, BaseDbModel):
     __tablename__ = 'groups'
     __table_args__ = (
         _table_args_default_dict,
+    )
     SEP = ' &raquo; '
     group_id = Column(Integer(), primary_key=True)
     group_name = Column(Unicode(255), nullable=False, unique=True) # full path
+    group_name = Column(Unicode(255), nullable=False, unique=True)  # full path, must be updated (based on get_new_name) when name or path changes
     parent_group_id = Column('group_parent_id', Integer(), ForeignKey('groups.group_id'), nullable=True)
     group_description = Column(Unicode(10000), nullable=False)
     owner_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
     created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     repo_group_to_perm = relationship('UserRepoGroupToPerm', cascade='all', order_by='UserRepoGroupToPerm.group_to_perm_id')
     users_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
     parent_group = relationship('RepoGroup', remote_side=group_id)
     owner = relationship('User')
     @classmethod
     def query(cls, sorted=False):
@@ @@ -1905,24 +1905,25 @@ class ChangesetComment(meta.Base, BaseDb @@
     def url(self):
         anchor = "comment-%s" % self.comment_id
         if self.revision:
             return webutils.url('changeset_home', repo_name=self.repo.repo_name, revision=self.revision, anchor=anchor)
         elif self.pull_request_id is not None:
             return self.pull_request.url(anchor=anchor)
     def __json__(self):
         return dict(
             comment_id=self.comment_id,
             username=self.author.username,
             created_on=self.created_on.replace(microsecond=0),
             text=self.text,
+        )
     def deletable(self):
         return self.created_on > datetime.datetime.now() - datetime.timedelta(minutes=5)
 class ChangesetStatus(meta.Base, BaseDbModel):
     __tablename__ = 'changeset_statuses'
     __table_args__ = (
         Index('cs_revision_idx', 'revision'),
         Index('cs_version_idx', 'version'),

kallithea/model/forms.py

➞

Show inline comments

@@ @@ -164,24 +164,25 @@ def RepoGroupForm(edit=False, old_data=N @@
     class _RepoGroupForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         group_name = All(v.UnicodeString(strip=True, min=1, not_empty=True),
                          v.SlugifyName(),
                          v.ValidRegex(msg=_('Name must not contain only digits'))(r'(?!^\d+$)^.+$'))
         group_description = v.UnicodeString(strip=True, min=1,
                                             not_empty=False)
         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
         parent_group_id = All(v.CanCreateGroup(can_create_in_root),
                               v.OneOf(repo_group_ids, hideList=False,
                                       testValueList=True,
                                       if_missing=None, not_empty=True),
                               v.Int(min=-1, not_empty=True))
         chained_validators = [v.ValidRepoGroup(edit, old_data)]
     return _RepoGroupForm

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -702,31 +702,28 @@ def create_repo(form_data, cur_user): @@
     owner = cur_user
     repo_name = form_data['repo_name']
     repo_name_full = form_data['repo_name_full']
     repo_type = form_data['repo_type']
     description = form_data['repo_description']
     private = form_data['repo_private']
     clone_uri = form_data.get('clone_uri')
     repo_group = form_data['repo_group']
     landing_rev = form_data['repo_landing_rev']
     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,
             repo_type=repo_type,
             description=description,
             owner=owner,
             private=private,
             clone_uri=clone_uri,
             repo_group=repo_group,
             landing_rev=landing_rev,
             fork_of=fork_of,
             copy_fork_permissions=copy_fork_permissions,

kallithea/model/repo_group.py

➞

Show inline comments

@@ @@ -269,63 +269,64 @@ class RepoGroupModel(object): @@
                         _set_perm_group(obj, users_group=member, perm=perm)
             updates.append(obj)
             # if it's not recursive call for all,repos,groups
             # break the loop and don't proceed with other changes
             if recursive not in ['all', 'repos', 'groups']:
                 break
         return updates
     def update(self, repo_group, repo_group_args):
         try:
             repo_group = db.RepoGroup.guess_instance(repo_group)
             old_path = repo_group.full_path
+            old_path = repo_group.full_path  # aka .group_name
             # 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'])
                 new_parent_group = db.RepoGroup.get(repo_group_args['parent_group_id'])
                 if new_parent_group is not repo_group.parent_group:
                     repo_group.parent_group = new_parent_group
                     repo_group.group_name = repo_group.get_new_name(repo_group.name)
                     log.debug('Moving repo group %s to %s', old_path, repo_group.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:
                     raise Exception('invalid repo group name %s' % group_name)
                 if repo_group.name != group_name:
                 repo_group.group_name = repo_group.get_new_name(group_name)
                     log.debug('Renaming repo group %s to %s', old_path, repo_group.group_name)
             new_path = repo_group.full_path
             meta.Session().add(repo_group)
             # iterate over all members of this groups and do fixes
             # if obj is a repoGroup also fix the name of the group according
             # to the parent
             # if obj is a Repo fix it's name
             # this can be potentially heavy operation
             # Iterate over all members of this repo group and update the full
             # path (repo_name and group_name) based on the (already updated)
             # full path of the parent.
             # This can potentially be a heavy operation.
             for obj in repo_group.recursive_groups_and_repos():
                 # set the value from it's parent
                 if obj is repo_group:
                     continue  # already updated and logged
                 if isinstance(obj, db.RepoGroup):
                     new_name = obj.get_new_name(obj.name)
                     log.debug('Fixing group %s to new name %s'
                                 % (obj.group_name, new_name))
                     log.debug('Fixing repo group %s to new name %s', obj.group_name, new_name)
                     obj.group_name = new_name
                 elif isinstance(obj, db.Repository):
                     # we need to get all repositories from this new group and
                     # rename them accordingly to new group path
                     new_name = obj.get_new_name(obj.just_name)
                     log.debug('Fixing repo %s to new name %s'
                                 % (obj.repo_name, new_name))
                     log.debug('Fixing repo %s to new name %s', obj.repo_name, new_name)
                     obj.repo_name = new_name
             # Rename in file system
             self._rename_group(old_path, new_path)
             return repo_group
         except Exception:
             log.error(traceback.format_exc())
             raise
     def delete(self, repo_group, force_delete=False):
         repo_group = db.RepoGroup.guess_instance(repo_group)
         try:
             meta.Session().delete(repo_group)
             self._delete_group(repo_group, force_delete)

kallithea/templates/about.html

➞

Show inline comments

@@ @@ -15,39 +15,45 @@ @@
   <div class="panel-body panel-about">
   <p><a href="https://kallithea-scm.org/">Kallithea</a> is a project of the
   <a href="http://sfconservancy.org/">Software Freedom Conservancy, Inc.</a>
   and is released under the terms of the
   <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License,
   v 3.0 (GPLv3)</a>.</p>
   <p>Kallithea is copyrighted by various authors, including but not
   necessarily limited to the following:</p>
   <ul>
   <li>Copyright &copy; 2012&ndash;2021, Mads Kiilerich</li>
   <li>Copyright &copy; 2012&ndash;2023, Mads Kiilerich</li>
   <li>Copyright &copy; 2019&ndash;2020, 2022&ndash;2023, Manuel Jacob</li>
   <li>Copyright &copy; 2023, Mathias De Mare</li>
   <li>Copyright &copy; 2016&ndash;2017, 2020, 2022, Asterios Dimitriou</li>
   <li>Copyright &copy; 2022, Jaime Marquínez Ferrándiz</li>
   <li>Copyright &copy; 2022, Louis Bertrand</li>
   <li>Copyright &copy; 2022, toras9000</li>
   <li>Copyright &copy; 2022, yzqzss</li>
   <li>Copyright &copy; 2022, МАН69К</li>
   <li>Copyright &copy; 2014&ndash;2021, Thomas De Schampheleire</li>
   <li>Copyright &copy; 2015&ndash;2017, 2019&ndash;2021, Étienne Gilli</li>
   <li>Copyright &copy; 2018&ndash;2021, ssantos</li>
   <li>Copyright &copy; 2019&ndash;2021, Private</li>
   <li>Copyright &copy; 2020&ndash;2021, fresh</li>
   <li>Copyright &copy; 2020&ndash;2021, robertus</li>
   <li>Copyright &copy; 2021, Eugenia Russell</li>
   <li>Copyright &copy; 2021, Michalis</li>
   <li>Copyright &copy; 2021, vs</li>
   <li>Copyright &copy; 2021, Александр</li>
   <li>Copyright &copy; 2016&ndash;2017, 2020, Asterios Dimitriou</li>
   <li>Copyright &copy; 2017&ndash;2020, Allan Nordhøy</li>
   <li>Copyright &copy; 2017, 2020, Anton Schur</li>
   <li>Copyright &copy; 2019&ndash;2020, Manuel Jacob</li>
   <li>Copyright &copy; 2020, Artem</li>
   <li>Copyright &copy; 2020, David Ignjić</li>
   <li>Copyright &copy; 2020, Dennis Fink</li>
   <li>Copyright &copy; 2020, J. Lavoie</li>
   <li>Copyright &copy; 2020, Ross Thomas</li>
   <li>Copyright &copy; 2020, Tim Ooms</li>
   <li>Copyright &copy; 2012, 2014&ndash;2017, 2019, Andrej Shadura</li>
   <li>Copyright &copy; 2019, Adi Kriegisch</li>
   <li>Copyright &copy; 2019, Danni Randeris</li>
   <li>Copyright &copy; 2019, Edmund Wong</li>
   <li>Copyright &copy; 2019, Elizabeth Sherrock</li>
   <li>Copyright &copy; 2019, Hüseyin Tunç</li>

kallithea/templates/admin/repo_groups/repo_group_edit_settings.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 ${h.form(url('update_repos_group',group_name=c.repo_group.group_name))}
 <div class="form">
         <div class="form-group">
             <label class="control-label" for="group_name">${_('Group name')}:</label>
             <div>
                 ${h.text('group_name',class_='form-control')}
             </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'))}
             </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')}
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="parent_group_id">${_('Group parent')}:</label>
             <div>
                 ${h.select('parent_group_id','',c.repo_groups,class_='form-control')}
             </div>
         </div>
@@ @@ -38,14 +45,15 @@ ${h.form(url('delete_repo_group', group_ @@
                 ${h.submit('remove_%s' % c.repo_group.group_name,_('Remove this group'),class_="btn btn-danger",onclick="return confirm('"+_('Confirm to delete this group')+"');")}
             </div>
         </div>
 </div>
 ${h.end_form()}
 <script>
     'use strict';
     $(document).ready(function(){
         $("#parent_group_id").select2({
             'dropdownAutoWidth': true
         });
         SimpleUserAutoComplete($('#owner'));
     });
 </script>

kallithea/templates/admin/repos/repo_add_base.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 ${h.form(url('repos'))}
 <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>
             </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>
@@ @@ -30,69 +35,77 @@ ${h.form(url('repos'))} @@
                 ${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 id="copy_perms" class="form-group">
             <label class="control-label" for="repo_copy_permissions">${_('Copy parent group permissions')}:</label>
             <div>
                 ${h.checkbox('repo_copy_permissions',value="True")}
                 <span class="help-block">${_('Copy permission set from parent repository group.')}</span>
             </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>
         <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>
         <div class="form-group">
             <div class="buttons">
                 ${h.submit('add',_('Add'),class_="btn btn-default")}
             </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();
+            }
             else{
                 $('#copy_perms').hide();
+            }
+        }
         $("#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()}

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)