Mercurial > kallithea
changeset 8468:1fa108ad4bc1 i18n
Merge from stable
line wrap: on
line diff
--- a/CONTRIBUTORS Fri Oct 02 13:17:55 2020 +0200 +++ b/CONTRIBUTORS Mon Oct 05 00:03:26 2020 +0200 @@ -3,7 +3,11 @@ Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> 2014-2020 Mads Kiilerich <mads@kiilerich.com> 2016-2020 Asterios Dimitriou <steve@pci.gr> 2016-2017 2020 + Allan Nordhøy <epost@anotheragency.no> 2017-2020 + Anton Schur <tonich.sh@gmail.com> 2017 2020 + ssantos <ssantos@web.de> 2018-2020 Private <adamantine.sword@gmail.com> 2019-2020 + David Ignjić <ignjic@gmail.com> 2020 Dennis Fink <dennis.fink@c3l.lu> 2020 Étienne Gilli <etienne@gilli.io> 2020 J. Lavoie <j.lavoie@net-c.ca> 2020 @@ -11,8 +15,6 @@ Ross Thomas <ross@lns-nevasoft.com> 2020 Andrej Shadura <andrew@shadura.me> 2012 2014-2017 2019 Étienne Gilli <etienne.gilli@gmail.com> 2015-2017 2019 - Allan Nordhøy <epost@anotheragency.no> 2017-2019 - ssantos <ssantos@web.de> 2018-2019 Adi Kriegisch <adi@cg.tuwien.ac.at> 2019 Danni Randeris <danniranderis@gmail.com> 2019 Edmund Wong <ewong@crazy-cat.org> 2019 @@ -40,7 +42,6 @@ Søren Løvborg <sorenl@unity3d.com> 2015-2017 Sam Jaques <sam.jaques@me.com> 2015 2017 Alessandro Molina <alessandro.molina@axant.it> 2017 - Anton Schur <tonich.sh@gmail.com> 2017 Ching-Chen Mao <mao@lins.fju.edu.tw> 2017 Eivind Tagseth <eivindt@gmail.com> 2017 FUJIWARA Katsunori <foozy@lares.dti.ne.jp> 2017
--- a/README.rst Fri Oct 02 13:17:55 2020 +0200 +++ b/README.rst Mon Oct 05 00:03:26 2020 +0200 @@ -49,9 +49,6 @@ The latest sources can be obtained from https://kallithea-scm.org/repos/kallithea. -The issue tracker and a repository mirror can be found at Bitbucket_ on -https://bitbucket.org/conservancy/kallithea. - Kallithea features ------------------ @@ -138,8 +135,9 @@ - Follow Kallithea on Twitter, **@KallitheaSCM**. -- Issues can be reported at `issue tracker - <https://bitbucket.org/conservancy/kallithea/issues>`_. +- The `old issue tracker <https://bitbucket.org/conservancy/kallithea/issues>`_ + is defunct after it was deleted by Bitbucket_. For now, please report issues + on the mailing list. .. note::
--- a/kallithea/bin/base.py Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/bin/base.py Mon Oct 05 00:03:26 2020 +0200 @@ -128,7 +128,7 @@ update = False if os.path.exists(self._conf_name): update = True - with open(self._conf_name, 'wb') as f: + with open(self._conf_name, 'w') as f: ext_json.dump(config, f, indent=4) f.write('\n') @@ -137,29 +137,12 @@ else: sys.stdout.write('Created new config in %s\n' % self._conf_name) - def update_config(self, new_config): - """ - Reads the JSON config updates it's values with new_config and - saves it back as JSON dump - - :param new_config: - """ - config = {} - try: - with open(self._conf_name, 'rb') as conf: - config = ext_json.load(conf) - except IOError as e: - sys.stderr.write(str(e) + '\n') - - config.update(new_config) - self.make_config(config) - def load_config(self): """ Loads config from file and returns loaded JSON object """ try: - with open(self._conf_name, 'rb') as conf: + with open(self._conf_name, 'r') as conf: return ext_json.load(conf) except IOError as e: #sys.stderr.write(str(e) + '\n')
--- a/kallithea/controllers/pullrequests.py Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/controllers/pullrequests.py Mon Oct 05 00:03:26 2020 +0200 @@ -161,8 +161,10 @@ else: selected = 'tag:null:' + repo.EMPTY_CHANGESET tags.append((selected, 'null')) - else: - if 'master' in repo.branches: + else: # Git + if not repo.branches: + selected = '' # doesn't make sense, but better than nothing + elif 'master' in repo.branches: selected = 'branch:master:%s' % repo.branches['master'] else: k, v = list(repo.branches.items())[0]
--- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2017-08-20 10:44+0000\n" "Last-Translator: Viktar Vauchkevich <victorenator@gmail.com>\n" "Language-Team: Belarusian <https://hosted.weblate.org/projects/kallithea/" @@ -19,7 +19,7 @@ "X-Generator: Weblate 2.17-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Яшчэ не было змен" @@ -249,12 +249,12 @@ msgstr "Набор змен" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "Галіны" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "Тэгі" @@ -354,114 +354,114 @@ msgid "Changeset" msgstr "Змены" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "Адмысловы" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "Галіны ўдзельніка" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "Закладкі" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "Памылка пры стварэнні pull-запыту: %s" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "Адбылася памылка пры стварэнні pull-запыту" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "Pull-запыт створаны паспяхова" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 #, fuzzy #| msgid "Pull request update created" msgid "New pull request iteration created" msgstr "Абнаўленне для pull-запыту створана" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "Няма апісання" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "Pull-запыт абноўлены" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "Pull-запыт паспяхова выдалены" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, fuzzy, python-format #| msgid "Changeset for %s %s not found in %s" msgid "Revision %s not found in %s" msgstr "Набор змен для %s %s не знойдзены ў %s" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, fuzzy, python-format #| msgid "No changesets found for updating this pull request." msgid "Error: changesets not found when displaying pull request from %s." msgstr "Няма змен для абнаўлення гэтага pull-запыту." -#: kallithea/controllers/pullrequests.py:518 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "Гэты pull-запыт ужо прыняты на галіну %s." -#: kallithea/controllers/pullrequests.py:520 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "Гэты pull-запыт быў зачынены і не можа быць абноўлены." -#: kallithea/controllers/pullrequests.py:539 +#: kallithea/controllers/pullrequests.py:541 #, fuzzy, python-format #| msgid "The following changes are available on %s:" msgid "The following additional changes are available on %s:" msgstr "Гэтыя змены даступныя на %s:" -#: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 #, fuzzy #| msgid "No changesets found for updating this pull request." msgid "No additional changesets found for iterating on this pull request." msgstr "Няма змен для абнаўлення гэтага pull-запыту." -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Увага: Галіна %s мае яшчэ адну верхавіну: %s." -#: kallithea/controllers/pullrequests.py:560 +#: kallithea/controllers/pullrequests.py:562 #, fuzzy #| msgid "Git pull requests don't support updates yet." msgid "Git pull requests don't support iterating yet." msgstr "Абнаўленне pull-запытаў git яшчэ не падтрымліваецца." -#: kallithea/controllers/pullrequests.py:562 +#: kallithea/controllers/pullrequests.py:564 #, fuzzy, python-format #| msgid "No changesets found for updating this pull request." msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "Няма змен для абнаўлення гэтага pull-запыту." -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr ""
--- a/kallithea/i18n/bg/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/bg/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.4.99\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -18,7 +18,7 @@ "Generated-By: Babel 2.6.0\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "" @@ -239,12 +239,12 @@ msgstr "" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "" @@ -342,104 +342,104 @@ msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:518 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - #: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:539 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - #: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:560 -msgid "Git pull requests don't support iterating yet." -msgstr "" - #: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr ""
--- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2015-11-12 08:51+0000\n" "Last-Translator: Michal Čihař <michal@cihar.com>\n" "Language-Team: Czech <https://hosted.weblate.org/projects/kallithea/" @@ -18,7 +18,7 @@ "X-Generator: Weblate 2.5-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "" @@ -244,12 +244,12 @@ msgstr "Změny" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "Větve" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "Tagy" @@ -347,104 +347,104 @@ msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "Záložky" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:518 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - #: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:539 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - #: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:560 -msgid "Git pull requests don't support iterating yet." -msgstr "" - #: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr ""
--- a/kallithea/i18n/da/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/da/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3.99\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2019-03-14 01:03+0000\n" "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n" "Language-Team: Danish <https://hosted.weblate.org/projects/kallithea/" @@ -17,7 +17,7 @@ "X-Generator: Weblate 3.5.1\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Der er ingen changesets endnu" @@ -248,13 +248,13 @@ msgstr "Changesets" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 #, fuzzy msgid "Branches" msgstr "Branches" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "Tags" @@ -355,101 +355,101 @@ msgid "Changeset" msgstr "Changeset" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "Speciel" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "Bogmærker" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "Fejl ved oprettelse af pull-forespørgsel: %s" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "Der opstod en fejl under oprettelse af pull-forespørgsel" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "Åbnede ny pull-forespørgsel med success" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 msgid "New pull request iteration created" msgstr "Ny pull-forespørgsel iteration oprettet" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "I mellemtiden er de følgende reviewers tilføjet: %s" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "I mellemtiden er de følgende reviewers fjernet: %s" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "Ingen beskrivelse" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "Pull-forespørgsel opdateret" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "Slettede pull-forespørgsel med success" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "Revision %s er ikke fundet i %s" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" "Fejl: Changesets ikke fundet, ved visning af pull-forespørgsel fra %s." -#: kallithea/controllers/pullrequests.py:518 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "Denne pull-forespørgsel er allerede merged til %s." -#: kallithea/controllers/pullrequests.py:520 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "Denne pull-forespørgsel er lukket og kan ikke opdateres." -#: kallithea/controllers/pullrequests.py:539 +#: kallithea/controllers/pullrequests.py:541 #, python-format msgid "The following additional changes are available on %s:" msgstr "Følgende yderligere ændringer er tilgængelige på %s:" -#: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" "Ingen yderligere changesets fundet ved iteration på denne pull-" "forespørgsel." -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Bemærk: Branch %s har et andet head: %s." -#: kallithea/controllers/pullrequests.py:560 +#: kallithea/controllers/pullrequests.py:562 msgid "Git pull requests don't support iterating yet." msgstr "Git pull-forespørgsler supportere ej iteration endnu." -#: kallithea/controllers/pullrequests.py:562 +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." @@ -457,7 +457,7 @@ "Fejl: Nogle changesets kunne ikke findes ved visning af pull-forespørgsel " "fra %s." -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" "Diff'en kunne ikke vises - pull-forespørgslens revisions kunne ikke "
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2020-05-05 18:30+0000\n" "Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n" "Language-Team: German <https://hosted.weblate.org/projects/kallithea/" @@ -17,7 +17,7 @@ "X-Generator: Weblate 4.1-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Es gibt noch keine Änderungssätze" @@ -257,12 +257,12 @@ msgstr "Änderungssätze" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "Entwicklungszweige" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "Tags" @@ -362,115 +362,115 @@ msgid "Changeset" msgstr "Änderungssatz" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "Spezial" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "Branches anderer" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "Lesezeichen" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "Fehler beim Erstellen des Pull-Requests: %s" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "Während des Erstellens des Pull Requests trat ein Fehler auf" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 #, fuzzy #| msgid "Pull request update created" msgid "New pull request iteration created" msgstr "Pull Request Update erstellt" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "Es wurden inzwischen folgende Begutachter hinzugefügt: %s" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "Es wurden inzwischen folgende Begutachter entfernt: %s" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "Keine Beschreibung" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "Pull Request aktualisiert" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "Erfolgreich Pull-Request gelöscht" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "Die Revision %s konnte in %s nicht gefunden werden" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, fuzzy, python-format #| msgid "No changesets found for updating this pull request." msgid "Error: changesets not found when displaying pull request from %s." msgstr "Keine Changesets gefunden, um den Pull Request zu aktualisieren." -#: kallithea/controllers/pullrequests.py:518 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "Dieser Pull Request wurde bereits in %s integriert." -#: kallithea/controllers/pullrequests.py:520 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" "Dieser Pull Request wurde geschlossen und kann daher nicht aktualisiert " "werden." -#: kallithea/controllers/pullrequests.py:539 +#: kallithea/controllers/pullrequests.py:541 #, fuzzy, python-format #| msgid "The following changes are available on %s:" msgid "The following additional changes are available on %s:" msgstr "Die folgenden Änderungen sind verfügbar unter %s:" -#: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 #, fuzzy #| msgid "No changesets found for updating this pull request." msgid "No additional changesets found for iterating on this pull request." msgstr "Keine Changesets gefunden, um den Pull Request zu aktualisieren." -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Hinweis: Branch %s hat einen anderen Head: %s." -#: kallithea/controllers/pullrequests.py:560 +#: kallithea/controllers/pullrequests.py:562 #, fuzzy #| msgid "Git pull requests don't support updates yet." msgid "Git pull requests don't support iterating yet." msgstr "Git Pull Request unterstützen bisher keine Updates." -#: kallithea/controllers/pullrequests.py:562 +#: kallithea/controllers/pullrequests.py:564 #, fuzzy, python-format #| msgid "No changesets found for updating this pull request." msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "Keine Changesets gefunden, um den Pull Request zu aktualisieren." -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" "Der diff kann nicht angezeigt werden. Die Pull Request Revisionen konnten "
--- a/kallithea/i18n/el/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/el/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2020-04-22 16:11+0000\n" "Last-Translator: Asterios Dimitriou <steve@pci.gr>\n" "Language-Team: Greek <https://hosted.weblate.org/projects/kallithea/" @@ -17,7 +17,7 @@ "X-Generator: Weblate 4.0.2-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Δεν υπάρχουν σετ αλλαγών ακόμα" @@ -250,12 +250,12 @@ msgstr "Σετ αλλαγών" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "Κλάδοι" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "Ετικέτες" @@ -355,102 +355,102 @@ msgid "Changeset" msgstr "Σετ αλλαγών" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "Ειδικός" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "Ομότιμοι κλάδοι" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "Σελιδοδείκτες" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "Σφάλμα στη δημιουργία αιτήματος έλξης - pull request: %s" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "Παρουσιάστηκε σφάλμα κατά τη δημιουργία αίτησης έλξης" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "Ένα νέο αίτημα έλξης (pull request) δημιουργήθηκε επιτυχώς" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 msgid "New pull request iteration created" msgstr "Δημιουργήθηκε νέο αίτημα έλξης" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "Εντωμεταξύ, οι ακόλουθοι κριτικοί προστέθηκαν: %s" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "Εντωμεταξύ, οι ακόλουθοι κριτικοί αφαιρέθηκαν: %s" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "Χωρίς περιγραφή" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "Ενημερώθηκε η αίτηση έλξης" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "Επιτυχής διαγραφή αιτήματος έλξης" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "Η αναθεώρηση %s δεν βρέθηκε στο %s" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" "Σφάλμα: τα σετ αλλαγών δεν βρέθηκαν όταν εμφανίζεται το αίτημα έλξης από " "το %s." -#: kallithea/controllers/pullrequests.py:518 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "Το αίτημα έλξης έχει ήδη συγχωνευτεί με το %s." -#: kallithea/controllers/pullrequests.py:520 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "Αυτό το αίτημα έλξης έχει κλείσει και δεν μπορεί να ενημερωθεί." -#: kallithea/controllers/pullrequests.py:539 +#: kallithea/controllers/pullrequests.py:541 #, python-format msgid "The following additional changes are available on %s:" msgstr "Οι επιπλέον ακόλουθες αλλαγές είναι διαθέσιμες στο %s:" -#: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" "Δεν βρέθηκαν επιπλέον σετ αλλαγών στην προσέγγιση αυτού του αιτήματος " "έλξης." -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Σημείωση: Ο κλάδος %s έχει άλλη κεφαλή (head): %s." -#: kallithea/controllers/pullrequests.py:560 +#: kallithea/controllers/pullrequests.py:562 msgid "Git pull requests don't support iterating yet." msgstr "Αιτήματα έλξης του git δεν υποστηρίζουν ακόμα ενημερώσεις." -#: kallithea/controllers/pullrequests.py:562 +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." @@ -458,7 +458,7 @@ "Σφάλμα: κάποια σετ αλλαγών δεν βρέθηκαν όταν εμφανιζόταν αυτό το αίτημα " "έλξης από το %s." -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" "Οι διαφορές δεν μπορούν να εμφανιστούν - οι αναθεωρήσεις δεν βρέθηκαν."
--- a/kallithea/i18n/es/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/es/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2018-04-18 11:43+0000\n" "Last-Translator: Jesús Sánchez <jsanchezfdz95@gmail.com>\n" "Language-Team: Spanish <https://hosted.weblate.org/projects/kallithea/" @@ -17,7 +17,7 @@ "X-Generator: Weblate 3.0-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Aún no hay cambios" @@ -249,12 +249,12 @@ msgstr "Cambios" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "Ramas" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "Etiquetas" @@ -352,114 +352,114 @@ msgid "Changeset" msgstr "Cambio" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "Especial" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 #, fuzzy msgid "Peer branches" msgstr "Ramas de los pares" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "Marcadores" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "Error al crear la petición de pull: %s" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "Ocurrió un error al crear la petición de pull" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "La petición de pull se ha creado correctamente" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 #, fuzzy #| msgid "Pull request update created" msgid "New pull request iteration created" msgstr "Actualización de la petición pull creada" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "No hay descripción" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "Petición pull actualizada" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "Petición pull eliminada correctamente" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, fuzzy, python-format #| msgid "No changesets found for updating this pull request." msgid "Error: changesets not found when displaying pull request from %s." msgstr "No se encontraron cambios para actualizar la petición pull." -#: kallithea/controllers/pullrequests.py:518 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "La petición pull ya ha sido incluida a %s." -#: kallithea/controllers/pullrequests.py:520 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "La petición pull esta cerrada y no se puede actualizar." -#: kallithea/controllers/pullrequests.py:539 +#: kallithea/controllers/pullrequests.py:541 #, fuzzy, python-format #| msgid "The following changes are available on %s:" msgid "The following additional changes are available on %s:" msgstr "Los siguientes cambios están disponibles en %s:" -#: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 #, fuzzy #| msgid "No changesets found for updating this pull request." msgid "No additional changesets found for iterating on this pull request." msgstr "No se encontraron cambios para actualizar la petición pull." -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, fuzzy, python-format msgid "Note: Branch %s has another head: %s." msgstr "Nota: la rama %s tiene otro head: %s." -#: kallithea/controllers/pullrequests.py:560 +#: kallithea/controllers/pullrequests.py:562 #, fuzzy #| msgid "Git pull requests don't support updates yet." msgid "Git pull requests don't support iterating yet." msgstr "La peticiones pull de Git aún no soportan actualizaciones." -#: kallithea/controllers/pullrequests.py:562 +#: kallithea/controllers/pullrequests.py:564 #, fuzzy, python-format #| msgid "No changesets found for updating this pull request." msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "No se encontraron cambios para actualizar la petición pull." -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr ""
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2020-07-23 15:41+0000\n" "Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n" "Language-Team: French <https://hosted.weblate.org/projects/kallithea/" @@ -17,7 +17,7 @@ "X-Generator: Weblate 4.2-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Il n’y a aucun changement pour le moment" @@ -248,12 +248,12 @@ msgstr "Changesets" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "Branches" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "Tags" @@ -352,102 +352,102 @@ msgid "Changeset" msgstr "Changements" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "Spécial" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "Branches appairées" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "Signets" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "Erreur de création de la demande de pull : %s" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "Une erreur est survenue durant la création de la pull request" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "La requête de pull a été ouverte avec succès" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 msgid "New pull request iteration created" msgstr "Nouvelle itération de requête de pull créée" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "Entretemps, les relecteurs suivants on été ajoutés : %s" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "Entretemps, les relecteurs suivants ont été supprimés : %s" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "Aucune description" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "Pull request mise à jour" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "La requête de pull a été supprimée avec succès" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "Révision %s non trouvée dans %s" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" "Erreur : Pas de changeset trouvé lors de l'affichage la requête de pull " "de %s." -#: kallithea/controllers/pullrequests.py:518 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "Cette pull request a déjà été fusionnée à %s." -#: kallithea/controllers/pullrequests.py:520 +#: kallithea/controllers/pullrequests.py:522 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." -#: kallithea/controllers/pullrequests.py:539 +#: kallithea/controllers/pullrequests.py:541 #, python-format msgid "The following additional changes are available on %s:" msgstr "" "Les modifications additionnelles suivantes sont disponibles sur %s :" -#: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "Pas de changeset additionnel trouvé pour cette requête de pull." -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Note : La branche %s a une autre tête : %s." -#: kallithea/controllers/pullrequests.py:560 +#: kallithea/controllers/pullrequests.py:562 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." -#: kallithea/controllers/pullrequests.py:562 +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." @@ -455,7 +455,7 @@ "Erreur : certains changesets n'ont pas été trouvés lors de l'affichage la " "requête de pull depuis %s." -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" "Le diff ne peut pas être affiché : révisions des requêtes de pull " @@ -1293,12 +1293,14 @@ #: kallithea/lib/ssh.py:83 msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'" -msgstr "Clé SSH incorrecte – elle doit commencer par « ssh-(rsa|dss|ed25519) »" +msgstr "" +"Clé SSH incorrecte – elle doit commencer par « ssh-(rsa|dss|ed25519) »" #: kallithea/lib/ssh.py:86 #, python-format msgid "Incorrect SSH key - unexpected characters in base64 part %r" -msgstr "Clé SSH incorrecte – caractères inattendus dans la partie base 64 %r" +msgstr "" +"Clé SSH incorrecte – caractères inattendus dans la partie base 64 %r" #: kallithea/lib/ssh.py:91 #, python-format @@ -1309,7 +1311,8 @@ #, python-format msgid "Incorrect SSH key - base64 part is not %r as claimed but %r" msgstr "" -"Clé SSH incorrecte – la partie base 64 n'est pas %r comme il est dit mais %r" +"Clé SSH incorrecte – la partie base 64 n'est pas %r comme il est dit mais " +"%r" #: kallithea/lib/utils2.py:253 #, python-format
--- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2015-04-11 00:59+0200\n" "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n" "Language-Team: Hungarian <https://hosted.weblate.org/projects/kallithea/" @@ -18,7 +18,7 @@ "X-Generator: Weblate 2.3-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "" @@ -239,12 +239,12 @@ msgstr "" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "" @@ -342,104 +342,104 @@ msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:518 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - #: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:539 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - #: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:560 -msgid "Git pull requests don't support iterating yet." -msgstr "" - #: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr ""
--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2019-08-27 07:23+0000\n" "Last-Translator: leela <53352@protonmail.com>\n" "Language-Team: Japanese <https://hosted.weblate.org/projects/kallithea/" @@ -17,7 +17,7 @@ "X-Generator: Weblate 3.9-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "まだチェンジセットがありません" @@ -250,12 +250,12 @@ msgstr "チェンジセット" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "ブランチ" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "タグ" @@ -355,113 +355,113 @@ msgid "Changeset" msgstr "チェンジセット" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "スペシャル" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "相手のブランチ" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "ブックマーク" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "プルリクエスト作成中にエラーが発生しました: %s" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "新しいプルリクエストの作成に成功しました" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 #, fuzzy #| msgid "Pull request update created" msgid "New pull request iteration created" msgstr "プルリクエストレビュアー" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "説明がありません" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "プルリクエストを更新しました" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "プルリクエストの削除に成功しました" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, fuzzy, python-format #| msgid "No changesets found for updating this pull request." msgid "Error: changesets not found when displaying pull request from %s." msgstr "プルリクエストを更新するためのチェンジセットが見つかりません。" -#: kallithea/controllers/pullrequests.py:518 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:520 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" "このプルリクエストはすでにクローズされていて、更新することはできません。" -#: kallithea/controllers/pullrequests.py:539 +#: kallithea/controllers/pullrequests.py:541 #, python-format msgid "The following additional changes are available on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 #, fuzzy #| msgid "No changesets found for updating this pull request." msgid "No additional changesets found for iterating on this pull request." msgstr "プルリクエストを更新するためのチェンジセットが見つかりません。" -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "ノート: ブランチ%sには別のヘッド%sがあります。" -#: kallithea/controllers/pullrequests.py:560 +#: kallithea/controllers/pullrequests.py:562 #, fuzzy #| msgid "Git pull requests don't support updates yet." msgid "Git pull requests don't support iterating yet." msgstr "Gitのプルリクエストはまだ更新をサポートしていません。" -#: kallithea/controllers/pullrequests.py:562 +#: kallithea/controllers/pullrequests.py:564 #, fuzzy, python-format #| msgid "No changesets found for updating this pull request." msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "プルリクエストを更新するためのチェンジセットが見つかりません。" -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr ""
--- a/kallithea/i18n/kallithea.pot Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/kallithea.pot Mon Oct 05 00:03:26 2020 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.6.1\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-06-18 16:35+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,7 +18,7 @@ "Generated-By: Babel 2.8.0\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "" @@ -236,12 +236,12 @@ msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:727 kallithea/controllers/pullrequests.py:174 +#: kallithea/controllers/files.py:727 kallithea/controllers/pullrequests.py:176 #: kallithea/model/scm.py:663 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:728 kallithea/controllers/pullrequests.py:175 +#: kallithea/controllers/files.py:728 kallithea/controllers/pullrequests.py:177 #: kallithea/model/scm.py:674 msgid "Tags" msgstr "" @@ -339,103 +339,103 @@ msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:518 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - #: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:539 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - #: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:560 -msgid "Git pull requests don't support iterating yet." -msgstr "" - #: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr ""
--- a/kallithea/i18n/lb/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/lb/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -3,7 +3,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2020-04-13 19:42+0000\n" "Last-Translator: Dennis Fink <dennis.fink@c3l.lu>\n" "Language: lb\n" @@ -14,7 +14,7 @@ "X-Generator: Weblate 4.0-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Et sinn nach keng Ännerungen do" @@ -235,12 +235,12 @@ msgstr "Ännerungen" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "Äascht" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "" @@ -338,104 +338,104 @@ msgid "Changeset" msgstr "Ännerung" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "Spezial" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "Lieszeechen" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "Keng Beschreiwung" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:518 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - #: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:539 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - #: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:560 -msgid "Git pull requests don't support iterating yet." -msgstr "" - #: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr ""
--- a/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3.99\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2020-08-11 11:32+0000\n" "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n" "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/" @@ -17,7 +17,7 @@ "X-Generator: Weblate 4.2-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Ingen endringssett enda" @@ -251,12 +251,12 @@ msgstr "Endringssett" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "Forgreninger" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "Etiketter" @@ -358,106 +358,106 @@ msgid "Changeset" msgstr "Endringssett" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 #, fuzzy msgid "Special" msgstr "Spesiell" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "Likemennsforgreninger" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "Bokmerker" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "Feil ved opprettelse av ny innsendelsesforespørsel: %s" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "Feil inntraff under opprettelse av innsendelsesforespørsel" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "Åpnet en ny innsendelsesforespørsel" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "Ingen beskrivelse" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "Innsendingsforespørsel oppdatert" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "Slettet innsendingsforespørsel" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:518 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "Denne innsendingsforespørselen har allerede blitt flettet inn i %s." -#: kallithea/controllers/pullrequests.py:520 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" "Denne innsendingsforespørselen har blitt lukket, og kan ikke oppdateres." -#: kallithea/controllers/pullrequests.py:539 +#: kallithea/controllers/pullrequests.py:541 #, python-format msgid "The following additional changes are available on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Merk: Forgreningen %s har et annet hode: %s." -#: kallithea/controllers/pullrequests.py:560 +#: kallithea/controllers/pullrequests.py:562 msgid "Git pull requests don't support iterating yet." msgstr "" -#: kallithea/controllers/pullrequests.py:562 +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr ""
--- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2019-10-05 19:28+0000\n" "Last-Translator: Thomas De Schampheleire <patrickdepinguin@gmail.com>\n" "Language-Team: Flemish <https://hosted.weblate.org/projects/kallithea/" @@ -18,7 +18,7 @@ "X-Generator: Weblate 3.9-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Er zijn nog geen changesets" @@ -247,12 +247,12 @@ msgstr "Changesets" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "Branches" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "Tags" @@ -350,104 +350,104 @@ msgid "Changeset" msgstr "Changeset" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "Bijzonder" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:518 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - #: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:539 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - #: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:560 -msgid "Git pull requests don't support iterating yet." -msgstr "" - #: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr ""
--- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2020-10-03 13:41+0000\n" "Last-Translator: robertus <robertuss12@gmail.com>\n" "Language-Team: Polish <https://hosted.weblate.org/projects/kallithea/" @@ -13,12 +13,12 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n" +"%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 4.3-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Brak zestawienia zmian" @@ -248,12 +248,12 @@ msgstr "Różnice" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "Gałęzie" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "Etykiety" @@ -353,106 +353,106 @@ msgid "Changeset" msgstr "Grupy zmian" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "Specjalne" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "gałęzie" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "Zakładki" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 #, fuzzy #| msgid "Pull request update created" msgid "New pull request iteration created" msgstr "Recenzje wniosków połączenia gałęzi" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "Brak opisu" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "Połączone gałęzie zaktualizowane" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:518 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - #: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:539 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - #: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:560 -msgid "Git pull requests don't support iterating yet." -msgstr "" - #: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr ""
--- a/kallithea/i18n/pt/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/pt/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -7,20 +7,20 @@ msgstr "" "Project-Id-Version: Kallithea 0.6.1\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-06-18 16:35+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2020-10-01 14:40+0000\n" "Last-Translator: ssantos <ssantos@web.de>\n" "Language-Team: none\n" "Language: pt\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Weblate 4.3-dev\n" "Generated-By: Babel 2.8.0\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Não há nenhum changeset ainda" @@ -44,7 +44,8 @@ msgid "Show whitespace" msgstr "Mostrar espaços em branco" -#: kallithea/controllers/changeset.py:89 kallithea/controllers/changeset.py:96 +#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:96 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignorar espaços em branco" @@ -102,7 +103,8 @@ msgstr "" #: kallithea/controllers/error.py:81 -msgid "The request could not be understood by the server due to malformed syntax." +msgid "" +"The request could not be understood by the server due to malformed syntax." msgstr "" "A requisição não pôde ser compreendida pelo servidor devido à sintaxe mal " "formada." @@ -124,8 +126,8 @@ "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -"O servidor encontrou uma condição inesperada que o impediu de satisfazer a " -"requisição." +"O servidor encontrou uma condição inesperada que o impediu de satisfazer " +"a requisição." #: kallithea/controllers/feed.py:59 #, python-format @@ -242,13 +244,13 @@ msgid "Changesets" msgstr "Conjuntos de mudanças" -#: kallithea/controllers/files.py:727 kallithea/controllers/pullrequests.py:174 -#: kallithea/model/scm.py:663 +#: kallithea/controllers/files.py:727 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "Ramos" -#: kallithea/controllers/files.py:728 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:674 +#: kallithea/controllers/files.py:728 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "Etiquetas" @@ -267,7 +269,8 @@ #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 #: kallithea/templates/base/base.html:437 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Repositórios" @@ -345,103 +348,104 @@ msgid "Changeset" msgstr "Conjunto de Mudanças" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "Especial" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "Ramos pares" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "Marcadores" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "Novo pull request criado com sucesso" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "Pull request excluído com sucesso" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:518 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - #: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:539 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - #: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:560 -msgid "Git pull requests don't support iterating yet." -msgstr "" - #: kallithea/controllers/pullrequests.py:562 -#, python-format -msgid "Error: some changesets not found when displaying pull request from %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:586 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 +#, python-format +msgid "" +"Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "" @@ -886,7 +890,8 @@ #: kallithea/controllers/admin/settings.py:142 #: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" -msgstr "Ocorreu um erro durante a atualização das configurações da aplicação" +msgstr "" +"Ocorreu um erro durante a atualização das configurações da aplicação" #: kallithea/controllers/admin/settings.py:177 #, python-format @@ -908,7 +913,8 @@ #: kallithea/controllers/admin/settings.py:289 msgid "Error occurred during updating visualisation settings" -msgstr "Ocorreu um erro durante a atualização das configurações de visualização" +msgstr "" +"Ocorreu um erro durante a atualização das configurações de visualização" #: kallithea/controllers/admin/settings.py:313 msgid "Please enter email address" @@ -1036,7 +1042,8 @@ msgstr "Precisa estar logado para ver essa página" #: kallithea/lib/base.py:483 -msgid "CSRF token leak has been detected - all form tokens have been expired" +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" msgstr "" #: kallithea/lib/base.py:580 @@ -1057,10 +1064,11 @@ msgstr "Ficheiro binário" #: kallithea/lib/diffs.py:214 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "" -"Conjunto de mudanças é grande demais e foi cortado, use o menu de diferenças " -"para ver as diferenças" +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" +"Conjunto de mudanças é grande demais e foi cortado, use o menu de " +"diferenças para ver as diferenças" #: kallithea/lib/diffs.py:223 msgid "No changes detected" @@ -1099,7 +1107,8 @@ msgid "%s more" msgstr "%s mais" -#: kallithea/lib/helpers.py:759 kallithea/templates/changelog/changelog.html:43 +#: kallithea/lib/helpers.py:759 +#: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "revisões" @@ -1232,8 +1241,8 @@ "repositories" msgstr "" "O repositório %s não está mapeado ao BD. Talvez ele tenha sido criado ou " -"renomeado a partir do sistema de ficheiros. Por favor, execute a aplicação " -"outra vez para varrer novamente por repositórios" +"renomeado a partir do sistema de ficheiros. Por favor, execute a " +"aplicação outra vez para varrer novamente por repositórios" #: kallithea/lib/ssh.py:75 msgid "SSH key is missing" @@ -1420,11 +1429,13 @@ msgstr "" #: kallithea/model/db.py:1568 -msgid "Repository creation enabled with write permission to a repository group" +msgid "" +"Repository creation enabled with write permission to a repository group" msgstr "" #: kallithea/model/db.py:1569 -msgid "Repository creation disabled with write permission to a repository group" +msgid "" +"Repository creation disabled with write permission to a repository group" msgstr "" #: kallithea/model/db.py:1571 @@ -1517,7 +1528,8 @@ #: kallithea/model/pull_request.py:72 #, python-format -msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" #: kallithea/model/pull_request.py:207 @@ -1589,7 +1601,8 @@ msgstr "Novo registo de utilizador" #: kallithea/model/user.py:244 -msgid "You can't remove this user since it is crucial for the entire application" +msgid "" +"You can't remove this user since it is crucial for the entire application" msgstr "" #: kallithea/model/user.py:249 @@ -1602,8 +1615,8 @@ #: kallithea/model/user.py:254 #, python-format msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" msgstr "" #: kallithea/model/user.py:261 @@ -1644,8 +1657,8 @@ #: kallithea/model/validators.py:77 msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with an alphanumeric character or underscore" +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" msgstr "" #: kallithea/model/validators.py:104 @@ -1671,8 +1684,9 @@ "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -"O nome de um grupo de utilizadores só pode conter characters alfa-numéricos, " -"underscores, pontos ou hífens, e deve começar om um caractere alfa-numérico" +"O nome de um grupo de utilizadores só pode conter characters alfa-" +"numéricos, underscores, pontos ou hífens, e deve começar om um caractere " +"alfa-numérico" #: kallithea/model/validators.py:175 msgid "Cannot assign this group as parent" @@ -1781,8 +1795,10 @@ #: kallithea/model/validators.py:714 #, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "O tamanho da rede (bits) deve estar no intervalo 0-32 (não %(bits)r)" +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" +"O tamanho da rede (bits) deve estar no intervalo 0-32 (não %(bits)r)" #: kallithea/model/validators.py:747 msgid "Key name can only consist of letters, underscore, dash or numbers" @@ -2559,7 +2575,8 @@ #: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format -msgid "This account is managed with %s and the password cannot be changed here" +msgid "" +"This account is managed with %s and the password cannot be changed here" msgstr "" #: kallithea/templates/admin/my_account/my_account_perms.html:3 @@ -2675,8 +2692,8 @@ "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -"Todas as permissões predefinidos em cada repositório serão modificadas para " -"a permissão escolhida, note que todas as permissões predefinidas " +"Todas as permissões predefinidos em cada repositório serão modificadas " +"para a permissão escolhida, note que todas as permissões predefinidas " "customizadas nos repositórios serão perdidas" #: kallithea/templates/admin/permissions/permissions_globals.html:20 @@ -2738,7 +2755,8 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:56 -msgid "Enable this to allow non-admins to create repositories at the top level." +msgid "" +"Enable this to allow non-admins to create repositories at the top level." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:57 @@ -2802,7 +2820,8 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 #: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "" @@ -2842,7 +2861,8 @@ #: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:152 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 msgid "Settings" msgstr "Configurações" @@ -2989,9 +3009,11 @@ #: kallithea/templates/admin/repos/repo_add_base.html:24 #: kallithea/templates/admin/repos/repo_edit_settings.html:57 #: kallithea/templates/forks/fork.html:37 -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 "" +"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." #: kallithea/templates/admin/repos/repo_add_base.html:31 #: kallithea/templates/admin/repos/repo_edit_settings.html:36 @@ -3361,8 +3383,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:12 msgid "" -"Check this option to remove all comments, pull requests and other records" -" related to repositories that no longer exist in the filesystem." +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 @@ -3390,8 +3412,8 @@ #: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " -"not seem to come from Kallithea. WARNING: This operation will destroy any" -" custom git hooks you may have deployed by hand!" +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:41 @@ -3480,11 +3502,11 @@ #: kallithea/templates/admin/settings/settings_vcs.html:52 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting" -" take effect." -msgstr "" -"Clique para destravar. Deve reiniciar o Kallithea para que esta configuração " -"tenha efeito." +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." +msgstr "" +"Clique para destravar. Deve reiniciar o Kallithea para que esta " +"configuração tenha efeito." #: kallithea/templates/admin/settings/settings_vcs.html:56 msgid "" @@ -3509,7 +3531,8 @@ msgstr "Mostrar versão do Kallithea" #: kallithea/templates/admin/settings/settings_visual.html:20 -msgid "Shows or hides a version number of Kallithea displayed in the footer." +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:25 @@ -3539,14 +3562,14 @@ #: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." -"\n" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" " The following " "variables are available:\n" " {scheme} 'http' or " "'https' sent from running Kallithea server,\n" -" {user} current user" -" username,\n" +" {user} current user " +"username,\n" " {netloc} network " "location/server host of running Kallithea server,\n" " {repo} full " @@ -3566,8 +3589,8 @@ #: kallithea/templates/admin/settings/settings_visual.html:59 msgid "" -"Schema for constructing SSH clone URL, eg. " -"'ssh://{system_user}@{hostname}/{repo}'." +"Schema for constructing SSH clone URL, eg. 'ssh://{system_user}" +"@{hostname}/{repo}'." msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:67 @@ -3627,7 +3650,8 @@ #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 #: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "" @@ -3784,11 +3808,13 @@ msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:86 kallithea/templates/base/base.html:417 +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:417 msgid "Mercurial repository" msgstr "Repositório Mercurial" -#: kallithea/templates/base/base.html:89 kallithea/templates/base/base.html:420 +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:420 msgid "Git repository" msgstr "Repositório Git" @@ -3852,7 +3878,8 @@ msgid "Unfollow" msgstr "Parar de seguir" -#: kallithea/templates/base/base.html:171 kallithea/templates/forks/fork.html:9 +#: kallithea/templates/base/base.html:171 +#: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Bifurcação" @@ -3955,8 +3982,8 @@ #: kallithea/templates/base/default_perms_box.html:25 msgid "Select this option to allow user group creation for this user" msgstr "" -"Selecione esta opção para permitir a criação de grupos de utilizadores para " -"este utilizador" +"Selecione esta opção para permitir a criação de grupos de utilizadores " +"para este utilizador" #: kallithea/templates/base/default_perms_box.html:31 msgid "Fork repositories" @@ -4845,8 +4872,8 @@ #: kallithea/templates/files/files_source.html:40 msgid "Editing files allowed only when on branch head revision" msgstr "" -"A edição de ficheiros só é permitida quando se está na revisão mais recente " -"do ramo" +"A edição de ficheiros só é permitida quando se está na revisão mais " +"recente do ramo" #: kallithea/templates/files/files_source.html:41 msgid "Deleting files allowed only when on branch head revision"
--- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: Marcin Kuźmiński <marcin@python-works.com>\n" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" @@ -16,7 +16,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1)\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Não há nenhum changeset ainda" @@ -248,12 +248,12 @@ msgstr "Conjuntos de mudanças" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "Ramos" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "Etiquetas" @@ -355,109 +355,109 @@ msgid "Changeset" msgstr "Conjunto de Mudanças" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "Especial" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "Ramos pares" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "Marcadores" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 #, fuzzy msgid "Error occurred while creating pull request" msgstr "Ocorreu um erro durante o envio do pull request" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "Novo pull request criado com sucesso" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 #, fuzzy #| msgid "Pull request update created" msgid "New pull request iteration created" msgstr "Revisores do pull request" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 #, fuzzy msgid "No description" msgstr "Descrição" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 #, fuzzy msgid "Pull request updated" msgstr "Pull requests para %s" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "Pull request excluído com sucesso" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:518 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - #: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:539 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - #: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:560 -msgid "Git pull requests don't support iterating yet." -msgstr "" - #: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr ""
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2020-02-13 13:50+0000\n" "Last-Translator: Private <adamantine.sword@gmail.com>\n" "Language-Team: Russian <https://hosted.weblate.org/projects/kallithea/" @@ -18,7 +18,7 @@ "X-Generator: Weblate 3.11-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Наборы изменений отсутствуют" @@ -247,12 +247,12 @@ msgstr "Набор изменений" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "Ветки" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "Метки" @@ -352,105 +352,105 @@ msgid "Changeset" msgstr "Изменения" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "Специальный" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "Ветви участника" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "Закладки" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "Ошибка при создании pull-запроса: %s" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "Произошла ошибка при создании pull-запроса" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "Pull-запрос успешно открыт" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 msgid "New pull request iteration created" msgstr "Создана новая итерация pull-запросов" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "В то же время, добавлены следующие ревьюверы: %s" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "В то же время, удалены следующие ревьюверы: %s" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "Нет описания" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "Pull-запрос обновлён" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "Pull-запрос успешно удалён" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "Ревизия %s не найдена в %s" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "Ошибка: не найдены изменения при отображении pull-запроса от %s." -#: kallithea/controllers/pullrequests.py:518 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "Этот pull-запрос уже принят на ветку %s." -#: kallithea/controllers/pullrequests.py:520 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "Этот pull-запрос был закрыт и не может быть обновлён." -#: kallithea/controllers/pullrequests.py:539 +#: kallithea/controllers/pullrequests.py:541 #, python-format msgid "The following additional changes are available on %s:" msgstr "Следующие дополнительные изменения доступны на %s:" -#: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "Нет дополнительных изменений для итерации в этом pull-запросе." -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Внимание: Ветка %s имеет ещё одну верхушку: %s." -#: kallithea/controllers/pullrequests.py:560 +#: kallithea/controllers/pullrequests.py:562 msgid "Git pull requests don't support iterating yet." msgstr "Pull-запросы git пока не поддерживают итерации." -#: kallithea/controllers/pullrequests.py:562 +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" "Ошибка: не найдены некоторые изменения при отображении pull-запроса от %s." -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "Невозможно отобразить различия — не найдены ревизии PR."
--- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2015-04-01 12:59+0200\n" "Last-Translator: Andrej Shadura <andrew@shadura.me>\n" "Language-Team: Slovak <https://hosted.weblate.org/projects/kallithea/" @@ -18,7 +18,7 @@ "Generated-By: Babel 1.3\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Zatiaľ nie sú žiadne zmeny" @@ -244,12 +244,12 @@ msgstr "Zmeny" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "Vetvy" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "Tagy" @@ -348,104 +348,104 @@ msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "Záložky" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:518 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - #: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:539 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - #: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:560 -msgid "Git pull requests don't support iterating yet." -msgstr "" - #: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr ""
--- a/kallithea/i18n/tr/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/tr/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.4.99\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2019-11-05 08:03+0000\n" "Last-Translator: Hüseyin Tunç <huseyin.tunc@bulutfon.com>\n" "Language-Team: Turkish <https://hosted.weblate.org/projects/kallithea/" @@ -21,7 +21,7 @@ "Generated-By: Babel 2.6.0\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "" @@ -242,12 +242,12 @@ msgstr "" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "" @@ -345,104 +345,104 @@ msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:518 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - #: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:539 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - #: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:560 -msgid "Git pull requests don't support iterating yet." -msgstr "" - #: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr ""
--- a/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3.2\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2019-11-13 10:04+0000\n" "Last-Translator: Oleksandr Shtalinberg <o.shtalinberg@gmail.com>\n" "Language-Team: Ukrainian <https://hosted.weblate.org/projects/kallithea/" @@ -18,7 +18,7 @@ "X-Generator: Weblate 3.10-dev\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "Наборів змін немає" @@ -241,12 +241,12 @@ msgstr "Набори змін" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "Гілки" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "Теги" @@ -346,99 +346,99 @@ msgid "Changeset" msgstr "Набір змін" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "Спеціальний" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "Закладки" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "Помилка створення pull request: %s" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "Сталася помилка при створенні pull request" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "Новий pull request успішно відкритий" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 msgid "New pull request iteration created" msgstr "Створено нову ітерацію запиту на pull request" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "Тим часом додано наступних рецензентів: %s" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "Тим часом було видалено наступних рецензентів: %s" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "Без опису" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "Pull request оновлено" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "Успішно вилучено pull request" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "Ревізія %s не знайдена в %s" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" "Помилка: changesets не знайдено під час відображення pull request з %s." -#: kallithea/controllers/pullrequests.py:518 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "Цей pull request уже об'єднано з %s." -#: kallithea/controllers/pullrequests.py:520 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "Цей pull request закрито, його не можна оновити." -#: kallithea/controllers/pullrequests.py:539 +#: kallithea/controllers/pullrequests.py:541 #, python-format msgid "The following additional changes are available on %s:" msgstr "Наступні додаткові зміни доступні на %s:" -#: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "Немає додаткових змін для ітератування на pull request." -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Примітка: гілка %s має іншу голову: %s." -#: kallithea/controllers/pullrequests.py:560 +#: kallithea/controllers/pullrequests.py:562 msgid "Git pull requests don't support iterating yet." msgstr "Git pull requests не підтримують ітерацію." -#: kallithea/controllers/pullrequests.py:562 +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." @@ -446,7 +446,7 @@ "Помилка: деякі changesets не знайдені під час відображення pull request " "з %s." -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr "Різниця не може бути показана - версії PR не вдалося знайти."
--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2019-08-14 19:00+0000\n" "Last-Translator: Elizabeth Sherrock <lizzyd710@gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" @@ -18,7 +18,7 @@ "Generated-By: Babel 1.3\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "还没有修订集" @@ -243,12 +243,12 @@ msgstr "修订集" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "分支" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "标签" @@ -346,111 +346,111 @@ msgid "Changeset" msgstr "修订集" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "特殊" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "同等分支" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "书签" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "创建拉取请求出错：%s" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "创建拉取请求时发生错误" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "成功提交拉取请求" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 #, fuzzy #| msgid "Pull request update created" msgid "New pull request iteration created" msgstr "拉取请求更新已创建" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "无描述" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "拉取请求已更新" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "成功删除拉取请求" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, fuzzy, python-format #| msgid "Changeset for %s %s not found in %s" msgid "Revision %s not found in %s" msgstr "未找到修订集" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, fuzzy, python-format #| msgid "No changesets found for updating this pull request." msgid "Error: changesets not found when displaying pull request from %s." msgstr "没有找到更新此拉取请求的修订集。" -#: kallithea/controllers/pullrequests.py:518 +#: kallithea/controllers/pullrequests.py:520 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:520 +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:539 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - #: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 #, fuzzy #| msgid "No changesets found for updating this pull request." msgid "No additional changesets found for iterating on this pull request." msgstr "没有找到更新此拉取请求的修订集。" -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:560 -msgid "Git pull requests don't support iterating yet." -msgstr "" - #: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, fuzzy, python-format #| msgid "No changesets found for updating this pull request." msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "没有找到更新此拉取请求的修订集。" -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr ""
--- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Mon Oct 05 00:03:26 2020 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2020-05-04 19:12+0200\n" +"POT-Creation-Date: 2020-10-05 00:01+0200\n" "PO-Revision-Date: 2017-03-10 18:26+0000\n" "Last-Translator: mao <mao@lins.fju.edu.tw>\n" "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/" @@ -18,7 +18,7 @@ "Generated-By: Babel 1.3\n" #: kallithea/controllers/changelog.py:67 -#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602 +#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602 msgid "There are no changesets yet" msgstr "" @@ -243,12 +243,12 @@ msgstr "變更" #: kallithea/controllers/files.py:727 -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663 +#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663 msgid "Branches" msgstr "分支" #: kallithea/controllers/files.py:728 -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674 +#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674 msgid "Tags" msgstr "標籤" @@ -346,104 +346,104 @@ msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:171 +#: kallithea/controllers/pullrequests.py:173 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:174 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669 +#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:315 +#: kallithea/controllers/pullrequests.py:317 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:342 -#: kallithea/controllers/pullrequests.py:365 +#: kallithea/controllers/pullrequests.py:344 +#: kallithea/controllers/pullrequests.py:367 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:349 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:370 +#: kallithea/controllers/pullrequests.py:372 msgid "New pull request iteration created" msgstr "" -#: kallithea/controllers/pullrequests.py:398 +#: kallithea/controllers/pullrequests.py:400 #, python-format msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:402 +#: kallithea/controllers/pullrequests.py:404 #, python-format msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:418 +#: kallithea/controllers/pullrequests.py:420 #: kallithea/model/pull_request.py:230 msgid "No description" msgstr "無描述" -#: kallithea/controllers/pullrequests.py:427 +#: kallithea/controllers/pullrequests.py:429 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:440 +#: kallithea/controllers/pullrequests.py:442 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:476 +#: kallithea/controllers/pullrequests.py:478 #, python-format msgid "Revision %s not found in %s" msgstr "" -#: kallithea/controllers/pullrequests.py:504 +#: kallithea/controllers/pullrequests.py:506 #, python-format msgid "Error: changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:518 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - #: kallithea/controllers/pullrequests.py:520 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:539 -#, python-format -msgid "The following additional changes are available on %s:" -msgstr "" - #: kallithea/controllers/pullrequests.py:541 -#: kallithea/controllers/pullrequests.py:545 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#: kallithea/controllers/pullrequests.py:547 msgid "No additional changesets found for iterating on this pull request." msgstr "" -#: kallithea/controllers/pullrequests.py:553 +#: kallithea/controllers/pullrequests.py:555 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:560 -msgid "Git pull requests don't support iterating yet." -msgstr "" - #: kallithea/controllers/pullrequests.py:562 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "" "Error: some changesets not found when displaying pull request from %s." msgstr "" -#: kallithea/controllers/pullrequests.py:586 +#: kallithea/controllers/pullrequests.py:588 msgid "The diff can't be shown - the PR revisions could not be found." msgstr ""
--- a/kallithea/lib/vcs/backends/git/repository.py Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/lib/vcs/backends/git/repository.py Mon Oct 05 00:03:26 2020 +0200 @@ -19,7 +19,6 @@ import urllib.request from collections import OrderedDict -import mercurial.url # import httpbasicauthhandler, httpdigestauthhandler import mercurial.util # import url as hg_url from dulwich.config import ConfigFile from dulwich.objects import Tag @@ -31,6 +30,7 @@ from kallithea.lib.vcs.exceptions import (BranchDoesNotExistError, ChangesetDoesNotExistError, EmptyRepositoryError, RepositoryError, TagAlreadyExistError, TagDoesNotExistError) from kallithea.lib.vcs.utils import ascii_str, date_fromtimestamp, makedate, safe_bytes, safe_str +from kallithea.lib.vcs.utils.helpers import get_urllib_request_handlers from kallithea.lib.vcs.utils.lazy import LazyProperty from kallithea.lib.vcs.utils.paths import abspath, get_user_home @@ -168,23 +168,14 @@ if '+' in url[:url.find('://')]: url = url[url.find('+') + 1:] - handlers = [] url_obj = mercurial.util.url(safe_bytes(url)) - test_uri, authinfo = url_obj.authinfo() + test_uri, handlers = get_urllib_request_handlers(url_obj) if not test_uri.endswith(b'info/refs'): test_uri = test_uri.rstrip(b'/') + b'/info/refs' url_obj.passwd = b'*****' cleaned_uri = str(url_obj) - if authinfo: - # create a password manager - passmgr = urllib.request.HTTPPasswordMgrWithDefaultRealm() - passmgr.add_password(*authinfo) - - handlers.extend((mercurial.url.httpbasicauthhandler(passmgr), - mercurial.url.httpdigestauthhandler(passmgr))) - o = urllib.request.build_opener(*handlers) o.addheaders = [('User-Agent', 'git/1.7.8.0')] # fake some git
--- a/kallithea/lib/vcs/backends/hg/repository.py Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/lib/vcs/backends/hg/repository.py Mon Oct 05 00:03:26 2020 +0200 @@ -33,13 +33,13 @@ import mercurial.sshpeer import mercurial.tags import mercurial.ui -import mercurial.url import mercurial.util from kallithea.lib.vcs.backends.base import BaseRepository, CollectionGenerator from kallithea.lib.vcs.exceptions import (BranchDoesNotExistError, ChangesetDoesNotExistError, EmptyRepositoryError, RepositoryError, TagAlreadyExistError, TagDoesNotExistError, VCSError) from kallithea.lib.vcs.utils import ascii_str, author_email, author_name, date_fromtimestamp, makedate, safe_bytes, safe_str +from kallithea.lib.vcs.utils.helpers import get_urllib_request_handlers from kallithea.lib.vcs.utils.lazy import LazyProperty from kallithea.lib.vcs.utils.paths import abspath @@ -308,27 +308,19 @@ if b'+' in url[:url.find(b'://')]: url_prefix, url = url.split(b'+', 1) - handlers = [] url_obj = mercurial.util.url(url) - test_uri, authinfo = url_obj.authinfo() + test_uri, handlers = get_urllib_request_handlers(url_obj) + url_obj.passwd = b'*****' cleaned_uri = str(url_obj) - if authinfo: - # create a password manager - passmgr = urllib.request.HTTPPasswordMgrWithDefaultRealm() - passmgr.add_password(*authinfo) - - handlers.extend((mercurial.url.httpbasicauthhandler(passmgr), - mercurial.url.httpdigestauthhandler(passmgr))) - o = urllib.request.build_opener(*handlers) o.addheaders = [('Content-Type', 'application/mercurial-0.1'), ('Accept', 'application/mercurial-0.1')] req = urllib.request.Request( "%s?%s" % ( - test_uri, + safe_str(test_uri), urllib.parse.urlencode({ 'cmd': 'between', 'pairs': "%s-%s" % ('0' * 40, '0' * 40),
--- a/kallithea/lib/vcs/utils/helpers.py Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/lib/vcs/utils/helpers.py Mon Oct 05 00:03:26 2020 +0200 @@ -6,8 +6,12 @@ import os import re import time +import urllib.request + +import mercurial.url from kallithea.lib.vcs.exceptions import RepositoryError, VCSError +from kallithea.lib.vcs.utils import safe_str from kallithea.lib.vcs.utils.paths import abspath @@ -217,3 +221,29 @@ for attr in attrs: data[attr] = getattr(obj, attr) return data + +def get_urllib_request_handlers(url_obj): + handlers = [] + test_uri, authinfo = url_obj.authinfo() + + if authinfo: + # authinfo is a tuple (realm, uris, user, password) where 'uris' itself + # is a tuple of URIs. + # If url_obj is obtained via mercurial.util.url, the obtained authinfo + # values will be bytes, e.g. + # (None, (b'http://127.0.0.1/repo', b'127.0.0.1'), b'user', b'pass') + # However, urllib expects strings, not bytes, so we must convert them. + + # create a password manager + passmgr = urllib.request.HTTPPasswordMgrWithDefaultRealm() + passmgr.add_password( + safe_str(authinfo[0]) if authinfo[0] else None, # realm + tuple(safe_str(x) for x in authinfo[1]), # uris + safe_str(authinfo[2]), # user + safe_str(authinfo[3]), # password + ) + + handlers.extend((mercurial.url.httpbasicauthhandler(passmgr), + mercurial.url.httpdigestauthhandler(passmgr))) + + return test_uri, handlers
--- a/kallithea/model/pull_request.py Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/model/pull_request.py Mon Oct 05 00:03:26 2020 +0200 @@ -139,7 +139,7 @@ if pull_request.org_repo.scm_instance.alias == 'git': # remove a ref under refs/pull/ so that commits can be garbage-collected try: - del pull_request.org_repo.scm_instance._repo["refs/pull/%d/head" % pull_request.pull_request_id] + del pull_request.org_repo.scm_instance._repo[b"refs/pull/%d/head" % pull_request.pull_request_id] except KeyError: pass
--- a/kallithea/templates/about.html Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/templates/about.html Mon Oct 05 00:03:26 2020 +0200 @@ -28,14 +28,16 @@ <li>Copyright © 2014–2020, Thomas De Schampheleire</li> <li>Copyright © 2015–2017, 2019–2020, Étienne Gilli</li> <li>Copyright © 2016–2017, 2020, Asterios Dimitriou</li> + <li>Copyright © 2017–2020, Allan Nordhøy</li> + <li>Copyright © 2017, 2020, Anton Schur</li> + <li>Copyright © 2018–2020, ssantos</li> <li>Copyright © 2019–2020, Private</li> + <li>Copyright © 2020, David Ignjić</li> <li>Copyright © 2020, Dennis Fink</li> <li>Copyright © 2020, J. Lavoie</li> <li>Copyright © 2020, robertus</li> <li>Copyright © 2020, Ross Thomas</li> <li>Copyright © 2012, 2014–2017, 2019, Andrej Shadura</li> - <li>Copyright © 2017–2019, Allan Nordhøy</li> - <li>Copyright © 2018–2019, ssantos</li> <li>Copyright © 2019, Adi Kriegisch</li> <li>Copyright © 2019, Danni Randeris</li> <li>Copyright © 2019, Edmund Wong</li> @@ -62,7 +64,6 @@ <li>Copyright © 2015–2017, Søren Løvborg</li> <li>Copyright © 2015, 2017, Sam Jaques</li> <li>Copyright © 2017, Alessandro Molina</li> - <li>Copyright © 2017, Anton Schur</li> <li>Copyright © 2017, Ching-Chen Mao</li> <li>Copyright © 2017, Eivind Tagseth</li> <li>Copyright © 2017, FUJIWARA Katsunori</li>
--- a/kallithea/tests/functional/test_admin_repos.py Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/tests/functional/test_admin_repos.py Mon Oct 05 00:03:26 2020 +0200 @@ -344,6 +344,19 @@ _session_csrf_secret_token=self.session_csrf_secret_token())) response.mustcontain('Invalid repository URL') + def test_create_remote_repo_wrong_clone_uri_http_auth(self): + self.log_user() + repo_name = self.NEW_REPO + description = 'description for newly created repo' + response = self.app.post(base.url('repos'), + fixture._get_repo_create_params(repo_private=False, + repo_name=repo_name, + repo_type=self.REPO_TYPE, + repo_description=description, + clone_uri='http://user:pass@127.0.0.1/repo', + _session_csrf_secret_token=self.session_csrf_secret_token())) + response.mustcontain('Invalid repository URL') + def test_delete(self): self.log_user() repo_name = 'vcs_test_new_to_delete_%s' % self.REPO_TYPE
--- a/kallithea/tests/functional/test_pullrequests.py Fri Oct 02 13:17:55 2020 +0200 +++ b/kallithea/tests/functional/test_pullrequests.py Mon Oct 05 00:03:26 2020 +0200 @@ -32,12 +32,25 @@ '_session_csrf_secret_token': self.session_csrf_secret_token(), }, status=302) + # will redirect to URL like http://localhost/vcs_test_hg/pull-request/1/_/stable + pull_request_id = int(response.location.split('/')[5]) + response = response.follow() assert response.status == '200 OK' response.mustcontain('Successfully opened new pull request') response.mustcontain('No additional changesets found for iterating on this pull request') response.mustcontain('href="/vcs_test_hg/changeset/4f7e2131323e0749a740c0a56ab68ae9269c562a"') + response = self.app.post(base.url('pullrequest_delete', + repo_name=base.HG_REPO, pull_request_id=pull_request_id), + { + '_session_csrf_secret_token': self.session_csrf_secret_token(), + }, + status=302) + response = response.follow() + assert response.status == '200 OK' + response.mustcontain('Successfully deleted pull request') + def test_available(self): self.log_user() response = self.app.post(base.url(controller='pullrequests', action='create',
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kallithea/tests/functional/test_pullrequests_git.py Mon Oct 05 00:03:26 2020 +0200 @@ -0,0 +1,176 @@ +import re + +import pytest + +from kallithea.controllers.pullrequests import PullrequestsController +from kallithea.model.meta import Session +from kallithea.tests import base +from kallithea.tests.fixture import Fixture + + +fixture = Fixture() + + +class TestPullrequestsController(base.TestController): + + def test_index(self): + self.log_user() + response = self.app.get(base.url(controller='pullrequests', action='index', + repo_name=base.GIT_REPO)) + + def test_create_trivial(self): + self.log_user() + response = self.app.post(base.url(controller='pullrequests', action='create', + repo_name=base.GIT_REPO), + {'org_repo': base.GIT_REPO, + 'org_ref': 'branch:master:5f2c6ee195929b0be80749243c18121c9864a3b3', + 'other_repo': base.GIT_REPO, + 'other_ref': 'tag:v0.2.2:137fea89f304a42321d40488091ee2ed419a3686', + 'pullrequest_title': 'title', + 'pullrequest_desc': 'description', + '_session_csrf_secret_token': self.session_csrf_secret_token(), + }, + status=302) + # will redirect to URL like http://localhost/vcs_test_git/pull-request/1/_/master + pull_request_id = int(response.location.split('/')[5]) + + response = response.follow() + assert response.status == '200 OK' + response.mustcontain('Successfully opened new pull request') + response.mustcontain('Git pull requests don't support iterating yet.') + + response = self.app.post(base.url('pullrequest_delete', + repo_name=base.GIT_REPO, pull_request_id=pull_request_id), + { + '_session_csrf_secret_token': self.session_csrf_secret_token(), + }, + status=302) + response = response.follow() + assert response.status == '200 OK' + response.mustcontain('Successfully deleted pull request') + + + def test_edit_with_invalid_reviewer(self): + invalid_user_id = 99999 + self.log_user() + # create a valid pull request + response = self.app.post(base.url(controller='pullrequests', action='create', + repo_name=base.GIT_REPO), + { + 'org_repo': base.GIT_REPO, + 'org_ref': 'branch:master:5f2c6ee195929b0be80749243c18121c9864a3b3', + 'other_repo': base.GIT_REPO, + 'other_ref': 'tag:v0.2.2:137fea89f304a42321d40488091ee2ed419a3686', + 'pullrequest_title': 'title', + 'pullrequest_desc': 'description', + '_session_csrf_secret_token': self.session_csrf_secret_token(), + }, + status=302) + # location is of the form: + # http://localhost/vcs_test_git/pull-request/54/_/title + m = re.search(r'/pull-request/(\d+)/', response.location) + assert m is not None + pull_request_id = m.group(1) + + # edit it + response = self.app.post(base.url(controller='pullrequests', action='post', + repo_name=base.GIT_REPO, pull_request_id=pull_request_id), + { + 'pullrequest_title': 'title', + 'pullrequest_desc': 'description', + 'owner': base.TEST_USER_ADMIN_LOGIN, + '_session_csrf_secret_token': self.session_csrf_secret_token(), + 'review_members': [str(invalid_user_id)], + }, + status=400) + response.mustcontain('Invalid reviewer "%s" specified' % invalid_user_id) + +@pytest.mark.usefixtures("test_context_fixture") # apply fixture for all test methods +class TestPullrequestsGetRepoRefs(base.TestController): + + def setup_method(self, method): + self.repo_name = 'main' + repo = fixture.create_repo(self.repo_name, repo_type='git') + self.repo_scm_instance = repo.scm_instance + Session().commit() + self.c = PullrequestsController() + + def teardown_method(self, method): + fixture.destroy_repo('main') + Session().commit() + Session.remove() + + def test_repo_refs_empty_repo(self): + # empty repo with no commits, no branches, no bookmarks, just one tag + refs, default = self.c._get_repo_refs(self.repo_scm_instance) + assert default == '' # doesn't make sense, but better than nothing + + def test_repo_refs_one_commit_no_hints(self): + cs0 = fixture.commit_change(self.repo_name, filename='file1', + content='line1\n', message='commit1', vcs_type='git', + parent=None, newfile=True) + + refs, default = self.c._get_repo_refs(self.repo_scm_instance) + assert default == 'branch:master:%s' % cs0.raw_id + assert ([('branch:master:%s' % cs0.raw_id, 'master')], 'Branches') in refs + + def test_repo_refs_one_commit_rev_hint(self): + cs0 = fixture.commit_change(self.repo_name, filename='file1', + content='line1\n', message='commit1', vcs_type='git', + parent=None, newfile=True) + + refs, default = self.c._get_repo_refs(self.repo_scm_instance, rev=cs0.raw_id) + expected = 'branch:master:%s' % cs0.raw_id + assert default == expected + assert ([(expected, 'master')], 'Branches') in refs + + def test_repo_refs_two_commits_no_hints(self): + cs0 = fixture.commit_change(self.repo_name, filename='file1', + content='line1\n', message='commit1', vcs_type='git', + parent=None, newfile=True) + cs1 = fixture.commit_change(self.repo_name, filename='file2', + content='line2\n', message='commit2', vcs_type='git', + parent=None, newfile=True) + + refs, default = self.c._get_repo_refs(self.repo_scm_instance) + expected = 'branch:master:%s' % cs1.raw_id + assert default == expected + assert ([(expected, 'master')], 'Branches') in refs + + def test_repo_refs_two_commits_rev_hints(self): + cs0 = fixture.commit_change(self.repo_name, filename='file1', + content='line1\n', message='commit1', vcs_type='git', + parent=None, newfile=True) + cs1 = fixture.commit_change(self.repo_name, filename='file2', + content='line2\n', message='commit2', vcs_type='git', + parent=None, newfile=True) + + refs, default = self.c._get_repo_refs(self.repo_scm_instance, rev=cs0.raw_id) + expected = 'rev:%s:%s' % (cs0.raw_id, cs0.raw_id) + assert default == expected + assert ([(expected, 'Changeset: %s' % cs0.raw_id[0:12])], 'Special') in refs + assert ([('branch:master:%s' % cs1.raw_id, 'master')], 'Branches') in refs + + refs, default = self.c._get_repo_refs(self.repo_scm_instance, rev=cs1.raw_id) + expected = 'branch:master:%s' % cs1.raw_id + assert default == expected + assert ([(expected, 'master')], 'Branches') in refs + + def test_repo_refs_two_commits_branch_hint(self): + cs0 = fixture.commit_change(self.repo_name, filename='file1', + content='line1\n', message='commit1', vcs_type='git', + parent=None, newfile=True) + cs1 = fixture.commit_change(self.repo_name, filename='file2', + content='line2\n', message='commit2', vcs_type='git', + parent=None, newfile=True) + + refs, default = self.c._get_repo_refs(self.repo_scm_instance, branch='master') + expected = 'branch:master:%s' % cs1.raw_id + assert default == expected + assert ([(expected, 'master')], 'Branches') in refs + + def test_repo_refs_one_branch_no_hints(self): + cs0 = fixture.commit_change(self.repo_name, filename='file1', + content='line1\n', message='commit1', vcs_type='git', + parent=None, newfile=True) + # TODO