Mercurial > kallithea
changeset 7662:7d63bc813e3b
Merge stable
author | Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> |
---|---|
date | Wed, 22 May 2019 12:50:45 +0200 |
parents | 2402624b8b62 (current diff) 5763182f79b5 (diff) |
children | 1b8dac14269f |
files | kallithea/__init__.py kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po |
diffstat | 48 files changed, 1502 insertions(+), 1256 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Apr 30 16:13:14 2019 +0200 +++ b/.hgtags Wed May 22 12:50:45 2019 +0200 @@ -71,3 +71,5 @@ a18445b85d407294da0b7f1d8be3bedef5ffdea6 0.3.7 8db761c407685e7b08b800c947890035b0d67025 0.4.0rc1 60f726162fd6c515bd819feb423be73cad01d7d3 0.4.0rc2 +19086c5de05f4984d7a90cd31624c45dd893f6bb 0.4.0 +da65398a62fff50f3d241796cbf17acdea2092ef 0.4.1
--- a/CONTRIBUTORS Tue Apr 30 16:13:14 2019 +0200 +++ b/CONTRIBUTORS Wed May 22 12:50:45 2019 +0200 @@ -5,9 +5,11 @@ Étienne Gilli <etienne.gilli@gmail.com> 2015-2017 2019 Mads Kiilerich <mads@kiilerich.com> 2016-2019 Allan Nordhøy <epost@anotheragency.no> 2017-2019 + ssantos <ssantos@web.de> 2018-2019 Danni Randeris <danniranderis@gmail.com> 2019 Edmund Wong <ewong@crazy-cat.org> 2019 Manuel Jacob <me@manueljacob.de> 2019 + Wolfgang Scherer <wolfgang.scherer@gmx.de> 2019 Dominik Ruf <dominikruf@gmail.com> 2012 2014-2018 Michal Čihař <michal@cihar.com> 2014-2015 2018 Branko Majic <branko@majic.rs> 2015 2018 @@ -15,7 +17,6 @@ Jesús Sánchez <jsanchezfdz95@gmail.com> 2018 Patrick Vane <patrick_vane@lowentry.com> 2018 Pheng Heong Tan <phtan90@gmail.com> 2018 - ssantos <ssantos@web.de> 2018 Максим Якимчук <xpinovo@gmail.com> 2018 Марс Ямбар <mjambarmeta@gmail.com> 2018 Mads Kiilerich <madski@unity3d.com> 2012-2017
--- a/development.ini Tue Apr 30 16:13:14 2019 +0200 +++ b/development.ini Wed May 22 12:50:45 2019 +0200 @@ -91,7 +91,7 @@ ## Internationalization (see setup documentation for details) ## By default, the language requested by the browser is used if available. -#i18n.enable = false +#i18n.enabled = false ## Fallback language, empty for English (valid values are the names of subdirectories in kallithea/i18n): i18n.lang = @@ -117,6 +117,15 @@ ## number of commits stats will parse on each iteration commit_parse_limit = 25 +## Path to Python executable to be used for git hooks. +## This value will be written inside the git hook scripts as the text +## after '#!' (shebang). When empty or not defined, the value of +## 'sys.executable' at the time of installation of the git hooks is +## used, which is correct in many cases but for example not when using uwsgi. +## If you change this setting, you should reinstall the Git hooks via +## Admin > Settings > Remap and Rescan. +# git_hook_interpreter = /srv/kallithea/venv/bin/python2 + ## path to git executable git_path = git
--- a/docs/overview.rst Tue Apr 30 16:13:14 2019 +0200 +++ b/docs/overview.rst Wed May 22 12:50:45 2019 +0200 @@ -37,6 +37,41 @@ We recommend using virtualenv for installing Kallithea. +Locale environment +------------------ + +In order to ensure a correct functioning of Kallithea with respect to non-ASCII +characters in user names, file paths, commit messages, etc., it is very +important that Kallithea is run with a correct `locale` configuration. + +On Unix, environment variables like ``LANG`` or ``LC_ALL`` can specify a language (like +``en_US``) and encoding (like ``UTF-8``) to use for code points outside the ASCII +range. The flexibility of supporting multiple encodings of Unicode has the flip +side of having to specify which encoding to use - especially for Mercurial. + +It depends on the OS distribution and system configuration which locales are +available. For example, some Docker containers based on Debian default to only +supporting the ``C`` language, while other Linux environments have ``en_US`` but not +``C``. The ``locale -a`` command will show which values are available on the +current system. Regardless of the actual language, you should normally choose a +locale that has the ``UTF-8`` encoding (note that spellings ``utf8``, ``utf-8``, +``UTF8``, ``UTF-8`` are all referring to the same thing) + +For technical reasons, the locale configuration **must** be provided in the +environment in which Kallithea runs - it cannot be specified in the ``.ini`` file. +How to practically do this depends on the web server that is used and the way it +is started. For example, gearbox is often started by a normal user, either +manually or via a script. In this case, the required locale environment +variables can be provided directly in that user's environment or in the script. +However, web servers like Apache are often started at boot via an init script or +service file. Modifying the environment for this case would thus require +root/administrator privileges. Moreover, that environment would dictate the +settings for all web services running under that web server, Kallithea being +just one of them. Specifically in the case of Apache with ``mod_wsgi``, the +locale can be set for a specific service in its ``WSGIDaemonProcess`` directive, +using the ``lang`` parameter. + + Installation methods --------------------
--- a/docs/setup.rst Tue Apr 30 16:13:14 2019 +0200 +++ b/docs/setup.rst Wed May 22 12:50:45 2019 +0200 @@ -499,71 +499,75 @@ WSGIRestrictEmbedded On -- Create a wsgi dispatch script, like the one below. Make sure you +- Create a WSGI dispatch script, like the one below. Make sure you check that the paths correctly point to where you installed Kallithea and its Python Virtual Environment. -- Enable the ``WSGIScriptAlias`` directive for the WSGI dispatch script, - as in the following example. Once again, check the paths are - correctly specified. + + .. code-block:: python -Here is a sample excerpt from an Apache Virtual Host configuration file: + import os + os.environ['PYTHON_EGG_CACHE'] = '/srv/kallithea/.egg-cache' -.. code-block:: apache + # sometimes it's needed to set the current dir + os.chdir('/srv/kallithea/') - WSGIDaemonProcess kallithea processes=5 threads=1 maximum-requests=100 \ - python-home=/srv/kallithea/venv - WSGIProcessGroup kallithea - WSGIScriptAlias / /srv/kallithea/dispatch.wsgi - WSGIPassAuthorization On + import site + site.addsitedir("/srv/kallithea/venv/lib/python2.7/site-packages") -Or if using a dispatcher WSGI script with proper virtualenv activation: + ini = '/srv/kallithea/my.ini' + from logging.config import fileConfig + fileConfig(ini) + from paste.deploy import loadapp + application = loadapp('config:' + ini) -.. code-block:: apache + Or using proper virtualenv activation: - WSGIDaemonProcess kallithea processes=5 threads=1 maximum-requests=100 - WSGIProcessGroup kallithea - WSGIScriptAlias / /srv/kallithea/dispatch.wsgi - WSGIPassAuthorization On + .. code-block:: python -Apache will by default run as a special Apache user, on Linux systems -usually ``www-data`` or ``apache``. If you need to have the repositories -directory owned by a different user, use the user and group options to -WSGIDaemonProcess to set the name of the user and group. + activate_this = '/srv/kallithea/venv/bin/activate_this.py' + execfile(activate_this, dict(__file__=activate_this)) -Example WSGI dispatch script: + import os + os.environ['HOME'] = '/srv/kallithea' -.. code-block:: python - - import os - os.environ['PYTHON_EGG_CACHE'] = '/srv/kallithea/.egg-cache' + ini = '/srv/kallithea/kallithea.ini' + from logging.config import fileConfig + fileConfig(ini) + from paste.deploy import loadapp + application = loadapp('config:' + ini) - # sometimes it's needed to set the current dir - os.chdir('/srv/kallithea/') - - import site - site.addsitedir("/srv/kallithea/venv/lib/python2.7/site-packages") +- Add the necessary ``WSGI*`` directives to the Apache Virtual Host configuration + file, like in the example below. Notice that the WSGI dispatch script created + above is referred to with the ``WSGIScriptAlias`` directive. + The default locale settings Apache provides for web services are often not + adequate, with `C` as the default language and `ASCII` as the encoding. + Instead, use the ``lang`` parameter of ``WSGIDaemonProcess`` to specify a + suitable locale. See also the :ref:`overview` section and the + `WSGIDaemonProcess documentation`_. - ini = '/srv/kallithea/my.ini' - from logging.config import fileConfig - fileConfig(ini) - from paste.deploy import loadapp - application = loadapp('config:' + ini) + Apache will by default run as a special Apache user, on Linux systems + usually ``www-data`` or ``apache``. If you need to have the repositories + directory owned by a different user, use the user and group options to + WSGIDaemonProcess to set the name of the user and group. -Or using proper virtualenv activation: + Once again, check that all paths are correctly specified. -.. code-block:: python + .. code-block:: apache - activate_this = '/srv/kallithea/venv/bin/activate_this.py' - execfile(activate_this, dict(__file__=activate_this)) - - import os - os.environ['HOME'] = '/srv/kallithea' + WSGIDaemonProcess kallithea processes=5 threads=1 maximum-requests=100 \ + python-home=/srv/kallithea/venv lang=C.UTF-8 + WSGIProcessGroup kallithea + WSGIScriptAlias / /srv/kallithea/dispatch.wsgi + WSGIPassAuthorization On - ini = '/srv/kallithea/kallithea.ini' - from logging.config import fileConfig - fileConfig(ini) - from paste.deploy import loadapp - application = loadapp('config:' + ini) + Or if using a dispatcher WSGI script with proper virtualenv activation: + + .. code-block:: apache + + WSGIDaemonProcess kallithea processes=5 threads=1 maximum-requests=100 lang=en_US.utf8 + WSGIProcessGroup kallithea + WSGIScriptAlias / /srv/kallithea/dispatch.wsgi + WSGIPassAuthorization On Other configuration files @@ -585,3 +589,4 @@ .. _Redis: http://redis.io/ .. _mercurial-server: http://www.lshift.net/mercurial-server.html .. _PublishingRepositories: https://www.mercurial-scm.org/wiki/PublishingRepositories +.. _WSGIDaemonProcess documentation: https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIDaemonProcess.html
--- a/kallithea/bin/kallithea_cli_config.py Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/bin/kallithea_cli_config.py Wed May 22 12:50:45 2019 +0200 @@ -16,6 +16,7 @@ import kallithea.bin.kallithea_cli_base as cli_base import os +import sys import uuid from collections import defaultdict @@ -59,7 +60,9 @@ should go. """ - mako_variable_values = {} + mako_variable_values = { + 'git_hook_interpreter': sys.executable, + } ini_settings = defaultdict(dict) section_name = None
--- a/kallithea/controllers/admin/repos.py Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/controllers/admin/repos.py Wed May 22 12:50:45 2019 +0200 @@ -201,10 +201,10 @@ fork = repo.fork if fork is not None: fork_name = fork.repo_name - h.flash(h.literal(_('Forked repository %s as %s') - % (fork_name, repo_url)), category='success') + h.flash(h.HTML(_('Forked repository %s as %s')) + % (fork_name, repo_url), category='success') else: - h.flash(h.literal(_('Created repository %s') % repo_url), + h.flash(h.HTML(_('Created repository %s')) % repo_url, category='success') return {'result': True} return {'result': False}
--- a/kallithea/controllers/admin/settings.py Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/controllers/admin/settings.py Wed May 22 12:50:45 2019 +0200 @@ -171,11 +171,14 @@ install_git_hooks=install_git_hooks, user=request.authuser.username, overwrite_git_hooks=overwrite_git_hooks) - h.flash(h.literal(_('Repositories successfully rescanned. Added: %s. Removed: %s.') % - (', '.join(h.link_to(safe_unicode(repo_name), h.url('summary_home', repo_name=repo_name)) - for repo_name in added) or '-', - ', '.join(h.escape(safe_unicode(repo_name)) for repo_name in removed) or '-')), - category='success') + added_msg = h.HTML(', ').join( + h.link_to(safe_unicode(repo_name), h.url('summary_home', repo_name=repo_name)) for repo_name in added + ) or '-' + removed_msg = h.HTML(', ').join( + safe_unicode(repo_name) for repo_name in removed + ) or '-' + h.flash(h.HTML(_('Repositories successfully rescanned. Added: %s. Removed: %s.')) % + (added_msg, removed_msg), category='success') if invalidate_cache: log.debug('invalidating all repositories cache')
--- a/kallithea/controllers/admin/user_groups.py Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/controllers/admin/user_groups.py Wed May 22 12:50:45 2019 +0200 @@ -140,7 +140,7 @@ action_logger(request.authuser, 'admin_created_users_group:%s' % gr, None, request.ip_addr) - h.flash(h.literal(_('Created user group %s') % h.link_to(h.escape(gr), url('edit_users_group', id=ug.users_group_id))), + h.flash(h.HTML(_('Created user group %s')) % h.link_to(gr, url('edit_users_group', id=ug.users_group_id)), category='success') Session().commit() except formencode.Invalid as errors:
--- a/kallithea/controllers/files.py Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/controllers/files.py Wed May 22 12:50:45 2019 +0200 @@ -90,8 +90,7 @@ repo_name=c.repo_name, revision=0, f_path='', anchor='edit') add_new = h.link_to(_('Click here to add new file'), url_, class_="alert-link") - h.flash(h.literal(_('There are no files yet. %s') % add_new), - category='warning') + h.flash(_('There are no files yet.') + ' ' + add_new, category='warning') raise HTTPNotFound() except (ChangesetDoesNotExistError, LookupError): msg = _('Such revision does not exist for this repository')
--- a/kallithea/front-end/style.less Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/front-end/style.less Wed May 22 12:50:45 2019 +0200 @@ -922,6 +922,7 @@ border-left: 1px solid #ccc; } .code-highlight pre, +.annotatediv pre, .linenodiv pre { padding: 5px 2px 0px 5px; margin: 0;
--- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"POT-Creation-Date: 2019-05-04 21:13+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/" @@ -37,7 +37,7 @@ msgid "None" msgstr "Нічога" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(зачынена)" @@ -67,8 +67,8 @@ msgid "Successfully deleted pull request %s" msgstr "Pull-запыт %s паспяхова выдалены" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "Няма такой рэвізіі ў гэтым рэпазітары" @@ -160,107 +160,108 @@ msgstr "Націсніце каб дадаць новы файл" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" +#, fuzzy +#| msgid "There are no files yet. %s" +msgid "There are no files yet." msgstr "Няма файлаў. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "%s (%s)" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Рэпазітар заблакаваў %s у %s" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 msgid "You can only delete files with revision being a valid branch" msgstr "Вы можаце выдаляць файлы толькі ў рэвізіі, злучанай з існай галінай" -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Файл %s выдалены з дапамогай Kallithea" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "Файл %s выдалены" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "Падчас каміта адбылася памылка" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 msgid "You can only edit files with revision being a valid branch" msgstr "" "Вы можаце рэдагаваць файлы толькі ў рэвізіі, злучанай з існай галінай" -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "Файл %s адрэдагаваны з дапамогай Kallithea" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "Без змен" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "Змены захаваныя ў %s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "Файл дададзены з дапамогай Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "Пуста" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "Безназоўны" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Размяшчэнне павінна быць адносным шляхам, і не можа ўтрымліваць \"..\" у " "шляхі" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "Магчымасць спампоўваць адключаная" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "Невядомая рэвізія %s" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "Пусты рэпазітар" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "Невядомы тып архіва" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Набор змен" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Галіны" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Тэгі" @@ -921,63 +922,63 @@ "адсутнічае" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "Памылка пры абнаўленні наладаў праграмы" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Рэпазітары паспяхова перасканаваныя, дададзена: %s, выдалена: %s." -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, python-format msgid "Invalidated %s repositories" msgstr "Скінуць кэш для %s рэпазітароў" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "Абноўленыя налады праграмы" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "Налады візуалізацыі абноўленыя" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "Адбылася памылка пры абнаўленні наладаў візуалізацыі" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "Калі ласка, увядзіце e-mail-адрас" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "Задача адпраўкі e-mail створаная" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "Няма дадзеных" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:360 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "Дададзены новы хук" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "Абноўленыя хукі" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "Памылка пры стварэнні хука" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "Запланаванае пераіндэксаванне базы Whoosh" @@ -2253,10 +2254,14 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2638,7 +2643,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "Імя" @@ -4088,6 +4093,12 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +#, fuzzy +#| msgid "Default permissions" +msgid "default permissions" +msgstr "Стандартныя прывілеі" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "Стварыць рэпазітары" @@ -4918,28 +4929,28 @@ msgid "Commit Changes" msgstr "Захаваць змены" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "Загружаецца спіс файлаў..." -#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/files/files_browser.html:55 #: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "Памер" -#: kallithea/templates/files/files_browser.html:53 +#: kallithea/templates/files/files_browser.html:56 msgid "Last Revision" msgstr "Апошняя версія" -#: kallithea/templates/files/files_browser.html:54 +#: kallithea/templates/files/files_browser.html:57 msgid "Last Modified" msgstr "Апошняя змена" -#: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/files/files_browser.html:58 msgid "Last Committer" msgstr "Аўтар апошняй рэвізіі" @@ -5917,9 +5928,6 @@ #~ msgid "Destroy old data" #~ msgstr "Знішчыць усе дадзеныя" -#~ msgid "Default permissions" -#~ msgstr "Стандартныя прывілеі" - #~ msgid "show" #~ msgstr "паказа́ць"
--- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"POT-Creation-Date: 2019-05-04 21:13+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/" @@ -36,7 +36,7 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(zavřeno)" @@ -65,8 +65,8 @@ msgid "Successfully deleted pull request %s" msgstr "Úspěšně aktualizované heslo" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "Taková revize neexistuje" @@ -158,104 +158,105 @@ msgstr "Klikněte pro přidání nového souboru" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" +#, fuzzy +#| msgid "There are no files yet. %s" +msgid "There are no files yet." msgstr "Zatím nejsou žádné soubory. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "Žádné změny" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "Přidaný soubor přes Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "Žádný obsah" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "Stahování vypnuto" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "Neznámá revize %s" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "Prázdný repozitář" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Změny" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Větve" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Tagy" @@ -902,62 +903,62 @@ msgstr "" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, fuzzy, python-format #| msgid "Watched Repositories" msgid "Invalidated %s repositories" msgstr "Repozitáře" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 msgid "Hook already exists" msgstr "" -#: kallithea/controllers/admin/settings.py:357 -msgid "Builtin hooks are read-only. Please use another hook name." -msgstr "" - #: kallithea/controllers/admin/settings.py:360 +msgid "Builtin hooks are read-only. Please use another hook name." +msgstr "" + +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "" @@ -2186,10 +2187,14 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2572,7 +2577,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "" @@ -4004,6 +4009,10 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +msgid "default permissions" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" @@ -4814,28 +4823,28 @@ msgid "Commit Changes" msgstr "Žádné změny" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:52 -#: kallithea/templates/summary/summary.html:145 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:53 -msgid "Last Revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:54 -msgid "Last Modified" -msgstr "" - #: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/summary/summary.html:145 +msgid "Size" +msgstr "" + +#: kallithea/templates/files/files_browser.html:56 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:57 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:58 msgid "Last Committer" msgstr ""
--- a/kallithea/i18n/da/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/da/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3.99\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"POT-Creation-Date: 2019-05-04 21:13+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/" @@ -36,7 +36,7 @@ msgid "None" msgstr "Ingen" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(lukket)" @@ -66,8 +66,8 @@ msgid "Successfully deleted pull request %s" msgstr "Pull-forespørgsel %s slettet successfuldt" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "En sådan revision findes ikke for dette repository" @@ -161,93 +161,94 @@ msgstr "Klik her for at tilføje en ny fil" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" +#, fuzzy +#| msgid "There are no files yet. %s" +msgid "There are no files yet." msgstr "Der er ingen filer endnu. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "%s fra %s" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Dette repository er låst af %s den %s" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 msgid "You can only delete files with revision being a valid branch" msgstr "Du kan kun slette filer, hvor revisionen er en gyldig branch" -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Slettet fil %s via Kallithea" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "Successfuldt slettet filen %s" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "Fejl opstået under commit" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 msgid "You can only edit files with revision being a valid branch" msgstr "Du kan kun redigere filer, hvor revisionen er en gyldig branch" -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "Redigeret fil %s via Kallithea" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "Ingen ændringer" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "Successfuldt committed til %s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "Tilføjet fil via Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "Intet indhold" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "Intet filnavn" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Placeringen skal være en relativ sti og må ikke indeholde .. i stien" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "Downloads er deaktiveret" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "Ukendt revision %s" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "Tomt repository" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "Ukendt arkivtype" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 @@ -255,13 +256,13 @@ msgid "Changesets" msgstr "Changesets" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 #, fuzzy msgid "Branches" msgstr "Branches" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Tags" @@ -924,63 +925,63 @@ "\" biblioteket mangler" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "Der opstod en fejl ved opdatering af applikationsindstillinger" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Repositories genscannet successfuldt. Tilføjet: %s. Fjernet: %s." -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, python-format msgid "Invalidated %s repositories" msgstr "Ugyldiggjort %s repositories" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "Opdateret applikationsindstillinger" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "Opdateret visualiseringsindstillinger" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "Der opstod en fejl under opdatering af visualiseringsindstillinger" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "Indtast email-adresse" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "Send email-opgave oprettet" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "Ingen data er klar endnu" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:360 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "Tilføjet nyt hook" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "Opdateret hooks" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "Der opstod en fejl under oprettelse af et hook" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "Whoosh reindex-opgave skeduleret" @@ -2212,10 +2213,14 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2595,7 +2600,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "" @@ -3999,6 +4004,12 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +#, fuzzy +#| msgid "Updated permissions" +msgid "default permissions" +msgstr "Tilladelser opdateret" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" @@ -4783,28 +4794,28 @@ msgid "Commit Changes" msgstr "" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:52 -#: kallithea/templates/summary/summary.html:145 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:53 -msgid "Last Revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:54 -msgid "Last Modified" -msgstr "" - #: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/summary/summary.html:145 +msgid "Size" +msgstr "" + +#: kallithea/templates/files/files_browser.html:56 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:57 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:58 msgid "Last Committer" msgstr ""
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" -"PO-Revision-Date: 2019-03-14 01:03+0000\n" -"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n" -"Language-Team: German <https://hosted.weblate.org/projects/kallithea/" -"kallithea/de/>\n" +"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"PO-Revision-Date: 2019-05-08 20:48+0000\n" +"Last-Translator: ssantos <ssantos@web.de>\n" +"Language-Team: German <https://hosted.weblate.org/projects/kallithea/stable/" +"de/>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.5.1\n" +"X-Generator: Weblate 3.7-dev\n" #: kallithea/controllers/changelog.py:67 #: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 @@ -36,7 +36,7 @@ msgid "None" msgstr "Keine" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(geschlossen)" @@ -66,8 +66,8 @@ msgid "Successfully deleted pull request %s" msgstr "Pull-Request %s erfolgreich gelöscht" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "Die angegebene Version existiert nicht in diesem Repository" @@ -168,108 +168,109 @@ msgstr "Hier klicken, um eine neue Datei hinzuzufügen" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" +#, fuzzy +#| msgid "There are no files yet. %s" +msgid "There are no files yet." msgstr "Es gibt hier noch keine Dateien. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "%s auf %s" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Dieses Repository ist von %s am %s gesperrt worden" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 #, fuzzy msgid "You can only delete files with revision being a valid branch" msgstr "" "Dateien können nur gelöscht werden, deren Revision ein gültiger Branch ist" -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Datei %s via Kallithea gelöscht" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "Datei %s erfolgreich gelöscht" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "Während des Commits trat ein Fehler auf" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 #, fuzzy msgid "You can only edit files with revision being a valid branch" msgstr "" "Dateien können nur editiert werden, deren Revision ein gültiger Branch ist" -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "Datei %s via Kallithea editiert" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "Keine Änderungen" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "Der Commit zu %s war erfolgreich" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "Datei via Kallithea hinzugefügt" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "Kein Inhalt" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "Kein Dateiname" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "Der Ort muss ein relativer Pfad sein und darf nicht .. enthalten" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "Downloads gesperrt" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "Unbekannte Revision %s" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "Leeres Repository" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "Unbekannter Archivtyp" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Änderungssätze" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Entwicklungszweige" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Tags" @@ -485,7 +486,7 @@ #: kallithea/controllers/search.py:140 msgid "The server has no search index." -msgstr "" +msgstr "Der Server hat keinen Suchindex." #: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." @@ -938,70 +939,72 @@ "\"hgsubversion\"-Bibliothek fehlt" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "" "Ein Fehler ist während der Aktualisierung der Applikationseinstellungen " "aufgetreten" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" "Die Repositories wurden erfolgreich überprüft. Hinzugefügt: %s. Entfernt: " "%s." -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, fuzzy, python-format #| msgid "Invalidate Repository Cache" msgid "Invalidated %s repositories" msgstr "Ungültiger Repositorycache" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "Anwendungseinstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "Visualisierungseinstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "" "Es ist ein Fehler während der Aktualisierung der Layouteinstellung " "aufgetreten" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "Bitte gebe eine E-Mailadresse an" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "Task zum Versenden von E-Mails erstellt" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "Es stehen noch keine Daten zur Verfügung" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:360 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" - -#: kallithea/controllers/admin/settings.py:360 +"Die eingebauten Hooks sind schreibgeschützt. Bitte verwenden Sie einen " +"anderen Hook-Namen." + +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "Neuer Hook hinzugefügt" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "Die Hooks wurden aktutalisiert" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "Während der Erzeugung des Hooks ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "Whoosh Reindizierungs Aufgabe wurde zur Ausführung geplant" @@ -1590,10 +1593,12 @@ "Cannot create pull request - criss cross merge detected, please merge a " "later %s revision to %s" msgstr "" +"Pull-Request kann nicht erstellt werden - Criss Cross Merge erkannt, bitte " +"eine spätere %s-Revision in %s zusammenführen." #: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 msgid "You are not authorized to create the pull request" -msgstr "" +msgstr "Sie sind nicht berechtigt, den Pull-Request anzulegen." #: kallithea/model/pull_request.py:341 #, fuzzy @@ -1631,7 +1636,7 @@ #: kallithea/model/pull_request.py:390 #, python-format msgid "Closed, next iteration: %s ." -msgstr "" +msgstr "Geschlossen, nächste Iteration: %s ." #: kallithea/model/scm.py:698 msgid "latest tip" @@ -2003,7 +2008,7 @@ #: kallithea/templates/login.html:44 msgid "Stay logged in after browser restart" -msgstr "" +msgstr "Nach dem Neustart des Browsers eingeloggt bleiben" #: kallithea/templates/login.html:52 msgid "Forgot your password ?" @@ -2306,12 +2311,16 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" "Gist wurde während der Änderung aktualisiert. Änderungen kopieren und " "%(here)s klicken um die neue Version nachzuladen." +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "hier" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2507,7 +2516,7 @@ #: kallithea/templates/files/files_edit.html:52 #: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" -msgstr "" +msgstr "Als Raw anzeigen" #: kallithea/templates/admin/gists/show.html:69 msgid "created" @@ -2515,7 +2524,7 @@ #: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" -msgstr "" +msgstr "Als Raw anzeigen" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 @@ -2708,7 +2717,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "Name" @@ -3435,12 +3444,12 @@ #: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" +msgstr "Standardrevision für Dateiseite, Downloads, Whoosh und Readme" #: kallithea/templates/admin/repos/repo_edit_settings.html:44 #: kallithea/templates/pullrequests/pullrequest_show.html:131 msgid "Type name of user" -msgstr "" +msgstr "Typname des Benutzers" #: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." @@ -3448,11 +3457,11 @@ #: kallithea/templates/admin/repos/repo_edit_statistics.html:5 msgid "Processed commits" -msgstr "" +msgstr "Verarbeitete Commits" #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 msgid "Processed progress" -msgstr "" +msgstr "Verarbeiteter Fortschritt" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 msgid "Reset Statistics" @@ -3460,7 +3469,7 @@ #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 msgid "Confirm to remove current statistics." -msgstr "" +msgstr "Bestätigen Sie, um die aktuellen Statistiken zu entfernen." #: kallithea/templates/admin/repos/repos.html:5 msgid "Repositories Administration" @@ -3468,7 +3477,7 @@ #: kallithea/templates/admin/repos/repos.html:43 msgid "State" -msgstr "" +msgstr "Zustand" #: kallithea/templates/admin/settings/settings.html:5 msgid "Settings Administration" @@ -3480,11 +3489,11 @@ #: kallithea/templates/admin/settings/settings.html:28 msgid "Remap and Rescan" -msgstr "" +msgstr "Neu zuordnen und neu scannen" #: kallithea/templates/admin/settings/settings.html:30 msgid "Visual" -msgstr "" +msgstr "Visuell" #: kallithea/templates/admin/settings/settings.html:32 #: kallithea/templates/admin/settings/settings_vcs.html:4 @@ -3501,7 +3510,7 @@ #: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" -msgstr "" +msgstr "Test-E-Mail senden an" #: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" @@ -3509,7 +3518,7 @@ #: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" -msgstr "" +msgstr "Website-Branding" #: kallithea/templates/admin/settings/settings_global.html:7 msgid "Set a custom title for your Kallithea Service." @@ -4192,6 +4201,12 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +#, fuzzy +#| msgid "Default permissions" +msgid "default permissions" +msgstr "Standart Rechte" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" @@ -5019,28 +5034,28 @@ msgid "Commit Changes" msgstr "Änderungen einchecken" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/files/files_browser.html:55 #: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "Größe" -#: kallithea/templates/files/files_browser.html:53 +#: kallithea/templates/files/files_browser.html:56 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:54 +#: kallithea/templates/files/files_browser.html:57 msgid "Last Modified" msgstr "Zuletzt geändert" -#: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/files/files_browser.html:58 msgid "Last Committer" msgstr "" @@ -5948,9 +5963,6 @@ #~ msgid "SMTP port" #~ msgstr "SMTP-Port" -#~ msgid "Default permissions" -#~ msgstr "Standart Rechte" - #~ msgid "user groups" #~ msgstr "Benutzergruppen"
--- a/kallithea/i18n/el/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/el/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"POT-Creation-Date: 2019-05-04 21:13+0200\n" "PO-Revision-Date: 2017-06-14 18:51+0000\n" "Last-Translator: Asterios Dimitriou <steve@pci.gr>\n" "Language-Team: Greek <https://hosted.weblate.org/projects/kallithea/" @@ -36,7 +36,7 @@ msgid "None" msgstr "Χωρίς" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(κλειστό)" @@ -66,8 +66,8 @@ msgid "Successfully deleted pull request %s" msgstr "Επιτυχής διαγραφή αιτήματος έλξης %s" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "Δεν υπάρχει τέτοια αναθεώρηση για αυτό το αποθετήριο" @@ -168,111 +168,112 @@ msgstr "Κλικ εδώ για προθήκη νέου αρχείου" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" +#, fuzzy +#| msgid "There are no files yet. %s" +msgid "There are no files yet." msgstr "Δεν υπάρχουν αρχεία ακόμα. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "%s την %s" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Το αποθετήριο κλειδώθηκε από %s την %s" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 #, fuzzy msgid "You can only delete files with revision being a valid branch" msgstr "" "Μπορείτε να διαγράψετε μόνο αρχεία σε αναθεώρηση που βρίσκονται σε έγκυρη " "διακλάδωση " -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Διαγραφή αρχείου %s μέσω του Kallithea" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "Επιτυχής διαγραφή αρχείου %s" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "Συνέβη λάθος κατά το commit" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 msgid "You can only edit files with revision being a valid branch" msgstr "" "Μπορείτε να επεξεργαστείτε μόνο αρχεία σε αναθεώρηση που βρίσκονται σε " "έγκυρη διακλάδωση" -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "Επεξεργασία αρχείου %s μέσω του Kallithea" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "Καμία αλλαγή" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "Επιτυχής παράδοση σε %s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "Προσθήκη αρχείου μέσω Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "Χωρίς περιεχόμενο" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "Χωρίς όνομα αρχείου" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Η τοποθεσία πρέπει να είναι σχετική διαδρομή και να μην περιέχει .. μέσα " "της" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "Οι μεταφορτώσεις απενεργοποιήθηκαν" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "Άγνωστη αναθεώρηση %s" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "Άδειο αποθετήριο" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "Άγνωστος τύπος αρχειοθέτησης" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Σετ αλλαγών" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Κλάδοι" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Ετικέτες" @@ -932,64 +933,64 @@ msgstr "" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, fuzzy, python-format #| msgid "Deleted repository %s" msgid "Invalidated %s repositories" msgstr "Διαγράφηκε το αποθετήριο %s" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "Δεν υπάρχουν ακόμα έτοιμα δεδομένα" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:360 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "" @@ -2220,10 +2221,14 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2603,7 +2608,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "" @@ -4016,6 +4021,10 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +msgid "default permissions" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" @@ -4817,28 +4826,28 @@ msgid "Commit Changes" msgstr "" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:52 -#: kallithea/templates/summary/summary.html:145 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:53 -msgid "Last Revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:54 -msgid "Last Modified" -msgstr "" - #: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/summary/summary.html:145 +msgid "Size" +msgstr "" + +#: kallithea/templates/files/files_browser.html:56 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:57 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:58 msgid "Last Committer" msgstr ""
--- a/kallithea/i18n/es/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/es/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"POT-Creation-Date: 2019-05-04 21:13+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/" @@ -36,7 +36,7 @@ msgid "None" msgstr "Ninguno" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(cerrado)" @@ -66,8 +66,8 @@ msgid "Successfully deleted pull request %s" msgstr "Petición de pull %s eliminada correctamente" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "La revisión no existe en este repositorio" @@ -161,107 +161,108 @@ msgstr "Haga clic aquí para añadir un archivo nuevo" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" +#, fuzzy +#| msgid "There are no files yet. %s" +msgid "There are no files yet." msgstr "Aún no hay archivos. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "%s en %s" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Este repositorio ha sido bloqueado por %s en %s" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 msgid "You can only delete files with revision being a valid branch" msgstr "" "Sólo puede borrar archivos si la revisión pertenece a una rama válida" -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Archivo %s eliminado mediante Kallithea" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "El archivo %s se eliminó correctamente" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "Ocurrió un error al anotar los cambios" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 msgid "You can only edit files with revision being a valid branch" msgstr "" "Sólo puede editar archivos si la revisión pertenece a una rama válida" -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "Archivo %s editado mediante Kallithea" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "No hay cambios" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "Anotado correctamente a %s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "Archivo añadido mediante Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "Sin contenido" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "Sin nombre de archivo" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 #, fuzzy msgid "Location must be relative path and must not contain .. in path" msgstr "La ruta debe ser relativa y no debe contener .. en la ruta" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "Descargas deshabilitadas" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "Revisión desconocida %s" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "Repositorio vacío" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "Tipo de archivo desconocido" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Cambios" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Ramas" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Etiquetas" @@ -918,63 +919,63 @@ msgstr "" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, python-format msgid "Invalidated %s repositories" msgstr "" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "Todavía no hay datos disponibles" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:360 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "" @@ -2202,10 +2203,14 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2585,7 +2590,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "" @@ -3995,6 +4000,10 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +msgid "default permissions" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" @@ -4792,28 +4801,28 @@ msgid "Commit Changes" msgstr "" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:52 -#: kallithea/templates/summary/summary.html:145 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:53 -msgid "Last Revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:54 -msgid "Last Modified" -msgstr "" - #: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/summary/summary.html:145 +msgid "Size" +msgstr "" + +#: kallithea/templates/files/files_browser.html:56 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:57 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:58 msgid "Last Committer" msgstr ""
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" -"PO-Revision-Date: 2019-03-26 21:15+0000\n" -"Last-Translator: Thomas De Schampheleire <patrickdepinguin@gmail.com>\n" -"Language-Team: French <https://hosted.weblate.org/projects/kallithea/" -"kallithea/fr/>\n" +"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"PO-Revision-Date: 2019-05-06 08:48+0000\n" +"Last-Translator: Étienne Gilli <etienne.gilli@gmail.com>\n" +"Language-Team: French <https://hosted.weblate.org/projects/kallithea/stable/" +"fr/>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 3.6-dev\n" +"X-Generator: Weblate 3.7-dev\n" #: kallithea/controllers/changelog.py:67 #: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 @@ -36,7 +36,7 @@ msgid "None" msgstr "Aucun" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(fermé)" @@ -64,8 +64,8 @@ msgid "Successfully deleted pull request %s" msgstr "La requête de pull %s a été supprimée avec succès" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "Une telle révision n'existe pas pour ce dépôt" @@ -159,110 +159,109 @@ msgstr "Ajouter un nouveau fichier" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" -msgstr "Il n'y a actuellement pas de fichiers. %s" - -#: kallithea/controllers/files.py:194 +msgid "There are no files yet." +msgstr "Il n'y a pas encore de fichier." + +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "%s à %s" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Ce dépôt a été verrouillé par %s sur %s" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 msgid "You can only delete files with revision being a valid branch" msgstr "" "Vous ne pouvez supprimer les fichiers que si la révision est une branche " "valide" -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Le fichier %s a été supprimé via Kallithea" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "Suppression du fichier %s effectuée avec succès" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "Une erreur est survenue durant le commit" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 msgid "You can only edit files with revision being a valid branch" msgstr "" "Vous ne pouvez modifier les fichiers que si la révision est une branche " "valide" -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "%s édité via Kallithea" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "Aucun changement" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "Commit réalisé avec succès sur %s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "%s ajouté par Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "Aucun contenu" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "Aucun nom de fichier" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Le chemin doit être un chemin relatif et ne doit pas contenir .. dans le " "chemin" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "Les téléchargements sont désactivés" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "Révision %s inconnue" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "Dépôt vide" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "Type d’archive inconnu" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Changesets" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Branches" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Tags" @@ -931,67 +930,67 @@ "« hgsubversion » est manquante" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "" "Une erreur est survenue durant la mise à jour des réglages de " "l'application" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Dépôts ré-analysés avec succès. Ajouté : %s. Supprimé : %s." -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, python-format msgid "Invalidated %s repositories" msgstr "%s dépôts invalidés" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "Réglages mis à jour" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "Réglages d’affichage mis à jour" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "" "Une erreur est survenue durant la mise à jour des réglages de " "visualisation" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "Veuillez entrer votre adresse e-mail" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "Tâche d'envoi d'e-mail créée" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 msgid "Hook already exists" msgstr "Le hook existe déjà" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:360 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" "Les hooks intégrés sont en lecture seule. Merci de choisir un autre nom " "pour le hook." -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "Le nouveau hook a été ajouté" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "Hooks mis à jour" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "Une erreur est survenue durant la création du hook" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "La tâche de réindexation Whoosh a été planifiée" @@ -2298,12 +2297,16 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" "Le gist a été mis à jour depuis que vous avez commencé à éditer. Copier " "vos changements et cliquez %(here)s pour charger la nouvelle version." +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "ici" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2694,7 +2697,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "Nom" @@ -4232,6 +4235,10 @@ "Sélectionner pour hériter des réglages généraux, de la liste blanche d'IP " "et des permissions depuis les %s." +#: kallithea/templates/base/default_perms_box.html:16 +msgid "default permissions" +msgstr "permissions par défaut" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "Création de dépôts" @@ -5032,28 +5039,28 @@ msgid "Commit Changes" msgstr "Commiter les changements" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "Rechercher dans la liste des fichiers" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "Chargement de la liste des fichiers…" -#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/files/files_browser.html:55 #: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "Taille" -#: kallithea/templates/files/files_browser.html:53 +#: kallithea/templates/files/files_browser.html:56 msgid "Last Revision" msgstr "Dernière révision" -#: kallithea/templates/files/files_browser.html:54 +#: kallithea/templates/files/files_browser.html:57 msgid "Last Modified" msgstr "Dernière modification" -#: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/files/files_browser.html:58 msgid "Last Committer" msgstr "Dernier commiteur" @@ -6251,9 +6258,6 @@ #~ msgid "Destroy old data" #~ msgstr "Détruire les anciennes données" -#~ msgid "Default permissions" -#~ msgstr "Permissions par défaut" - #~ msgid "Mimetype" #~ msgstr "Type MIME"
--- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"POT-Creation-Date: 2019-05-04 21:13+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/" @@ -36,7 +36,7 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "" @@ -64,8 +64,8 @@ msgid "Successfully deleted pull request %s" msgstr "" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "" @@ -155,104 +155,103 @@ msgstr "" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" -msgstr "" - -#: kallithea/controllers/files.py:194 +msgid "There are no files yet." +msgstr "" + +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "" @@ -900,62 +899,62 @@ msgstr "" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, fuzzy, python-format #| msgid "Private Repository" msgid "Invalidated %s repositories" msgstr "Tároló törlése" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 msgid "Hook already exists" msgstr "" -#: kallithea/controllers/admin/settings.py:357 -msgid "Builtin hooks are read-only. Please use another hook name." -msgstr "" - #: kallithea/controllers/admin/settings.py:360 +msgid "Builtin hooks are read-only. Please use another hook name." +msgstr "" + +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "" @@ -2172,10 +2171,14 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2555,7 +2558,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "" @@ -3967,6 +3970,10 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +msgid "default permissions" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" @@ -4757,28 +4764,28 @@ msgid "Commit Changes" msgstr "" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:52 -#: kallithea/templates/summary/summary.html:145 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:53 -msgid "Last Revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:54 -msgid "Last Modified" -msgstr "" - #: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/summary/summary.html:145 +msgid "Size" +msgstr "" + +#: kallithea/templates/files/files_browser.html:56 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:57 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:58 msgid "Last Committer" msgstr ""
--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"POT-Creation-Date: 2019-05-04 21:13+0200\n" "PO-Revision-Date: 2016-01-07 01:53+0000\n" "Last-Translator: Takumi IINO <trot.thunder@gmail.com>\n" "Language-Team: Japanese <https://hosted.weblate.org/projects/kallithea/" @@ -41,7 +41,7 @@ msgid "None" msgstr "なし" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(閉鎖済み)" @@ -71,8 +71,8 @@ msgid "Successfully deleted pull request %s" msgstr "プルリクエストの削除に成功しました" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "お探しのリビジョンはこのリポジトリにはありません" @@ -168,106 +168,107 @@ msgstr "新しいファイルを追加" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" +#, fuzzy +#| msgid "There are no files yet. %s" +msgid "There are no files yet." msgstr "まだファイルがありません。 %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, fuzzy, python-format msgid "%s at %s" msgstr "%s と %s の間" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "このリポジトリは %s によって %s にロックされました" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 #, fuzzy msgid "You can only delete files with revision being a valid branch" msgstr "有効なブランチ上のリビジョンからしかファイルを削除できません" -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Kallithea経由で %s を削除" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "%s ファイルの削除に成功しました" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "コミット中にエラーが発生しました" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 #, fuzzy msgid "You can only edit files with revision being a valid branch" msgstr "有効なブランチを示すリビジョンでのみファイルを編集できます " -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "Kallithea経由で %s を変更" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "変更点なし" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "%s へのコミットが成功しました" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "Kallithea経由でファイルを追加" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "内容がありません" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "ファイル名がありません" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "場所には相対パスかつ .. を含まないパスを入力してください" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "ダウンロードは無効化されています" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "%s は未知のリビジョンです" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "空のリポジトリ" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "未知のアーカイブ種別です" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "チェンジセット" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "ブランチ" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "タグ" @@ -926,64 +927,64 @@ "出来ません" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "アプリケーション設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s。" -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, fuzzy, python-format #| msgid "Invalidate cache for all repositories" msgid "Invalidated %s repositories" msgstr "すべてのリポジトリのキャッシュを無効化する" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "アプリケーション設定を更新しました" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "表示設定を更新しました" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "表示設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "メールアドレスを入力してください" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "メール送信タスクを作成しました" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "まだデータの準備ができていません" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:360 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "新しいフックを追加しました" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "フックを更新しました" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "フックの作成中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "Whooshの再インデックスタスクを予定に入れました" @@ -2244,12 +2245,16 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" "編集開始後にGistが更新されています。あなたの変更箇所をコピーしておき、 " "%(here)s をクリックして新しいバージョンを読み込みなおしてください。" +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2632,7 +2637,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "名前" @@ -4158,6 +4163,12 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +#, fuzzy +#| msgid "Default permissions" +msgid "default permissions" +msgstr "デフォルトの権限" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "リポジトリを作成する" @@ -4986,28 +4997,28 @@ msgid "Commit Changes" msgstr "変更をコミット" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "ファイル一覧を検索" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "ファイル一覧を読み込み中..." -#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/files/files_browser.html:55 #: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "サイズ" -#: kallithea/templates/files/files_browser.html:53 +#: kallithea/templates/files/files_browser.html:56 msgid "Last Revision" msgstr "最後のリビジョン" -#: kallithea/templates/files/files_browser.html:54 +#: kallithea/templates/files/files_browser.html:57 msgid "Last Modified" msgstr "最終更新日" -#: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/files/files_browser.html:58 msgid "Last Committer" msgstr "最後の作成者" @@ -6118,9 +6129,6 @@ #~ msgid "Destroy old data" #~ msgstr "古いデータを削除する" -#~ msgid "Default permissions" -#~ msgstr "デフォルトの権限" - #~ msgid "user groups" #~ msgstr "ユーザーグループ"
--- a/kallithea/i18n/kallithea.pot Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/kallithea.pot Wed May 22 12:50:45 2019 +0200 @@ -6,16 +6,16 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Kallithea 0.4.0rc1\n" +"Project-Id-Version: Kallithea 0.4.0\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"POT-Creation-Date: 2019-05-04 21:13+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.5.3\n" +"Generated-By: Babel 2.6.0\n" #: kallithea/controllers/changelog.py:67 #: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 @@ -34,7 +34,7 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "" @@ -61,8 +61,8 @@ msgid "Successfully deleted pull request %s" msgstr "" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "" @@ -149,104 +149,103 @@ msgstr "" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" -msgstr "" - -#: kallithea/controllers/files.py:194 +msgid "There are no files yet." +msgstr "" + +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:184 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:184 #: kallithea/model/scm.py:706 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:758 kallithea/controllers/pullrequests.py:185 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:185 #: kallithea/model/scm.py:717 msgid "Tags" msgstr "" @@ -888,61 +887,61 @@ msgstr "" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, python-format msgid "Invalidated %s repositories" msgstr "" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 msgid "Hook already exists" msgstr "" -#: kallithea/controllers/admin/settings.py:357 -msgid "Builtin hooks are read-only. Please use another hook name." -msgstr "" - #: kallithea/controllers/admin/settings.py:360 +msgid "Builtin hooks are read-only. Please use another hook name." +msgstr "" + +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "" @@ -2113,7 +2112,11 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format -msgid "Gist was update since you started editing. Copy your changes and click %(here)s to reload new version." +msgid "Gist was updated since you started editing. Copy your changes and click %(here)s to reload new version." +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" msgstr "" #: kallithea/templates/admin/gists/edit.html:51 @@ -2494,7 +2497,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "" @@ -3800,6 +3803,10 @@ msgid "Select to inherit global settings, IP whitelist and permissions from the %s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +msgid "default permissions" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" @@ -4571,28 +4578,28 @@ msgid "Commit Changes" msgstr "" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:52 -#: kallithea/templates/summary/summary.html:145 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:53 -msgid "Last Revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:54 -msgid "Last Modified" -msgstr "" - #: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/summary/summary.html:145 +msgid "Size" +msgstr "" + +#: kallithea/templates/files/files_browser.html:56 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:57 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:58 msgid "Last Committer" msgstr ""
--- a/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -7,11 +7,11 @@ msgstr "" "Project-Id-Version: Kallithea 0.3.99\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" -"PO-Revision-Date: 2019-04-30 17:47+0000\n" +"POT-Creation-Date: 2019-05-04 21:13+0200\n" +"PO-Revision-Date: 2019-04-30 22:25+0000\n" "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n" "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/" -"kallithea/kallithea/nb_NO/>\n" +"kallithea/stable/nb_NO/>\n" "Language: nb_NO\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,7 +36,7 @@ msgid "None" msgstr "Ingen" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(lukket)" @@ -66,8 +66,8 @@ msgid "Successfully deleted pull request %s" msgstr "Slettet flettingsforespørsel %s" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "En slik revisjon funnes ikke for denne pakkebrønnen" @@ -162,108 +162,109 @@ msgstr "Klikk her for å legge til ny fil" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" +#, fuzzy +#| msgid "There are no files yet. %s" +msgid "There are no files yet." msgstr "Ingen filer enda. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, fuzzy, python-format msgid "%s at %s" msgstr "%s den %s" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Denne pakkebrønnen har blitt påst av %s den %s" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 #, fuzzy msgid "You can only delete files with revision being a valid branch" msgstr "" "Du kan bare slette filer med en revisjon som er en gyldig forgrening" -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Slettet filen %s via Kallithea" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "Filen %s ble slettet" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "Feil inntraff under innsendelse" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 msgid "You can only edit files with revision being a valid branch" msgstr "" "Du kan bare redigere filer med en revisjon som er en gyldig avgrening" -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "Filen %s ble endret via Kallithea" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "Ingen endringer" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "Innsendt til %s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "Fil lagt til via Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "Inget innhold" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "Inget filnavn" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Plasseringen må være en relativ sti, og kan ikke inneholde .. i stien" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "Nedlastinger avskrudd" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "Ukjent revisjon %s" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "Tom pakkebrønn" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "Ukjent arkivtype" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Endringssett" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Forgreninger" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Etiketter" @@ -922,63 +923,63 @@ msgstr "" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, python-format msgid "Invalidated %s repositories" msgstr "" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "Skriv inn e-postadresse" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "Ingen data klar enda" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:360 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "" @@ -1829,6 +1830,7 @@ #: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" msgstr "Du har administratorrettigheter til denne gruppen, og kan redigere den" +"Du har administratorrettigheter til denne gruppen, og kan redigere den" #: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" @@ -1970,8 +1972,8 @@ "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "" -"En passordtilbakestillingslenke vil bli sendt til angitt e-postadresse hvis " -"den er registrert i systemet." +"En passordtilbakestillingslenke vil bli sendt til angitt e-postadresse " +"hvis den er registrert i systemet." #: kallithea/templates/password_reset_confirmation.html:23 #, python-format @@ -2212,10 +2214,14 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2595,7 +2601,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "Navn" @@ -4010,6 +4016,12 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +#, fuzzy +#| msgid "Default Permissions" +msgid "default permissions" +msgstr "Forvalgte tilganger" + #: kallithea/templates/base/default_perms_box.html:23 #, fuzzy msgid "Create repositories" @@ -4799,28 +4811,28 @@ msgid "Commit Changes" msgstr "" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:52 -#: kallithea/templates/summary/summary.html:145 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:53 -msgid "Last Revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:54 -msgid "Last Modified" -msgstr "" - #: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/summary/summary.html:145 +msgid "Size" +msgstr "" + +#: kallithea/templates/files/files_browser.html:56 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:57 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:58 msgid "Last Committer" msgstr ""
--- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"POT-Creation-Date: 2019-05-04 21:13+0200\n" "PO-Revision-Date: 2017-06-18 16:22+0000\n" "Last-Translator: Thomas De Schampheleire <patrickdepinguin@gmail.com>\n" "Language-Team: Dutch (Belgium) <https://hosted.weblate.org/projects/" @@ -36,7 +36,7 @@ msgid "None" msgstr "Geen" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(gesloten)" @@ -66,8 +66,8 @@ msgid "Successfully deleted pull request %s" msgstr "" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "Deze revisie bestaat niet in deze repository" @@ -166,106 +166,107 @@ msgstr "Klik hier om een nieuw bestand toe te voegen" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" +#, fuzzy +#| msgid "There are no files yet. %s" +msgid "There are no files yet." msgstr "Er zijn nog geen bestanden. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "%s op %s" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Deze repository is gelocket door %s op %s" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 msgid "You can only delete files with revision being a valid branch" msgstr "" "Men kan enkel bestanden verwijderen als de revisie een geldige branch is" -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Bestand %s verwijderd via Kallithea" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "Bestand %s succesvol verwijderd" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "Er trad een fout op tijdens het committeren" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 msgid "You can only edit files with revision being a valid branch" msgstr "" "Men kan enkel bestanden wijzigen als de revisie een geldige branch is" -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "Bestand %s gewijzigd via Kallithea" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "Geen wijzigingen" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "Succesvol gecommitteerd naar %s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "Bestand toegevoegd via Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "Geen inhoud" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "Geen bestandsnaam" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "De locatie moet een relatief pad zijn en mag geen .. bevatten" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "Downloads uitgeschakeld" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "Ongekende revisie %s" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "Lege repository" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "Ongekende archieftype" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Changesets" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Branches" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Tags" @@ -912,61 +913,61 @@ msgstr "" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, python-format msgid "Invalidated %s repositories" msgstr "" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 msgid "Hook already exists" msgstr "" -#: kallithea/controllers/admin/settings.py:357 -msgid "Builtin hooks are read-only. Please use another hook name." -msgstr "" - #: kallithea/controllers/admin/settings.py:360 +msgid "Builtin hooks are read-only. Please use another hook name." +msgstr "" + +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "" @@ -2184,10 +2185,14 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2567,7 +2572,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "" @@ -3977,6 +3982,10 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +msgid "default permissions" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" @@ -4782,28 +4791,28 @@ msgid "Commit Changes" msgstr "Selecteer de changeset" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:52 -#: kallithea/templates/summary/summary.html:145 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:53 -msgid "Last Revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:54 -msgid "Last Modified" -msgstr "" - #: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/summary/summary.html:145 +msgid "Size" +msgstr "" + +#: kallithea/templates/files/files_browser.html:56 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:57 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:58 msgid "Last Committer" msgstr ""
--- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"POT-Creation-Date: 2019-05-04 21:13+0200\n" "PO-Revision-Date: 2015-04-04 09:08+0200\n" "Last-Translator: Andrej Shadura <andrew@shadura.me>\n" "Language-Team: Polish <https://hosted.weblate.org/projects/kallithea/" @@ -41,7 +41,7 @@ msgid "None" msgstr "Brak" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(zamknięty)" @@ -70,8 +70,8 @@ msgid "Successfully deleted pull request %s" msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "" @@ -167,107 +167,108 @@ msgstr "Kliknij tutaj, by dodać nowy plik" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" -msgstr "" - -#: kallithea/controllers/files.py:194 +#, fuzzy +#| msgid "There are no forks yet" +msgid "There are no files yet." +msgstr "Nie ma jeszcze gałęzi" + +#: kallithea/controllers/files.py:193 #, fuzzy, python-format msgid "%s at %s" msgstr "w %s i %s" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Repozytorium zostało zablokowane przez %s na %s" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 #, fuzzy msgid "You can only delete files with revision being a valid branch" msgstr "Można tylko edytować pliki z rewizji obecnej gałęzi " -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "Wystąpił błąd w trakcie zatwierdzania" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 #, fuzzy msgid "You can only edit files with revision being a valid branch" msgstr "Można tylko edytować pliki z rewizji obecnej gałęzi " -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "Edytowanie %s w Kallithea" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "Bez zmian" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "Committ wykonany do %s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "Dodano %s poprzez Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "Brak treści" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "Brak nazwy pliku" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Lokalizacja musi być ścieżką względną i nie może zawierać .. ścieżki" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "Pobieranie wyłączone" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "Nieznana wersja %s" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "Puste repozytorium" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "Nieznany typ archiwum" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Różnice" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Gałęzie" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Etykiety" @@ -927,65 +928,65 @@ msgstr "" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień aplikacji" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" "Repozytoria z powodzeniem zostały ponownie zeskanowane dodano: %s, " "usunięto: %s." -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, fuzzy, python-format #| msgid "Invalidate cache for all repositories" msgid "Invalidated %s repositories" msgstr "Unieważnia cache dla wszystkich repozytoriów" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "Aktualizacja ustawień aplikacji" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "Aktualizacja ustawień wizualizacji" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "Proszę podać adres email" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 #, fuzzy msgid "Hook already exists" msgstr "Żadne dane nie zostały załadowane" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:360 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "Dodano nowy hook" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "Aktualizacja hooku" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "Wystąpił błąd podczas tworzenia hooku" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "Zadanie ponownej indeksacji whoosh zostało zaplanowane" @@ -2271,10 +2272,14 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2667,7 +2672,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "Nazwa" @@ -4177,6 +4182,12 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +#, fuzzy +#| msgid "Default permissions" +msgid "default permissions" +msgstr "Domyślne uprawnienia" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "Utwórz repozytorium" @@ -5040,29 +5051,29 @@ msgid "Commit Changes" msgstr "Zatwierdź zmiany" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "Wczytywanie listy plików..." -#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/files/files_browser.html:55 #: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "Rozmiar" -#: kallithea/templates/files/files_browser.html:53 +#: kallithea/templates/files/files_browser.html:56 msgid "Last Revision" msgstr "Rewizja" -#: kallithea/templates/files/files_browser.html:54 +#: kallithea/templates/files/files_browser.html:57 #, fuzzy msgid "Last Modified" msgstr "Ostatnio modyfikowany" -#: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/files/files_browser.html:58 #, fuzzy msgid "Last Committer" msgstr "Autor" @@ -6040,9 +6051,6 @@ #~ msgid "Destroy old data" #~ msgstr "Zniszcz stare dane" -#~ msgid "Default permissions" -#~ msgstr "Domyślne uprawnienia" - #~ msgid "Status change from pull request" #~ msgstr "Zmiana statusu w grupie zmian"
--- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"POT-Creation-Date: 2019-05-04 21:13+0200\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" @@ -36,7 +36,7 @@ msgid "None" msgstr "Nenhum" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(fechado)" @@ -65,8 +65,8 @@ msgid "Successfully deleted pull request %s" msgstr "Pull request excluído com sucesso" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "" @@ -162,106 +162,107 @@ msgstr "Clique aqui para adicionar um novo arquivo" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" -msgstr "" - -#: kallithea/controllers/files.py:194 +#, fuzzy +#| msgid "There are no forks yet" +msgid "There are no files yet." +msgstr "Ainda não há bifurcações" + +#: kallithea/controllers/files.py:193 #, fuzzy, python-format msgid "%s at %s" msgstr "em %s e %s" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Este repositório foi travado por %s em %s" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 #, fuzzy msgid "You can only delete files with revision being a valid branch" msgstr "Só é possível editar arquivos quando a revisão é um ramo válido" -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "Ocorreu um erro ao realizar commit" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 #, fuzzy msgid "You can only edit files with revision being a valid branch" msgstr "Só é possível editar arquivos quando a revisão é um ramo válido" -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "Arquivo %s editado via Kallithea" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "Sem modificações" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "Commit realizado com sucesso para %s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "Arquivo adicionado via Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "Nenhum conteúdo" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "Nenhum nome de arquivo" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "O caminho deve ser relativo e não pode conter .." -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "Downloads desabilitados" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "Revisão desconhecida %s" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "Repositório vazio" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "Tipo de arquivo desconhecido" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Conjuntos de mudanças" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Ramos" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Etiquetas" @@ -923,65 +924,65 @@ msgstr "" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "" "Ocorreu um erro durante a atualização das configurações da aplicação" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, fuzzy, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Repositórios varridos com sucesso adicionados: %s ; removidos: %s" -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, fuzzy, python-format #| msgid "Invalidate cache for all repositories" msgid "Invalidated %s repositories" msgstr "Invalidar o cache para todos os repositórios" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "Configurações da aplicação atualizadas" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "Configurações de visualização atualizadas" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "" "Ocorreu um erro durante a atualização das configurações de visualização" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 #, fuzzy msgid "Hook already exists" msgstr "Ainda não há dados carregados" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:360 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "Adicionado novo gancho" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "Atualizados os ganchos" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "Ocorreu um erro durante a criação do hook" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "Tarefa de reindexação do whoosh agendada" @@ -2261,10 +2262,14 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2655,7 +2660,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "Nome" @@ -4164,6 +4169,12 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +#, fuzzy +#| msgid "Default permissions" +msgid "default permissions" +msgstr "Permissões padrão" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "Criar repositórios" @@ -5022,29 +5033,29 @@ msgid "Commit Changes" msgstr "Realizar commit das alterações" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "Carregando lista de arquivos..." -#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/files/files_browser.html:55 #: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "Tamanho" -#: kallithea/templates/files/files_browser.html:53 +#: kallithea/templates/files/files_browser.html:56 msgid "Last Revision" msgstr "Última revisão" -#: kallithea/templates/files/files_browser.html:54 +#: kallithea/templates/files/files_browser.html:57 #, fuzzy msgid "Last Modified" msgstr "Última alteração" -#: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/files/files_browser.html:58 #, fuzzy msgid "Last Committer" msgstr "Último commiter" @@ -6005,9 +6016,6 @@ #~ msgid "Destroy old data" #~ msgstr "Destruir dados antigos" -#~ msgid "Default permissions" -#~ msgstr "Permissões padrão" - #~ msgid "Status change from pull request" #~ msgstr "Alteração de estado no changeset"
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"POT-Creation-Date: 2019-05-04 21:13+0200\n" "PO-Revision-Date: 2017-01-05 14:58+0000\n" "Last-Translator: Andrej Shadura <andrew@shadura.me>\n" "Language-Team: Russian <https://hosted.weblate.org/projects/kallithea/" @@ -48,7 +48,7 @@ msgid "None" msgstr "Ничего" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(закрыто)" @@ -78,8 +78,8 @@ msgid "Successfully deleted pull request %s" msgstr "Pull-запрос успешно удалён" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "Нет такой ревизии в этом репозитории" @@ -173,109 +173,110 @@ msgstr "Нажмите чтобы добавить новый файл" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" +#, fuzzy +#| msgid "There are no files yet. %s" +msgid "There are no files yet." msgstr "Нет файлов. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "%s (%s)" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Репозиторий заблокировал %s в %s" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 msgid "You can only delete files with revision being a valid branch" msgstr "" "Вы можете удалять файлы только в ревизии, связанной с существующей веткой " -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Файл %s удалён с помощью Kallithea" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "Файл %s удалён" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "Во время коммита произошла ошибка" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 msgid "You can only edit files with revision being a valid branch" msgstr "" "Вы можете редактировать файлы только в ревизии, связанной с существующей " "веткой " -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "Файл %s отредактирован с помощью Kallithea" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "Без изменений" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "Изменения применены в %s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "Файл добавлен с помощью Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "Пусто" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "Безымянный" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Расположение должно быть относительным путем, и не должно содержать \".." "\" в пути" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "Возможность скачивать отключена" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "Неизвестная ревизия %s" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "Пустой репозиторий" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "Неизвестный тип архива" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Набор изменений" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Ветки" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Метки" @@ -936,63 +937,63 @@ "отсутствует" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "Произошла ошибка при обновлении настроек приложения" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Репозитории успешно пересканированы, добавлено: %s, удалено: %s." -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, fuzzy, python-format msgid "Invalidated %s repositories" msgstr "Сбросить кэш для всех репозиториев" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "Обновленные параметры настройки приложения" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "Настройки визуализации обновлены" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "Произошла ошибка при обновлении настроек визуализации" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "Пожалуйста, введите адрес электронной почты" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "Задача отправки Email создана" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "Нет данных" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:360 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "Добавлена новая ловушка" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "Обновлённые ловушки" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "произошла ошибка при создании хука" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "Запланирована переиндексация базы Whoosh" @@ -2285,10 +2286,14 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2679,7 +2684,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "Имя" @@ -4143,6 +4148,12 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +#, fuzzy +#| msgid "Default permissions" +msgid "default permissions" +msgstr "Стандартные привилегии" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "Создать репозитории" @@ -4984,28 +4995,28 @@ msgid "Commit Changes" msgstr "Применить изменения" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "Загружается список файлов..." -#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/files/files_browser.html:55 #: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "Размер" -#: kallithea/templates/files/files_browser.html:53 +#: kallithea/templates/files/files_browser.html:56 msgid "Last Revision" msgstr "Последняя версия" -#: kallithea/templates/files/files_browser.html:54 +#: kallithea/templates/files/files_browser.html:57 msgid "Last Modified" msgstr "Последнее изменение" -#: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/files/files_browser.html:58 msgid "Last Committer" msgstr "Автор последней ревизии" @@ -5963,9 +5974,6 @@ #~ msgid "Destroy old data" #~ msgstr "Уничтожить все данные" -#~ msgid "Default permissions" -#~ msgstr "Стандартные привилегии" - #~ msgid "Status change from pull request" #~ msgstr "Изменение статуса"
--- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"POT-Creation-Date: 2019-05-04 21:13+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/" @@ -36,7 +36,7 @@ msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(zatvorené)" @@ -65,8 +65,8 @@ msgid "Successfully deleted pull request %s" msgstr "Úspešne zmazaný súbor %s" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "Taká revízia neexistuje" @@ -158,104 +158,105 @@ msgstr "Kliknite pre pridanie nového súboru" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" +#, fuzzy +#| msgid "There are no files yet. %s" +msgid "There are no files yet." msgstr "Zatiaľ nie sú žiadne súbory. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Zmazaný súbor %s cez Kallithea" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "Úspešne zmazaný súbor %s" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "Došlo k chybe pri ukladaní" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "Žiadne zmeny" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "Pridaný súbor cez Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "Žiadny obsah" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "Sťahovanie vypnuté" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "Neznáma revízia %s" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "Prázdny repozitár" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Zmeny" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Vetvy" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Tagy" @@ -905,62 +906,62 @@ msgstr "" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, fuzzy, python-format #| msgid "Watched Repositories" msgid "Invalidated %s repositories" msgstr "Repozitáre" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 msgid "Hook already exists" msgstr "" -#: kallithea/controllers/admin/settings.py:357 -msgid "Builtin hooks are read-only. Please use another hook name." -msgstr "" - #: kallithea/controllers/admin/settings.py:360 +msgid "Builtin hooks are read-only. Please use another hook name." +msgstr "" + +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "" @@ -2189,10 +2190,14 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2574,7 +2579,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "" @@ -3998,6 +4003,10 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +msgid "default permissions" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" @@ -4811,28 +4820,28 @@ msgid "Commit Changes" msgstr "Žiadne zmeny" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:52 -#: kallithea/templates/summary/summary.html:145 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:53 -msgid "Last Revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:54 -msgid "Last Modified" -msgstr "" - #: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/summary/summary.html:145 +msgid "Size" +msgstr "" + +#: kallithea/templates/files/files_browser.html:56 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:57 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:58 msgid "Last Committer" msgstr ""
--- a/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3.2\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"POT-Creation-Date: 2019-05-04 21:13+0200\n" "PO-Revision-Date: 2018-03-31 21:42+0000\n" "Last-Translator: Максим Якимчук <xpinovo@gmail.com>\n" "Language-Team: Ukrainian <https://hosted.weblate.org/projects/kallithea/" @@ -37,7 +37,7 @@ msgid "None" msgstr "Нічого" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "" @@ -65,8 +65,8 @@ msgid "Successfully deleted pull request %s" msgstr "" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "" @@ -156,104 +156,103 @@ msgstr "" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" -msgstr "" - -#: kallithea/controllers/files.py:194 +msgid "There are no files yet." +msgstr "" + +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "" @@ -899,61 +898,61 @@ msgstr "" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, python-format msgid "Invalidated %s repositories" msgstr "" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 msgid "Hook already exists" msgstr "" -#: kallithea/controllers/admin/settings.py:357 -msgid "Builtin hooks are read-only. Please use another hook name." -msgstr "" - #: kallithea/controllers/admin/settings.py:360 +msgid "Builtin hooks are read-only. Please use another hook name." +msgstr "" + +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "" @@ -2177,10 +2176,14 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2560,7 +2563,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "" @@ -3966,6 +3969,10 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +msgid "default permissions" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" @@ -4755,28 +4762,28 @@ msgid "Commit Changes" msgstr "" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:52 -#: kallithea/templates/summary/summary.html:145 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:53 -msgid "Last Revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:54 -msgid "Last Modified" -msgstr "" - #: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/summary/summary.html:145 +msgid "Size" +msgstr "" + +#: kallithea/templates/files/files_browser.html:56 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:57 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:58 msgid "Last Committer" msgstr ""
--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"POT-Creation-Date: 2019-05-04 21:13+0200\n" "PO-Revision-Date: 2018-04-12 03:35+0000\n" "Last-Translator: Pheng Heong Tan <phtan90@gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" @@ -39,7 +39,7 @@ msgid "None" msgstr "无" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(已关闭)" @@ -69,8 +69,8 @@ msgid "Successfully deleted pull request %s" msgstr "成功删除拉取请求" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "在此代码库内,此修改并不存在" @@ -160,104 +160,105 @@ msgstr "点击这里添加新文件" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" +#, fuzzy +#| msgid "There are no files yet. %s" +msgid "There are no files yet." msgstr "这里还没有文件。%s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "%s 在 %s" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "版本库由%s于%s锁定" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 msgid "You can only delete files with revision being a valid branch" msgstr "您只能删除有效分支的修订中的文件" -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "删除文件 %s 通过 Kallithea" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "成功删除文件 %s" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "提交时发生错误" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 msgid "You can only edit files with revision being a valid branch" msgstr "您只能编辑有效分支的修订中的文件" -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "已编辑文件 %s 通过 Kallithea" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "无变更" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "成功提交到%s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "已添加文件通过 Kallithea" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "无内容" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "无文件名" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "下载已禁用" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "未知版本%s" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "空版本库" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "未知包类型" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "修订集" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "分支" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "标签" @@ -914,63 +915,63 @@ msgstr "" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, fuzzy, python-format msgid "Invalidated %s repositories" msgstr "清除版本库缓存" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "更新应用设置" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "成功更新可视化设置" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 #, fuzzy #| msgid "No data ready yet" msgid "Hook already exists" msgstr "数据尚未就绪" -#: kallithea/controllers/admin/settings.py:357 +#: kallithea/controllers/admin/settings.py:360 msgid "Builtin hooks are read-only. Please use another hook name." msgstr "" -#: kallithea/controllers/admin/settings.py:360 +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "新建钩子" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "更新钩子" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "Whoosh重新索引任务调度" @@ -2222,10 +2223,14 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2614,7 +2619,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "名称" @@ -4087,6 +4092,12 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +#, fuzzy +#| msgid "Default permissions" +msgid "default permissions" +msgstr "默认权限" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "创建版本库" @@ -4920,29 +4931,29 @@ msgid "Commit Changes" msgstr "提交修改" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "加载文件列表..." -#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/files/files_browser.html:55 #: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "大小" -#: kallithea/templates/files/files_browser.html:53 +#: kallithea/templates/files/files_browser.html:56 msgid "Last Revision" msgstr "最后修订号" -#: kallithea/templates/files/files_browser.html:54 +#: kallithea/templates/files/files_browser.html:57 #, fuzzy msgid "Last Modified" msgstr "最后修改于" -#: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/files/files_browser.html:58 #, fuzzy msgid "Last Committer" msgstr "最后提交者" @@ -5811,9 +5822,6 @@ #~ msgid "edit" #~ msgstr "编辑" -#~ msgid "Default permissions" -#~ msgstr "默认权限" - #~ msgid "Status change from pull request" #~ msgstr "状态修改为%s"
--- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Wed May 22 12:50:45 2019 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"POT-Creation-Date: 2019-05-04 21:13+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/" @@ -37,7 +37,7 @@ msgid "None" msgstr "無" -#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:196 msgid "(closed)" msgstr "(已關閉)" @@ -66,8 +66,8 @@ msgid "Successfully deleted pull request %s" msgstr "成功遞交至 %s" -#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:727 +#: kallithea/controllers/changeset.py:321 kallithea/controllers/files.py:96 +#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "" @@ -158,104 +158,105 @@ msgstr "" #: kallithea/controllers/files.py:93 -#, python-format -msgid "There are no files yet. %s" -msgstr "" - -#: kallithea/controllers/files.py:194 +#, fuzzy +#| msgid "There are no forks yet" +msgid "There are no files yet." +msgstr "尚未有任何 fork" + +#: kallithea/controllers/files.py:193 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 -#: kallithea/controllers/files.py:427 +#: kallithea/controllers/files.py:299 kallithea/controllers/files.py:359 +#: kallithea/controllers/files.py:426 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:312 +#: kallithea/controllers/files.py:311 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:323 +#: kallithea/controllers/files.py:322 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:345 +#: kallithea/controllers/files.py:344 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 -#: kallithea/controllers/files.py:496 +#: kallithea/controllers/files.py:348 kallithea/controllers/files.py:414 +#: kallithea/controllers/files.py:495 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:372 +#: kallithea/controllers/files.py:371 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:386 +#: kallithea/controllers/files.py:385 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:402 +#: kallithea/controllers/files.py:401 msgid "No changes" msgstr "沒有修改" -#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:410 kallithea/controllers/files.py:484 #, python-format msgid "Successfully committed to %s" msgstr "成功遞交至 %s" -#: kallithea/controllers/files.py:438 +#: kallithea/controllers/files.py:437 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:459 +#: kallithea/controllers/files.py:458 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:463 +#: kallithea/controllers/files.py:462 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:488 +#: kallithea/controllers/files.py:487 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:520 +#: kallithea/controllers/files.py:519 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:531 +#: kallithea/controllers/files.py:530 #, python-format msgid "Unknown revision %s" msgstr "未知修訂 %s" -#: kallithea/controllers/files.py:533 +#: kallithea/controllers/files.py:532 msgid "Empty repository" msgstr "空的版本庫" -#: kallithea/controllers/files.py:535 +#: kallithea/controllers/files.py:534 msgid "Unknown archive type" msgstr "未知的存檔類型" -#: kallithea/controllers/files.py:756 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 #: kallithea/templates/email_templates/pull_request.html:64 #: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "變更" -#: kallithea/controllers/files.py:757 +#: kallithea/controllers/files.py:756 #: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "分支" -#: kallithea/controllers/files.py:758 +#: kallithea/controllers/files.py:757 #: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "標籤" @@ -901,62 +902,62 @@ msgstr "" #: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:237 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:180 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:189 +#: kallithea/controllers/admin/settings.py:192 #, fuzzy, python-format #| msgid "Invalidate Repository Cache" msgid "Invalidated %s repositories" msgstr "確認廢止版本庫快取" -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:233 msgid "Updated application settings" msgstr "更新應用設定" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:286 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:291 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:315 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:330 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:355 +#: kallithea/controllers/admin/settings.py:358 msgid "Hook already exists" msgstr "" -#: kallithea/controllers/admin/settings.py:357 -msgid "Builtin hooks are read-only. Please use another hook name." -msgstr "" - #: kallithea/controllers/admin/settings.py:360 +msgid "Builtin hooks are read-only. Please use another hook name." +msgstr "" + +#: kallithea/controllers/admin/settings.py:363 msgid "Added new hook" msgstr "新增hook" -#: kallithea/controllers/admin/settings.py:376 +#: kallithea/controllers/admin/settings.py:379 msgid "Updated hooks" msgstr "更新hook" -#: kallithea/controllers/admin/settings.py:380 +#: kallithea/controllers/admin/settings.py:383 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:404 +#: kallithea/controllers/admin/settings.py:407 msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引工作排程" @@ -2177,10 +2178,14 @@ #: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" -"Gist was update since you started editing. Copy your changes and click " +"Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" +#: kallithea/templates/admin/gists/edit.html:36 +msgid "here" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:51 #: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." @@ -2568,7 +2573,7 @@ #: kallithea/templates/admin/repos/repos.html:38 #: kallithea/templates/admin/user_groups/user_groups.html:38 #: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:51 +#: kallithea/templates/files/files_browser.html:54 msgid "Name" msgstr "名稱" @@ -4026,6 +4031,12 @@ "%s." msgstr "" +#: kallithea/templates/base/default_perms_box.html:16 +#, fuzzy +#| msgid "Default permissions" +msgid "default permissions" +msgstr "預設權限" + #: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "建立版本庫" @@ -4843,29 +4854,29 @@ msgid "Commit Changes" msgstr "遞交修改" -#: kallithea/templates/files/files_browser.html:37 +#: kallithea/templates/files/files_browser.html:40 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:42 +#: kallithea/templates/files/files_browser.html:45 msgid "Loading file list..." msgstr "載入檔案列表..." -#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/files/files_browser.html:55 #: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "大小" -#: kallithea/templates/files/files_browser.html:53 +#: kallithea/templates/files/files_browser.html:56 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:54 +#: kallithea/templates/files/files_browser.html:57 #, fuzzy msgid "Last Modified" msgstr "最後修改" -#: kallithea/templates/files/files_browser.html:55 +#: kallithea/templates/files/files_browser.html:58 #, fuzzy msgid "Last Committer" msgstr "最後的遞交者" @@ -5608,9 +5619,6 @@ #~ msgid "edit" #~ msgstr "編輯" -#~ msgid "Default permissions" -#~ msgstr "預設權限" - #~ msgid "My Repos" #~ msgstr "空的版本庫"
--- a/kallithea/lib/paster_commands/template.ini.mako Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/lib/paster_commands/template.ini.mako Wed May 22 12:50:45 2019 +0200 @@ -186,7 +186,7 @@ <%text>## Internationalization (see setup documentation for details)</%text> <%text>## By default, the language requested by the browser is used if available.</%text> -#i18n.enable = false +#i18n.enabled = false <%text>## Fallback language, empty for English (valid values are the names of subdirectories in kallithea/i18n):</%text> i18n.lang = @@ -211,6 +211,18 @@ <%text>## number of commits stats will parse on each iteration</%text> commit_parse_limit = 25 +<%text>## Path to Python executable to be used for git hooks.</%text> +<%text>## This value will be written inside the git hook scripts as the text</%text> +<%text>## after '#!' (shebang). When empty or not defined, the value of</%text> +<%text>## 'sys.executable' at the time of installation of the git hooks is</%text> +<%text>## used, which is correct in many cases but for example not when using uwsgi.</%text> +<%text>## If you change this setting, you should reinstall the Git hooks via</%text> +<%text>## Admin > Settings > Remap and Rescan.</%text> +# git_hook_interpreter = /srv/kallithea/venv/bin/python2 +%if git_hook_interpreter: +git_hook_interpreter = ${git_hook_interpreter} +%endif + <%text>## path to git executable</%text> git_path = git
--- a/kallithea/model/scm.py Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/model/scm.py Wed May 22 12:50:45 2019 +0200 @@ -720,6 +720,20 @@ return choices, hist_l + def _get_git_hook_interpreter(self): + """Return a suitable interpreter for Git hooks. + + Return a suitable string to be written in the POSIX #! shebang line for + Git hook scripts so they invoke Kallithea code with the right Python + interpreter and in the right environment. + """ + # Note: sys.executable might not point at a usable Python interpreter. For + # example, when using uwsgi, it will point at the uwsgi program itself. + # FIXME This may not work on Windows and may need a shell wrapper script. + return (kallithea.CONFIG.get('git_hook_interpreter') + or sys.executable + or '/usr/bin/env python2') + def install_git_hooks(self, repo, force_create=False): """ Creates a kallithea hook inside a git repository @@ -734,11 +748,11 @@ if not os.path.isdir(loc): os.makedirs(loc) - tmpl_post = "#!/usr/bin/env %s\n" % sys.executable or 'python2' + tmpl_post = "#!%s\n" % self._get_git_hook_interpreter() tmpl_post += pkg_resources.resource_string( 'kallithea', os.path.join('config', 'post_receive_tmpl.py') ) - tmpl_pre = "#!/usr/bin/env %s\n" % sys.executable or 'python2' + tmpl_pre = "#!%s\n" % self._get_git_hook_interpreter() tmpl_pre += pkg_resources.resource_string( 'kallithea', os.path.join('config', 'pre_receive_tmpl.py') )
--- a/kallithea/public/js/base.js Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/public/js/base.js Wed May 22 12:50:45 2019 +0200 @@ -1493,7 +1493,7 @@ for(var i = 0; i < data.results.length; i++){ _html.push(template .replace('__rev__', 'r{0}:{1}'.format(data.results[i].revision, data.results[i].raw_id.substr(0, 6))) - .replace('__title__', data.results[i].message) + .replace('__title__', data.results[i].message.html_escape()) .replace('__url__', pyroutes.url('changeset_home', { 'repo_name': repo_name, 'revision': data.results[i].raw_id}))
--- a/kallithea/templates/about.html Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/templates/about.html Wed May 22 12:50:45 2019 +0200 @@ -29,9 +29,11 @@ <li>Copyright © 2014–2019, Thomas De Schampheleire</li> <li>Copyright © 2015–2017, 2019, Étienne Gilli</li> <li>Copyright © 2017–2019, Allan Nordhøy</li> + <li>Copyright © 2018–2019, ssantos</li> <li>Copyright © 2019, Danni Randeris</li> <li>Copyright © 2019, Edmund Wong</li> <li>Copyright © 2019, Manuel Jacob</li> + <li>Copyright © 2019, Wolfgang Scherer</li> <li>Copyright © 2012, 2014–2018, Dominik Ruf</li> <li>Copyright © 2014–2015, 2018, Michal Čihař</li> <li>Copyright © 2015, 2018, Branko Majic</li> @@ -39,7 +41,6 @@ <li>Copyright © 2018, Jesús Sánchez</li> <li>Copyright © 2018, Patrick Vane</li> <li>Copyright © 2018, Pheng Heong Tan</li> - <li>Copyright © 2018, ssantos</li> <li>Copyright © 2018, Максим Якимчук</li> <li>Copyright © 2018, Марс Ямбар</li> <li>Copyright © 2012–2017, Unity Technologies</li>
--- a/kallithea/templates/admin/gists/edit.html Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/templates/admin/gists/edit.html Wed May 22 12:50:45 2019 +0200 @@ -32,8 +32,8 @@ <div id="edit_error" style="display: none" class="flash_msg"> <div class="alert alert-dismissable alert-warning"> <button type="button" class="close" data-dismiss="alert" aria-hidden="true"><i class="icon-cancel-circled"></i></button> - ${h.literal(_('Gist was update since you started editing. Copy your changes and click %(here)s to reload new version.') - % {'here': h.link_to('here',h.url('edit_gist', gist_id=c.gist.gist_access_id))})} + ${(h.HTML(_('Gist was updated since you started editing. Copy your changes and click %(here)s to reload new version.')) + % {'here': h.link_to(_('here'),h.url('edit_gist', gist_id=c.gist.gist_access_id))})} </div> <script> if (typeof jQuery != 'undefined') {
--- a/kallithea/templates/admin/permissions/permissions_globals.html Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/templates/admin/permissions/permissions_globals.html Wed May 22 12:50:45 2019 +0200 @@ -7,7 +7,7 @@ ${h.checkbox('anonymous',True)} <span>${_('Allow anonymous access')}</span> </label> - <span class="help-block">${h.literal(_('Allow access to Kallithea without needing to log in. Anonymous users use %s user permissions.' % (h.link_to('*default*',h.url('admin_permissions_perms')))))}</span> + <span class="help-block">${h.HTML(_('Allow access to Kallithea without needing to log in. Anonymous users use %s user permissions.')) % (h.link_to('*default*',h.url('admin_permissions_perms')))}</span> </div> </div> <div class="form-group">
--- a/kallithea/templates/admin/settings/settings_system.html Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/templates/admin/settings/settings_system.html Wed May 22 12:50:45 2019 +0200 @@ -4,13 +4,13 @@ <% elems = [ - (_('Kallithea version'), h.literal('%s <b><span id="check_for_update" style="display:none">%s</span></b>' % (c.kallithea_version, _('Check for updates'))), ''), + (_('Kallithea version'), h.literal('%s <b><span id="check_for_update" style="display:none">%s</span></b>') % (c.kallithea_version, _('Check for updates')), ''), (_('Kallithea configuration file'), c.ini['__file__'], ''), (_('Python version'), c.py_version, ''), (_('Platform'), c.platform, ''), (_('Git version'), c.git_version, ''), (_('Git path'), c.ini.get('git_path'), ''), - (_('Upgrade info endpoint'), h.literal('%s <br/><span class="text-muted">%s.</span>' % (c.update_url, _('Note: please make sure this server can access this URL'))), ''), + (_('Upgrade info endpoint'), h.literal('%s <br/><span class="text-muted">%s.</span>') % (c.update_url, _('Note: please make sure this server can access this URL')), ''), ] %> <dl class="dl-horizontal">
--- a/kallithea/templates/admin/users/user_edit_ips.html Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/templates/admin/users/user_edit_ips.html Wed May 22 12:50:45 2019 +0200 @@ -4,7 +4,7 @@ <tr> <td><div class="ip">${ip.ip_addr}</div></td> <td><div class="ip">${h.ip_range(ip.ip_addr)}</div></td> - <td>${h.literal(_('Inherited from %s') % h.link_to('*default*',h.url('admin_permissions_ips')))}</td> + <td>${h.HTML(_('Inherited from %s')) % h.link_to('*default*',h.url('admin_permissions_ips'))}</td> </tr> %endfor %endif
--- a/kallithea/templates/base/default_perms_box.html Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/templates/base/default_perms_box.html Wed May 22 12:50:45 2019 +0200 @@ -12,8 +12,8 @@ <div> ${h.checkbox('inherit_default_permissions',value=True)} <span class="help-block"> - ${h.literal(_('Select to inherit global settings, IP whitelist and permissions from the %s.') - % h.link_to('default permissions', url('admin_permissions')))} + ${(h.HTML(_('Select to inherit global settings, IP whitelist and permissions from the %s.')) + % h.link_to(_('default permissions'), url('admin_permissions')))} </span> </div> </div>
--- a/kallithea/templates/data_table/_dt_elements.html Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/templates/data_table/_dt_elements.html Wed May 22 12:50:45 2019 +0200 @@ -131,7 +131,7 @@ <%def name="repo_group_name(repo_group_name, children_groups)"> <div class="text-nowrap"> <a href="${h.url('repos_group_home',group_name=repo_group_name)}"> - <i class="icon-folder" title="${_('Repository group')}"></i>${h.literal(' » '.join(children_groups))}</a> + <i class="icon-folder" title="${_('Repository group')}"></i>${h.literal(' » ').join(children_groups)}</a> </div> </%def>
--- a/kallithea/templates/files/files.html Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/templates/files/files.html Wed May 22 12:50:45 2019 +0200 @@ -101,7 +101,7 @@ $files_data.css('opacity', '1.0'); post_load_state(state); } else { - asynchtml(State.url, $files_data, function() { + asynchtml(state.url, $files_data, function() { post_load_state(state); var expire_on = new Date().getTime() + CACHE_EXPIRE; CACHE[cache_key] = [expire_on, $files_data.html()]; @@ -163,6 +163,7 @@ // history select field var cache = {}; + $('#diff1').prev('.select2-container').remove(); // Hack to handle repeated JS initialization on reused DOM $("#diff1").select2({ placeholder: _TM['Select changeset'], dropdownAutoWidth: true, @@ -205,16 +206,6 @@ } } }); - $('#show_authors').on('click', function(){ - $.ajax({ - url: pyroutes.url('files_authors_home', {'revision': _rev, 'f_path': _f_path}), - success: function(data) { - $('#file_authors').html(data); - $('#file_authors').show(); - tooltip_activate(); - } - }); - }); } $(document).ready(function(){ @@ -224,6 +215,8 @@ window.addEventListener('popstate', function(e){ if (e.state) load_state(e.state); + else + load_state(initial_state); }); // init the search filter @@ -231,6 +224,9 @@ var _url_base = url_base.replace('__REV__', ${h.js(c.changeset.raw_id)}); fileBrowserListeners(_node_list_url, _url_base); + var initial_state = {url:window.location.href, title:document.title, url_base:_url_base, + node_list_url:_node_list_url, rev:${h.js(c.changeset.raw_id)}, f_path:${h.js(h.safe_unicode(c.file.path))}}; + // change branch filter $("#branch_selector").select2({ dropdownAutoWidth: true, @@ -247,6 +243,16 @@ $("#branch_selector").val(${h.js(c.changeset.raw_id)}); } }); + $('#show_authors').on('click', function(){ + $.ajax({ + url: pyroutes.url('files_authors_home', {'revision': ${h.js(c.changeset.raw_id)}, 'f_path': ${h.js(h.safe_unicode(c.file.path))}}), + success: function(data) { + $('#file_authors').html(data); + $('#file_authors').show(); + tooltip_activate(); + } + }); + }); });
--- a/kallithea/templates/files/files_browser.html Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/templates/files/files_browser.html Wed May 22 12:50:45 2019 +0200 @@ -16,6 +16,9 @@ <%return h.url('files_home', repo_name=c.repo_name, revision=c.changeset.raw_id, f_path=h.safe_unicode(node.path))%> %endif </%def> +<%def name="_file_name(iconclass, name)"> + <%return h.literal('<i class="%s"></i><span>%s</span>') % (iconclass, name)%> +</%def> <%def name="file_name(node)"> <% c = "icon-folder-open" @@ -24,7 +27,7 @@ elif node.is_submodule(): c = "icon-file-submodule" %> - <%return h.literal('<i class="%s"></i><span>%s</span>' % (c, h.escape(node.name)))%> + <%return _file_name(c, node.name)%> </%def> <div id="body" class="panel panel-default"> <div class="panel-heading clearfix"> @@ -60,7 +63,7 @@ %if c.file.parent: <tr class="parity0"> <td> - ${h.link_to(h.literal('<i class="icon-folder-open"></i><span>..</span>'),h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.file.parent.path),class_="browser-dir ypjax-link")} + ${h.link_to(_file_name('icon-folder-open', '..'),h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.file.parent.path),class_="browser-dir ypjax-link")} </td> <td></td> <td></td>
--- a/kallithea/templates/files/files_history_box.html Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/templates/files/files_history_box.html Wed May 22 12:50:45 2019 +0200 @@ -1,5 +1,5 @@ <div class="form-group"> - <span>${h.literal(ungettext(u'%s author',u'%s authors',len(c.authors)) % ('<b>%s</b>' % len(c.authors))) }</span> + <span>${h.HTML(ungettext(u'%s author',u'%s authors',len(c.authors))) % (h.literal('<b>%s</b>') % len(c.authors)) }</span> %for email, user in c.authors: <span data-toggle="tooltip" title="${user}"> ${h.gravatar_div(email, size=20)}
--- a/kallithea/templates/files/files_source.html Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/templates/files/files_source.html Wed May 22 12:50:45 2019 +0200 @@ -77,15 +77,3 @@ %endif </div> </div> - -<script> - $(document).ready(function(){ - var state = { - node_list_url: node_list_url.replace('__REV__',${h.js(c.changeset.raw_id)}).replace('__FPATH__', ${h.js(h.safe_unicode(c.file.path))}), - url_base: url_base.replace('__REV__',${h.js(c.changeset.raw_id)}), - rev: ${h.js(c.changeset.raw_id)}, - f_path: ${h.js(h.safe_unicode(c.file.path))} - } - window.history.pushState(state, null, ${h.js(h.url.current())}); - }); -</script>
--- a/kallithea/templates/search/search_commit.html Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/templates/search/search_commit.html Wed May 22 12:50:45 2019 +0200 @@ -4,8 +4,9 @@ %if h.HasRepoPermissionLevel('read')(sr['repository'],'search results check'): <div class="panel panel-default"> <div class="panel-heading"> - ${h.link_to(h.literal('%s » %s' % (sr['repository'],sr['raw_id'])), - h.url('changeset_home',repo_name=sr['repository'],revision=sr['raw_id']))} + ${h.link_to(sr['repository'], h.url('summary_home', repo_name=sr['repository']))} + » + ${h.link_to(sr['raw_id'], h.url('changeset_home', repo_name=sr['repository'], revision=sr['raw_id']))} ${h.fmt_date(h.time_to_datetime(sr['date']))} </div> <div class="panel-body">
--- a/kallithea/templates/search/search_content.html Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/templates/search/search_content.html Wed May 22 12:50:45 2019 +0200 @@ -4,8 +4,9 @@ %if h.HasRepoPermissionLevel('read')(sr['repository'],'search results check'): <div class="panel panel-default"> <div class="panel-heading"> - ${h.link_to(h.literal('%s » %s' % (sr['repository'],sr['f_path'])), - h.url('files_home',repo_name=sr['repository'],revision='tip',f_path=sr['f_path']))} + ${h.link_to(sr['repository'], h.url('summary_home', repo_name=sr['repository']))} + » + ${h.link_to(sr['f_path'], h.url('files_home', repo_name=sr['repository'], revision='tip', f_path=sr['f_path']))} </div> <div class="panel-body search-code-body"> <pre>${h.literal(sr['content_short_hl'])}</pre>
--- a/kallithea/templates/search/search_path.html Tue Apr 30 16:13:14 2019 +0200 +++ b/kallithea/templates/search/search_path.html Wed May 22 12:50:45 2019 +0200 @@ -4,8 +4,9 @@ %if h.HasRepoPermissionLevel('read')(sr['repository'],'search results check'): <div class="panel panel-default"> <div class="panel-heading"> - ${h.link_to(h.literal('%s » %s' % (sr['repository'],sr['f_path'])), - h.url('files_home',repo_name=sr['repository'],revision='tip',f_path=sr['f_path']))} + ${h.link_to(sr['repository'], h.url('summary_home', repo_name=sr['repository']))} + » + ${h.link_to(sr['f_path'], h.url('files_home', repo_name=sr['repository'], revision='tip', f_path=sr['f_path']))} </div> </div> %else:
--- a/setup.py Tue Apr 30 16:13:14 2019 +0200 +++ b/setup.py Wed May 22 12:50:45 2019 +0200 @@ -40,7 +40,7 @@ "waitress >= 0.8.8, < 1.2", "WebOb >= 1.7, < 1.8", # turbogears2 2.3.12 requires WebOb<1.8.0 "backlash >= 0.1.2, < 1", - "TurboGears2 >= 2.3.10, < 3", + "TurboGears2 >= 2.3.10, < 2.4", "tgext.routes >= 0.2.0, < 1", "Beaker >= 1.7.0, < 2", "WebHelpers >= 1.3, < 1.4",